[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                                |    3 --
 patches/dev300/sc-xclimpchangetrack-discard-bogus-formula-size.diff |   11 ----------
 2 files changed, 14 deletions(-)

New commits:
commit 310f4bacd23181134937a3e8df2847c73c49ce8a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 16:51:35 2011 +0300

    sc-xclimpchangetrack-discard-bogus-formula-size.diff is not used or needed
    
    It has been commented out for years, and the problematic xls file from
    bnc#355304 does not crash LibreOffice 3.3.1, so assume it indeed is
    not needed any more.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3283732..164df6c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1320,9 +1320,6 @@ ooop-updatable-sameversion.diff
 always_default_iconset.diff
 
 [ Fixes ]
-#sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml
-
-[ Fixes ]
 fix-ppt-linespacing-import-export.diff, n#355302, rodo
 
 # FIXME 2011-04-05: Does not apply, leaving it to cbosdonnat for now
diff --git a/patches/dev300/sc-xclimpchangetrack-discard-bogus-formula-size.diff b/patches/dev300/sc-xclimpchangetrack-discard-bogus-formula-size.diff
deleted file mode 100644
index 58ee1c7..0000000
--- a/patches/dev300/sc-xclimpchangetrack-discard-bogus-formula-size.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 );