ooo-build r12761 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Tue Jun  3 12:24:53 2008
New Revision: 12761
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12761&view=rev

Log:
2008-05-03  Petr Mladek  <pmladek suse cz>

	* patches/dev300/sc-cellsuno-avoid-early-destruction.diff:
	* patches/dev300/apply: avoid crash when calling the mono testcase
	  from ooo-build/test/mono; the object "this" was destroyed after
	  calling ScTableSheetObj::getImplementation; this hack make sure
	  that the object lives a bit longer; I hope that we will get the right
	  fix via the upstream issue, i#90076



Added:
   trunk/patches/dev300/sc-cellsuno-avoid-early-destruction.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jun  3 12:24:53 2008
@@ -235,6 +235,11 @@
 # default to DEV300 in cws-commit-patch
 cws-commit-patch-default-dev300.diff, i#87431, jholesov
 
+# avoid crash when calling the mono testcase from ooo-build/test/mono
+# the object "this" was destroyed after calling ScTableSheetObj::getImplementation
+# this hack make sure that the object lives a bit longer
+sc-cellsuno-avoid-early-destruction.diff, i#90076, pmladek
+
 # do not display arabic/hindi numbers instead of decimal numbers
 sw-hindi-numbers.diff, i#86811, pmladek
 
@@ -245,7 +250,6 @@
 # don't lstat() that much while creating absolute URLs
 speed-sal-fewer-lstats.diff, i#89730, jholesov
 
-
 [ CJK ]
 #set default CJK font fontsize as 10.5pt
 sw-default-cjk-fontsize.diff i#72010, jianhua

Added: trunk/patches/dev300/sc-cellsuno-avoid-early-destruction.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sc-cellsuno-avoid-early-destruction.diff	Tue Jun  3 12:24:53 2008
@@ -0,0 +1,14 @@
+--- sc/source/ui/unoobj/cellsuno.cxx.old	2008-05-26 19:41:53.000000000 +0200
++++ sc/source/ui/unoobj/cellsuno.cxx	2008-05-28 16:28:53.000000000 +0200
+@@ -1531,9 +1531,10 @@ void ScCellRangesBase::Notify( SfxBroadc
+         if ( aRanges.UpdateReference( rRef.GetMode(), pDoc, rRef.GetRange(),
+ 									rRef.GetDx(), rRef.GetDy(), rRef.GetDz() ) )
+         {
++            uno::Reference<uno::XInterface> xInterface((cppu::OWeakObject*)this, uno::UNO_QUERY);
+             if (rRef.GetMode() == URM_INSDEL &&
+                 aRanges.Count() == 1 &&
+-                ScTableSheetObj::getImplementation( (cppu::OWeakObject*)this ))
++                ScTableSheetObj::getImplementation( xInterface ))
+             {
+                 // #101755#; the range size of a sheet does not change
+                 ScRange* pR = aRanges.First();