ooo-build r11970 - in trunk: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Mar 21 00:44:23 2008
New Revision: 11970
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11970&view=rev

Log:
2008-03-20  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/sc-copy-source-border.diff: initialize mpOOSelection to
	NULL in ScGridWindow ctor.  Not doing so caused Calc to crash on file 
	load when the Formula syntax option is set to Excel A1.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/sc-copy-source-border.diff

Modified: trunk/patches/src680/sc-copy-source-border.diff
==============================================================================
--- trunk/patches/src680/sc-copy-source-border.diff	(original)
+++ trunk/patches/src680/sc-copy-source-border.diff	Fri Mar 21 00:44:23 2008
@@ -1,10 +1,6 @@
-Index: sc/source/ui/inc/gridwin.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/inc/gridwin.hxx,v
-retrieving revision 1.27
-diff -u -p -r1.27 gridwin.hxx
---- sc/source/ui/inc/gridwin.hxx	21 Sep 2007 09:23:22 -0000	1.27
-+++ sc/source/ui/inc/gridwin.hxx	20 Mar 2008 20:22:07 -0000
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/inc/gridwin.hxx sc/source/ui/inc/gridwin.hxx
+--- sc.clean/source/ui/inc/gridwin.hxx	2008-03-11 09:39:34.000000000 -0400
++++ sc/source/ui/inc/gridwin.hxx	2008-03-20 20:32:17.000000000 -0400
 @@ -164,6 +164,7 @@ private:
  	// #114409#
  	::sdr::overlay::OverlayObjectList*				mpOOCursors;
@@ -25,14 +21,18 @@
  
  protected:
      using Window::Resize;
-Index: sc/source/ui/view/gridwin.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/view/gridwin.cxx,v
-retrieving revision 1.88
-diff -u -p -r1.88 gridwin.cxx
---- sc/source/ui/view/gridwin.cxx	12 Dec 2007 13:21:19 -0000	1.88
-+++ sc/source/ui/view/gridwin.cxx	20 Mar 2008 02:45:50 -0000
-@@ -5028,6 +5138,79 @@ void ScGridWindow::UpdateAllOverlays()
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
+--- sc.clean/source/ui/view/gridwin.cxx	2008-03-11 09:39:35.000000000 -0400
++++ sc/source/ui/view/gridwin.cxx	2008-03-20 20:32:59.000000000 -0400
+@@ -417,6 +417,7 @@ ScGridWindow::ScGridWindow( Window* pPar
+ 			DragSourceHelper( this ),
+             mpOOCursors( NULL ),
+             mpOOSelection( NULL ),
++            mpOOSelectionBorder( NULL ),
+             mpOOAutoFill( NULL ),
+             mpOODragRect( NULL ),
+             mpOOHeader( NULL ),
+@@ -5028,6 +5029,79 @@ void ScGridWindow::UpdateAllOverlays()
  void ScGridWindow::DeleteCursorOverlay()
  {
      DELETEZ( mpOOCursors );
@@ -112,7 +112,7 @@
  }
  
  void ScGridWindow::UpdateCursorOverlay()
-@@ -5042,6 +5225,8 @@ void ScGridWindow::UpdateCursorOverlay()
+@@ -5042,6 +5116,8 @@ void ScGridWindow::UpdateCursorOverlay()
  
      DeleteCursorOverlay();
  
@@ -121,7 +121,7 @@
      std::vector<Rectangle> aPixelRects;
  
      //
-@@ -5126,19 +5311,7 @@ void ScGridWindow::UpdateCursorOverlay()
+@@ -5126,19 +5202,7 @@ void ScGridWindow::UpdateCursorOverlay()
      if ( aPixelRects.size() )
      {
          sdr::overlay::OverlayObjectCell::RangeVector aRanges;
@@ -142,7 +142,7 @@
  
  		// #i70788# get the OverlayManager safely
  		::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager();
-@@ -5182,19 +5355,7 @@ void ScGridWindow::UpdateSelectionOverla
+@@ -5182,19 +5246,7 @@ void ScGridWindow::UpdateSelectionOverla
      if ( aPixelRects.size() && pViewData->IsActive() )
      {
          sdr::overlay::OverlayObjectCell::RangeVector aRanges;
@@ -163,7 +163,7 @@
  
  		// #i70788# get the OverlayManager safely
  		::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager();
-@@ -5400,19 +5561,7 @@ void ScGridWindow::UpdateDragRectOverlay
+@@ -5400,19 +5452,7 @@ void ScGridWindow::UpdateDragRectOverlay
          //
  
          sdr::overlay::OverlayObjectCell::RangeVector aRanges;