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

[tml svn gnome org]

Author: tml
Date: Thu Jan 24 15:43:18 2008
New Revision: 11404
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11404&view=rev

Log:
2008-01-24  Tor Lillqvist  <tml novell com>

	* patches/src680/sc-xclimpchangetrack-discard-bogus-formula-size.diff: 
	New patch. A better (?) way to fix n#355304, by discarding the
	formula with bogus size from the version log.

	* patches/src680/apply: Add it to Fixes. Drop
	sc-excform8-wntmsci-miscompilation.diff



Added:
   trunk/patches/src680/sc-xclimpchangetrack-discard-bogus-formula-size.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Jan 24 15:43:18 2008
@@ -2092,4 +2092,4 @@
 offapi-field-patch.diff, flr, n#248354
 
 [ Fixes ]
-sc-excform8-wntmsci-miscompilation.diff, n#355304, tml
+sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml

Added: trunk/patches/src680/sc-xclimpchangetrack-discard-bogus-formula-size.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/sc-xclimpchangetrack-discard-bogus-formula-size.diff	Thu Jan 24 15:43:18 2008
@@ -0,0 +1,11 @@
+--- sc/source/filter/xcl97/XclImpChangeTrack.cxx
++++ sc/source/filter/xcl97/XclImpChangeTrack.cxx
+@@ -225,6 +225,8 @@
+ 	SvMemoryStream aMemStrm;
+ 	aMemStrm << (sal_uInt16) 0x0001 << nFmlSize;
+     pStrm->CopyToStream( aMemStrm, nFmlSize );
++	if (nFmlSize == 0xFCFF)
++		return;
+     XclImpStream aFmlaStrm( aMemStrm, GetRoot() );
+ 	aFmlaStrm.StartNextRecord();
+     XclImpChTrFmlConverter aFmlConv( GetRoot(), *this );