summaryrefslogtreecommitdiff
path: root/sd/source/filter/eppt
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-06 16:33:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-07 11:05:04 +0200
commitdc47b2e5136f0f767273dc5fdba5c822575e194b (patch)
tree128ac4f7f3aca38d0928b76e529ae7fae021f7c3 /sd/source/filter/eppt
parente14b7660f622a83fe97635649674ade05fe1eb72 (diff)
Unwind SotStorageRef typedef
Change-Id: I8d5363bb2ad813ef29b4078848914f4b0989b9f1
Diffstat (limited to 'sd/source/filter/eppt')
-rw-r--r--sd/source/filter/eppt/eppt.cxx16
-rw-r--r--sd/source/filter/eppt/eppt.hxx4
-rw-r--r--sd/source/filter/eppt/epptso.cxx2
3 files changed, 11 insertions, 11 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 091d46c2c116..f9980473940e 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -66,7 +66,7 @@ using ::com::sun::star::beans::XPropertySet;
//============================ PPTWriter ==================================
-PPTWriter::PPTWriter( SotStorageRef& rSvStorage,
+PPTWriter::PPTWriter( tools::SvRef<SotStorage>& rSvStorage,
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel,
::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd,
SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) :
@@ -1278,13 +1278,13 @@ void PPTWriter::ImplWriteOLE( )
::uno::Reference < embed::XEmbeddedObject > xObj( static_cast<SdrOle2Obj*>(pSdrObj)->GetObjRef() );
if( xObj.is() )
{
- SotStorageRef xTempStorage( new SotStorage( new SvMemoryStream(), true ) );
+ tools::SvRef<SotStorage> xTempStorage( new SotStorage( new SvMemoryStream(), true ) );
aOleExport.ExportOLEObject( xObj, *xTempStorage );
//TODO/MBA: testing
OUString aPersistStream( SVEXT_PERSIST_STREAM );
SvMemoryStream aStream;
- SotStorageRef xCleanStorage( new SotStorage( false, aStream ) );
+ tools::SvRef<SotStorage> xCleanStorage( new SotStorage( false, aStream ) );
xTempStorage->CopyTo( xCleanStorage );
// create a dummy content stream, the dummy content is necessary for ppt, but not for
// doc files, so we can't share code.
@@ -1311,7 +1311,7 @@ void PPTWriter::ImplWriteOLE( )
OUString aName;
//Initialize the graphic size which will be used on export
::com::sun::star::awt::Size aSize( pPtr->xShape->getSize() );
- SotStorageRef xDest( new SotStorage( new SvMemoryStream(), true ) );
+ tools::SvRef<SotStorage> xDest( new SotStorage( new SvMemoryStream(), true ) );
bool bOk = oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xDest, pPtr->xControlModel, aSize, aName );
if ( bOk )
pStrm = xDest->CreateMemoryStream();
@@ -1448,7 +1448,7 @@ bool PPTWriter::ImplWriteAtomEnding()
// - exported function -
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SotStorageRef& rSvStorage,
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, tools::SvRef<SotStorage>& rSvStorage,
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel,
::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd,
SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags )
@@ -1462,14 +1462,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector<
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas )
{
- SotStorageRef xDest( new SotStorage( new SvMemoryStream(), true ) );
+ tools::SvRef<SotStorage> xDest( new SotStorage( new SvMemoryStream(), true ) );
SvxImportMSVBasic aMSVBas( rDocShell, *xDest );
aMSVBas.SaveOrDelMSVBAStorage( true, OUString( "_MS_VBA_Overhead" ) );
- SotStorageRef xOverhead = xDest->OpenSotStorage( OUString( "_MS_VBA_Overhead") );
+ tools::SvRef<SotStorage> xOverhead = xDest->OpenSotStorage( OUString( "_MS_VBA_Overhead") );
if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) )
{
- SotStorageRef xOverhead2 = xOverhead->OpenSotStorage( OUString( "_MS_VBA_Overhead") );
+ tools::SvRef<SotStorage> xOverhead2 = xOverhead->OpenSotStorage( OUString( "_MS_VBA_Overhead") );
if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) )
{
SotStorageStreamRef xTemp = xOverhead2->OpenSotStream( OUString( "_MS_VBA_Overhead2") );
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 7fa831df39c0..0513dbaad0ea 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -177,7 +177,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
bool mbFontIndependentLineSpacing;
sal_uInt32 mnTextSize;
- SotStorageRef mrStg;
+ tools::SvRef<SotStorage> mrStg;
SvStream* mpCurUserStrm;
SvStream* mpStrm;
SvStream* mpPicStrm;
@@ -274,7 +274,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE;
public:
- PPTWriter( SotStorageRef& rSvStorage,
+ PPTWriter( tools::SvRef<SotStorage>& rSvStorage,
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rModel,
::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rStatInd,
SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags );
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 7e0ba731b1d8..567a8371ae35 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2505,7 +2505,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
::com::sun::star::awt::Size aSize;
OUString aControlName;
- SotStorageRef xTemp( new SotStorage( new SvMemoryStream(), true ) );
+ tools::SvRef<SotStorage> xTemp( new SotStorage( new SvMemoryStream(), true ) );
if ( oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xTemp, aXControlModel, aSize, aControlName ) )
{
OUString aUserName( xTemp->GetUserName() );