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

[jonp svn gnome org]

Author: jonp
Date: Wed Jan 21 04:09:38 2009
New Revision: 15108
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15108&view=rev

Log:
	* patches/dev300/calc-filter-xml-free-context.diff: Added; removes a
	  SEGFAULT when processing some .sxc files.  (n#467536)
	* patches/dev300/apply: Add calc-filter-xml-free-context.diff.


Added:
   trunk/patches/dev300/calc-filter-xml-free-context.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 21 04:09:38 2009
@@ -909,6 +909,9 @@
 # When filtering by date, strip off the time element from each value.
 calc-filter-by-date-strip-time.diff, n#414303, i#94695, kohei
 
+# Don't use pShapeContext after deleting the instance.  Fixes SEGFAULT.
+calc-filter-xml-free-context.diff, n#467536, jonp
+
 # modify the autofill behavior to bring it a little closer to Excel's.
 calc-autofill-increment-fix.diff, i#5550, kohei
 

Added: trunk/patches/dev300/calc-filter-xml-free-context.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/calc-filter-xml-free-context.diff	Wed Jan 21 04:09:38 2009
@@ -0,0 +1,12 @@
+Index: sc/source/filter/xml/xmlannoi.cxx
+===================================================================
+--- sc/source/filter/xml/xmlannoi.cxx	(revision 265800)
++++ sc/source/filter/xml/xmlannoi.cxx	(working copy)
+@@ -189,6 +189,7 @@
+     {
+         pShapeContext->EndElement();
+         delete pShapeContext;
++        pShapeContext = NULL;
+     }
+ 
+     ScMyImportAnnotation* pMyAnnotation = new ScMyImportAnnotation();