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

[strba svn gnome org]

Author: strba
Date: Tue Aug 26 13:02:45 2008
New Revision: 13677
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13677&view=rev

Log:
prevent crash when updating certain indexes/tables

Added:
   trunk/patches/dev300/sw-updateindex-crash.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Aug 26 13:02:45 2008
@@ -2460,6 +2460,8 @@
 
 unoxml-boost-workaround.diff, thorsten
 
+sw-updateindex-crash.diff, n#388069, fridrich
+
 [ LocalizeFixes ]
 # it is Y axis, not X one [in Spanish]
 chart2-es-eje-Y.diff, i#83821, rengelha

Added: trunk/patches/dev300/sw-updateindex-crash.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sw-updateindex-crash.diff	Tue Aug 26 13:02:45 2008
@@ -0,0 +1,11 @@
+--- sw/source/core/attr/calbck.cxx	2008-08-26 14:24:54.000000000 +0200
++++ sw/source/core/attr/calbck.cxx	2008-08-26 14:25:07.000000000 +0200
+@@ -98,7 +98,7 @@
+ 		return;
+ 
+ 	SwPtrMsgPoolItem *pDead = (SwPtrMsgPoolItem *)pOld;
+-	if(pDead->pObject == pRegisteredIn)
++	if(pRegisteredIn && pDead->pObject == pRegisteredIn)
+ 	{
+ 		SwModify *pAbove = (SwModify*)pRegisteredIn->GetRegisteredIn();
+ 		if(pAbove)