[ooo-build-commit] Branch 'ooo-build-3-1' - patches/dev300

[Jan Nieuwenhuizen]

 patches/dev300/apply                                     |    3 
 patches/dev300/oox-calc-export-export-pivot-content.diff |   50 +++++++++++++++
 2 files changed, 53 insertions(+)

New commits:
commit 96e263ba19aa7c23527dc24d39b6fe57978c198f
Author: Jan Nieuwenhuizen <janneke at gnu.org>
Date:   Thu Jul 30 14:38:40 2009 +0200

    OOXML: Disable pivot cache export.  Fixes content-bit of n#505917.
    
       * Modified     sc/source/filter/xlsx/xlsx-xepivot.cxx

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6168046..75cde3c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3063,6 +3063,9 @@ ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
 # Fix for crash on Windows by Rail Aliev. Root cause unknown.
 configmgr-validate-removedtree.diff, n#505704
 
+[ OOXMLExport ]
+oox-calc-export-export-pivot-content.diff, n#505917, janneke
+
 svx-fix-fit-to-frame-crash.diff, n#508621, rodo
 
 [ UnusedMethodsRemoval ]
diff --git a/patches/dev300/oox-calc-export-export-pivot-content.diff b/patches/dev300/oox-calc-export-export-pivot-content.diff
new file mode 100644
index 0000000..6e36ca6
--- /dev/null
+++ b/patches/dev300/oox-calc-export-export-pivot-content.diff
@@ -0,0 +1,50 @@
+From 2602c2c2ab3882a882ce8871d81973e5d5b524b4 Mon Sep 17 00:00:00 2001
+From: Jan Nieuwenhuizen <janneke at gnu.org>
+Date: Mon, 27 Jul 2009 11:27:36 +0200
+Subject: [PATCH] OOXML: Disable pivot cache export.  Fixes content-bit of n#505917.
+
+   * Modified     sc/source/filter/xlsx/xlsx-xepivot.cxx
+---
+ sc/source/filter/xlsx/xlsx-xepivot.cxx |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git sc/source/filter/xlsx/xlsx-xepivot.cxx sc/source/filter/xlsx/xlsx-xepivot.cxx
+index 57409c1..217e01d 100644
+--- sc/source/filter/xlsx/xlsx-xepivot.cxx
++++ sc/source/filter/xlsx/xlsx-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 --------------------------------------------------------------------
+@@ -1844,12 +1847,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 )
+-- 
+1.6.0.rc1.49.g98a8
+