[ooo-build-commit] patches/dev300

[Jan Nieuwenhuizen]

 patches/dev300/apply                                |    1 
 patches/dev300/oox-calc-export-sotstorage-init.diff |   43 ++++++++++++++++++++
 2 files changed, 44 insertions(+)

New commits:
commit 1135cd171462e462fa46a669b512e270479f50ad
Author: Jan Nieuwenhuizen <janneke at gnu.org>
Date:   Thu Jul 30 16:00:47 2009 +0200

    OOXML: calc export: init SotStorage from shell.GetMedium.  Fixes NULL init.
    
    While moving xlsx export to uno filter, SotStorage init code had to
    be added.  While it compiled, it always produced a NULL pointer.
    This inhibits any export using rStorage, such as pivotCache.
    
       * Modified     sc/source/filter/xlsx/xlsx-xestream.cxx

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 737080a..970cc77 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3315,6 +3315,7 @@ oox-pptx-export-animations-filter.diff, n#497570, rodo
 oox-calc-export-export-pivot-content.diff, n#505917, janneke
 oox-pptx-export-animations-paragraph-target.diff, n#497570, rodo
 oox-pptx-export-blip-luminance.diff, n#497570, rodo
+oox-calc-export-sotstorage-init.diff, n#505917, janneke
 
 [ CrossWin32Patches ]
 # Experimental patches to crosscompile OOo for Win32
diff --git a/patches/dev300/oox-calc-export-sotstorage-init.diff b/patches/dev300/oox-calc-export-sotstorage-init.diff
new file mode 100644
index 0000000..119a035
--- /dev/null
+++ b/patches/dev300/oox-calc-export-sotstorage-init.diff
@@ -0,0 +1,43 @@
+From 798f07e9c716329339fe7b51ab7a82cf3b83ebcb Mon Sep 17 00:00:00 2001
+From: Jan Nieuwenhuizen <janneke at gnu.org>
+Date: Thu, 30 Jul 2009 15:53:47 +0200
+Subject: [PATCH] OOXML: calc export: init SotStorage from shell.GetMedium.  Fixes NULL init.
+
+While moving xlsx export to uno filter, SotStorage init code had to
+be added.  While it compiled, it always produced a NULL pointer.
+This inhibits any export using rStorage, such as pivotCache.
+
+   * Modified     sc/source/filter/xlsx/xlsx-xestream.cxx
+---
+ sc/source/filter/xlsx/xlsx-xestream.cxx |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git sc/source/filter/xlsx/xlsx-xestream.cxx sc/source/filter/xlsx/xlsx-xestream.cxx
+index 0568512..84d038c 100644
+--- sc/source/filter/xlsx/xlsx-xestream.cxx
++++ sc/source/filter/xlsx/xlsx-xestream.cxx
+@@ -58,6 +58,10 @@
+ #include <formula/grammar.hxx>
+ #include <oox/export/drawingml.hxx>
+ 
++#include <sfx2/docfile.hxx>
++#include <sfx2/objsh.hxx>
++#include <sfx2/app.hxx>
++
+ #define DEBUG_XL_ENCRYPTION 0
+ 
+ using ::std::vector;
+@@ -1116,7 +1120,9 @@ bool XclExpXmlStream::exportDocument() throw()
+ {
+     ScDocShell* pShell = getDocShell();
+     ScDocument* pDoc = pShell->GetDocument();
+-    SotStorageRef rStorage = dynamic_cast <SotStorage*>( Reference<XStorage>( pShell->GetStorage() ).get() );
++    SfxMedium* pMedium = pShell->GetMedium();
++    SvStream* pMediumStream = pMedium->GetOutStream();
++    SotStorageRef rStorage = new SotStorage( pMediumStream, false );
+ 
+     XclExpRootData aData( EXC_BIFF8, *pShell->GetMedium (), rStorage, *pDoc, RTL_TEXTENCODING_DONTKNOW );
+     aData.meOutput = EXC_OUTPUT_XML_2007;
+-- 
+1.6.0.rc1.49.g98a8
+