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

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Aug  1 17:01:21 2008
New Revision: 13461
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13461&view=rev

Log:
2008-08-01  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-xlsx-import-crash-free-cache.diff: added to fixed
	a crash bug on xlsx import, applicable only for < dev300-m27 as this 
	bug is fixed upstream in dev300-m27 (n#413456).

	* patches/dev300/apply: apply the new patch, only for < dev300-m27.


Added:
   trunk/patches/dev300/calc-xlsx-import-crash-free-cache.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Aug  1 17:01:21 2008
@@ -1833,6 +1833,9 @@
 # to xls.
 chart-subtitle-xls-export.diff, i#92357, kohei
 
+[ CalcFixes < dev300-m27 ]
+calc-xlsx-import-crash-free-cache.diff, n#413456, kohei
+
 #[ OOXSTLport5 ]
 #
 ## oox devs, please reconsider operator[] use,

Added: trunk/patches/dev300/calc-xlsx-import-crash-free-cache.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/calc-xlsx-import-crash-free-cache.diff	Fri Aug  1 17:01:21 2008
@@ -0,0 +1,12 @@
+diff --git sc/source/core/data/documen2.cxx sc/source/core/data/documen2.cxx
+index 85ad0e5..bfd615c 100644
+--- sc/source/core/data/documen2.cxx
++++ sc/source/core/data/documen2.cxx
+@@ -1903,5 +1903,6 @@ ScDocument::GetVbaEventsHelper()
+ 
+ void ScDocument::ClearLookupCaches()
+ {
+-    pLookupCacheMapImpl->clear();
++    if (pLookupCacheMapImpl)
++        pLookupCacheMapImpl->clear();
+ }