diff options
| author | Katarina Machalkova <kmachalkova@suse.cz> | 2010-10-13 17:56:46 +0200 |
|---|---|---|
| committer | Katarina Machalkova <kmachalkova@suse.cz> | 2010-10-13 19:51:45 +0200 |
| commit | a24894fbfbcbaffabfe19b6b478be32782a4e8ea (patch) | |
| tree | 66e72e98d0326bf0c95cfb94382aa817b1e019d0 | |
| parent | d0664c2ae8b6f9452ab1b492f3707c942aa61d36 (diff) | |
Merged xlsx-shared-oox-calc-export-export-pivot-content.diff from ooo-build
| -rw-r--r-- | sc/source/filter/excel/xepivot.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 5522649b4187..797317d9524e 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -740,6 +740,8 @@ void XclExpPivotCache::Save( XclExpStream& rStrm ) void XclExpPivotCache::SaveXml( XclExpXmlStream& rStrm ) { DBG_ASSERT( mbValid, "XclExpPivotCache::Save - invalid pivot cache" ); +#ifdef XLSX_PIVOT_CACHE /* <pivotCache> without xl/pivotCaches/ cacheStream + results in a broken .xlsx */ sax_fastparser::FSHelperPtr& rWorkbook = rStrm.GetCurrentStream(); OUString sId = OUStringBuffer() .appendAscii("rId") @@ -758,6 +760,7 @@ void XclExpPivotCache::SaveXml( XclExpXmlStream& rStrm ) // create the pivot cache storage stream // OOXTODO: WriteCacheStream(); rWorkbook->endElement( XML_pivotCache ); +#endif /* XLSX_PIVOT_CACHE */ } // private -------------------------------------------------------------------- @@ -1871,12 +1874,15 @@ void XclExpPivotTableManager::WritePivotCaches( XclExpStream& rStrm ) void XclExpPivotTableManager::WritePivotCachesXml( XclExpXmlStream& rStrm ) { +#ifdef XLSX_PIVOT_CACHE /* <pivotCache> without xl/pivotCaches/ cacheStream + results in a broken .xlsx */ if( maPCacheList.IsEmpty() ) return; sax_fastparser::FSHelperPtr& rWorkbook = rStrm.GetCurrentStream(); rWorkbook->startElement( XML_pivotCaches, FSEND ); maPCacheList.SaveXml( rStrm ); rWorkbook->endElement( XML_pivotCaches ); +#endif /* XLSX_PIVOT_CACHE */ } void XclExpPivotTableManager::WritePivotTables( XclExpStream& rStrm, SCTAB nScTab ) |