[ooo-build-commit] .: patches/dev300

[Katarina Machalkova]

 patches/dev300/xlsx-shared-xlsx-arabic-export-crash.diff |   27 +++++----------
 1 file changed, 10 insertions(+), 17 deletions(-)

New commits:
commit 3fe692b98b3ba73f91d11013d9d73ae29de21393
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Mon May 10 12:39:22 2010 +0200

    Different fix to prevent crash in bnc#497419
    
    The crash is caused by exporting NULL mxTokArray (it is NULL
    in all but one cells that contain shared formula). So here's
    check for NULL value in SaveXML(). If it is done earlier in
    ctor, extra NAME (xls) or extra <definedName> (xlsx) are
    exported
    
    * patches/dev300/xlsx-shared-xlsx-arabic-export-crash.diff:

diff --git a/patches/dev300/xlsx-shared-xlsx-arabic-export-crash.diff b/patches/dev300/xlsx-shared-xlsx-arabic-export-crash.diff
index 5072ded..3f9a6a2 100644
--- a/patches/dev300/xlsx-shared-xlsx-arabic-export-crash.diff
+++ b/patches/dev300/xlsx-shared-xlsx-arabic-export-crash.diff
@@ -1,19 +1,12 @@
-# For the purpose of the 3.1 release, instead of sharing the binary and ooxml
-# export, we introduce a separate sc/source/filter/xlsx that creates libxlsx -
-# a filter for the XLSX files.  After the release, the changes will be
-# reverted so that the binary and ooxml are shared again.
-# The changes include:
-#   sc/source/filter/excel/* -> sc/source/filter/excel/*
-diff --git sc/source/filter/excel/xetable.cxx sc/source/filter/excel/xetable.cxx
-index 3c2b1a5..8dea9e7 100644
 --- sc/source/filter/excel/xetable.cxx
 +++ sc/source/filter/excel/xetable.cxx
-@@ -894,7 +894,7 @@ XclExpFormulaCell::XclExpFormulaCell(
-         mxAddRec = rShrfmlaBfr.CreateOrExtendShrfmla( rScTokArr, aScPos );
- 
-     // no shared formula found - create a simple cell formula
--    if( !mxAddRec )
-+    if( !mxAddRec || ! mxTokArr )
-         mxTokArr = rRoot.GetFormulaCompiler().CreateFormula( EXC_FMLATYPE_CELL, rScTokArr, &aScPos );
- }
- 
+@@ -933,7 +933,7 @@
+
+     rWorksheet->startElement( XML_f,
+             // OOXTODO: XML_t,      ST_CellFormulaType
+-            XML_aca,    XclXmlUtils::ToPsz( mxTokArr->IsVolatile() || (mxAddRec.is() && mxAddRec->IsVolatile()) ),
++            XML_aca,    XclXmlUtils::ToPsz( (mxTokArr.is() && mxTokArr->IsVolatile()) || (mxAddRec.is() && mxAddRec->IsVolati
+le()) ),
+             // OOXTODO: XML_ref,    ST_Ref
+             // OOXTODO: XML_dt2D,   bool
+             // OOXTODO: XML_dtr,    bool