[Libreoffice-commits] core.git: 2 commits - sc/source

[Markus Mohrhard]

 sc/source/filter/excel/excdoc.cxx |   10 +++++-----
 sc/source/filter/inc/xeextlst.hxx |    2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit ba90813d17cf35cfb67585d6f119d3ddb30f5978
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jul 24 01:12:17 2015 +0200

    don't generate invalid XLSX files
    
    The pivot table cache is not handled through the normal record system
    and as we need to make sure that the extLst is exported after the pivot
    cache let's add another hack.
    
    Change-Id: Icb816e3eb06add768d19cc1c237e6bf75816d9f0

diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index b56c9b1..de983b4 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -445,11 +445,6 @@ void ExcTable::FillAsHeaderXml( ExcBoundsheetList& rBoundsheetList )
     aRecList.AppendRecord( GetObjectManager().CreateDrawingGroup() );
     // Shared string table: SST, EXTSST
     aRecList.AppendRecord( CreateRecord( EXC_ID_SST ) );
-
-    XclExtLstRef xExtLst( new XclExtLst( GetRoot()  ) );
-    const ScCalcConfig& rCalcConfig = rDoc.GetCalcConfig();
-    xExtLst->AddRecord( XclExpExtRef( new XclExpExtCalcPr( GetRoot(), rCalcConfig.meStringRefAddressSyntax ))  );
-    aRecList.AppendRecord( xExtLst );
 }
 
 void ExcTable::FillAsTableBinary( SCTAB nCodeNameIdx )
@@ -886,6 +881,11 @@ void ExcDocument::WriteXml( XclExpXmlStream& rStrm )
     if (rCaches.HasCaches())
         rCaches.SaveXml(rStrm);
 
+    XclExtLstRef xExtLst( new XclExtLst( GetRoot()  ) );
+    const ScCalcConfig& rCalcConfig = GetDoc().GetCalcConfig();
+    xExtLst->AddRecord( XclExpExtRef( new XclExpExtCalcPr( GetRoot(), rCalcConfig.meStringRefAddressSyntax ))  );
+    xExtLst->SaveXml(rStrm);
+
     rWorkbook->endElement( XML_workbook );
     rWorkbook.reset();
 }
commit da302504676e7e3bd7ddda5bc57a00150fe36580
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Jul 24 01:05:09 2015 +0200

    that comment is not correct anymore
    
    Change-Id: I20e1b15b34730508d20ff436c51d66bd67c9e447

diff --git a/sc/source/filter/inc/xeextlst.hxx b/sc/source/filter/inc/xeextlst.hxx
index d31fb4d..fcb9a1d 100644
--- a/sc/source/filter/inc/xeextlst.hxx
+++ b/sc/source/filter/inc/xeextlst.hxx
@@ -34,8 +34,6 @@ struct XclExpExtCondFormatData
 
 /**
  * Base class for ext entries. Extend this class to provide the needed functionality
- *
- * Right now the only supported subclass is XclExpExtCondFormat
  */
 class XclExpExt : public XclExpRecordBase, public XclExpRoot
 {