summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-07-24 01:12:17 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-07-24 01:14:15 +0200
commitba90813d17cf35cfb67585d6f119d3ddb30f5978 (patch)
tree0a595ff36c42e7d45d921467caf34cedebf6dbec
parentda302504676e7e3bd7ddda5bc57a00150fe36580 (diff)
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
-rw-r--r--sc/source/filter/excel/excdoc.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index b56c9b179bb4..de983b4f97e6 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();
}