From 7a5084f1acacb0858588d4d0c82651e47ca9914f Mon Sep 17 00:00:00 2001
From: "Daniel Rentz [dr]" <daniel.rentz@oracle.com>
Date: Mon, 7 Feb 2011 17:18:11 +0100
Subject: dr78: rework of stream handling, improve handling of very large
 streams (prevent loading entire stream into array or string, esp. dumper and
 VML import), full support of XComponentContext

---
 oox/source/dump/pptxdumper.cxx | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'oox/source/dump/pptxdumper.cxx')

diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx
index 39e0ccc2be55..c98ffac7e38d 100644
--- a/oox/source/dump/pptxdumper.cxx
+++ b/oox/source/dump/pptxdumper.cxx
@@ -56,14 +56,13 @@ RootStorageObject::RootStorageObject( const DumperBase& rParent )
     StorageObjectBase::construct( rParent );
 }
 
-void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
+void RootStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
 {
     OUString aExt = InputOutputHelper::getFileNameExtension( rStrmName );
-    Reference< XInputStream > xInStrm = InputOutputHelper::getXInputStream( *rxStrm );
     if( aExt.equalsIgnoreAsciiCaseAscii( "pptx" ) ||
         aExt.equalsIgnoreAsciiCaseAscii( "potx" ) )
     {
-        Dumper( getFactory(), xInStrm, rSysFileName ).dump();
+        Dumper( getContext(), rxStrm, rSysFileName ).dump();
     }
     else if(
         aExt.equalsIgnoreAsciiCaseAscii( "xlsb" ) ||
@@ -72,7 +71,7 @@ void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, cons
         aExt.equalsIgnoreAsciiCaseAscii( "xltm" ) ||
         aExt.equalsIgnoreAsciiCaseAscii( "xltx" ) )
     {
-        ::oox::dump::xlsb::Dumper( getFactory(), xInStrm, rSysFileName ).dump();
+        ::oox::dump::xlsb::Dumper( getContext(), rxStrm, rSysFileName ).dump();
     }
     else if(
         aExt.equalsIgnoreAsciiCaseAscii( "xla" ) ||
@@ -82,7 +81,7 @@ void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, cons
         aExt.equalsIgnoreAsciiCaseAscii( "xlt" ) ||
         aExt.equalsIgnoreAsciiCaseAscii( "xlw" ) )
     {
-        ::oox::dump::biff::Dumper( getFactory(), xInStrm, rSysFileName ).dump();
+        ::oox::dump::biff::Dumper( getContext(), rxStrm, rSysFileName ).dump();
     }
     else if(
         aExt.equalsIgnoreAsciiCaseAscii( "xml" ) ||
@@ -95,17 +94,17 @@ void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, cons
     {
         if( rStrgPath.equalsAscii( "ppt" ) && rStrmName.equalsAscii( "vbaProject.bin" ) )
         {
-            StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, false ) );
+            StorageRef xStrg( new ::oox::ole::OleStorage( getContext(), rxStrm, false ) );
             VbaProjectStorageObject( *this, xStrg, rSysFileName ).dump();
         }
         else if( rStrgPath.equalsAscii( "ppt/embeddings" ) )
         {
-            StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, false ) );
+            StorageRef xStrg( new ::oox::ole::OleStorage( getContext(), rxStrm, false ) );
             OleStorageObject( *this, xStrg, rSysFileName ).dump();
         }
         else if( rStrgPath.equalsAscii( "ppt/activeX" ) )
         {
-            StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, true ) );
+            StorageRef xStrg( new ::oox::ole::OleStorage( getContext(), rxStrm, true ) );
             ActiveXStorageObject( *this, xStrg, rSysFileName ).dump();
         }
         else
@@ -125,13 +124,13 @@ Dumper::Dumper( const FilterBase& rFilter )
     DumperBase::construct( xCfg );
 }
 
-Dumper::Dumper( const Reference< XMultiServiceFactory >& rxFactory, const Reference< XInputStream >& rxInStrm, const OUString& rSysFileName )
+Dumper::Dumper( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm, const OUString& rSysFileName )
 {
-    if( rxFactory.is() && rxInStrm.is() )
+    if( rxContext.is() && rxInStrm.is() )
     {
-        StorageRef xStrg( new ZipStorage( rxFactory, rxInStrm ) );
+        StorageRef xStrg( new ZipStorage( rxContext, rxInStrm ) );
         MediaDescriptor aMediaDesc;
-        ConfigRef xCfg( new Config( DUMP_PPTX_CONFIG_ENVVAR, rxFactory, xStrg, rSysFileName, aMediaDesc ) );
+        ConfigRef xCfg( new Config( DUMP_PPTX_CONFIG_ENVVAR, rxContext, xStrg, rSysFileName, aMediaDesc ) );
         DumperBase::construct( xCfg );
     }
 }
-- 
cgit