summaryrefslogtreecommitdiff
path: root/oox/source/dump/pptxdumper.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source/dump/pptxdumper.cxx')
-rw-r--r--oox/source/dump/pptxdumper.cxx23
1 files changed, 11 insertions, 12 deletions
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 );
}
}