diff options
Diffstat (limited to 'sd/source/filter/eppt')
-rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 12 | ||||
-rw-r--r-- | sd/source/filter/eppt/eppt.hxx | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 5c1f9da7d7af..237fd2276f5d 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -106,12 +106,12 @@ void PPTWriter::exportPPTPre( const std::vector< css::beans::PropertyValue >& rM if ( !ImplCreateCurrentUserStream() ) return; - mpStrm.reset( mrStg->OpenSotStream( "PowerPoint Document" ) ); + mpStrm = mrStg->OpenSotStream( "PowerPoint Document" ); if ( !mpStrm ) return; if ( !mpPicStrm ) - mpPicStrm.reset( mrStg->OpenSotStream( "Pictures" ) ); + mpPicStrm = mrStg->OpenSotStream( "Pictures" ); auto aIter = std::find_if(rMediaData.begin(), rMediaData.end(), [](const css::beans::PropertyValue& rProp) { return rProp.Name == "BaseURI"; }); @@ -448,9 +448,9 @@ PPTWriter::~PPTWriter() { mpExEmbed.reset(); mpPptEscherEx.reset(); - mpCurUserStrm.reset(); - mpPicStrm.reset(); - mpStrm.reset(); + mpCurUserStrm.clear(); + mpPicStrm.clear(); + mpStrm.clear(); maStyleSheetList.clear(); maExOleObj.clear(); if ( mbStatusIndicator ) @@ -459,7 +459,7 @@ PPTWriter::~PPTWriter() bool PPTWriter::ImplCreateCurrentUserStream() { - mpCurUserStrm.reset( mrStg->OpenSotStream( "Current User" ) ); + mpCurUserStrm = mrStg->OpenSotStream( "Current User" ); if ( !mpCurUserStrm ) return false; char pUserName[] = "Current User"; diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 04255e711d99..bed711891345 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -23,6 +23,7 @@ #include <vector> #include "escherex.hxx" #include <sal/types.h> +#include <sot/storage.hxx> #include "pptexsoundcollection.hxx" #include "text.hxx" @@ -127,9 +128,9 @@ class PPTWriter final : public PPTWriterBase, public PPTExBulletProvider sal_uInt32 mnTextSize; tools::SvRef<SotStorage> mrStg; - std::unique_ptr<SvStream> mpCurUserStrm; - std::unique_ptr<SvStream> mpStrm; - std::unique_ptr<SvStream> mpPicStrm; + tools::SvRef<SotStorageStream> mpCurUserStrm; + tools::SvRef<SotStorageStream> mpStrm; + tools::SvRef<SotStorageStream> mpPicStrm; std::unique_ptr<PptEscherEx> mpPptEscherEx; std::vector<std::unique_ptr<PPTExOleObjEntry>> maExOleObj; |