diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-14 09:11:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-18 07:23:01 +0100 |
| commit | 49fb2a24c46e5097650c0951eeabe336d242834a (patch) | |
| tree | 8ae58c0d59c353831b7889dedce67330ace8ccb3 /filter | |
| parent | use unique_ptr in XMLTextImportPropertyMapper (diff) | |
| download | core-49fb2a24c46e5097650c0951eeabe336d242834a.tar.gz core-49fb2a24c46e5097650c0951eeabe336d242834a.zip | |
use unique_ptr in SdrPowerPointImport
Change-Id: I46608f7dd44f95bc811b20b6f26b63f0c1dc140e
Reviewed-on: https://gerrit.libreoffice.org/65144
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 99430c9abc0f..18aacd8e6803 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1972,9 +1972,9 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId, return pRet; } -SvMemoryStream* SdrPowerPointImport::ImportExOleObjStg( sal_uInt32 nPersistPtr, sal_uInt32& nOleId ) const +std::unique_ptr<SvMemoryStream> SdrPowerPointImport::ImportExOleObjStg( sal_uInt32 nPersistPtr, sal_uInt32& nOleId ) const { - SvMemoryStream* pRet = nullptr; + std::unique_ptr<SvMemoryStream> pRet; if ( nPersistPtr && ( nPersistPtr < nPersistPtrCnt ) ) { sal_uInt32 nOldPos, nOfs = pPersistPtr[ nPersistPtr ]; @@ -1988,14 +1988,13 @@ SvMemoryStream* SdrPowerPointImport::ImportExOleObjStg( sal_uInt32 nPersistPtr, if ( static_cast<sal_Int32>(nLen) > 0 ) { rStCtrl.ReadUInt32( nOleId ); - pRet = new SvMemoryStream; + pRet.reset(new SvMemoryStream); ZCodec aZCodec( 0x8000, 0x8000 ); aZCodec.BeginCompression(); aZCodec.Decompress( rStCtrl, *pRet ); if ( !aZCodec.EndCompression() ) { - delete pRet; - pRet = nullptr; + pRet.reset(); } } } @@ -2028,10 +2027,10 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt .ReadUInt32( nIDoNotKnow2 ); sal_uInt32 nOleId; - SvMemoryStream* pBas = ImportExOleObjStg( nPersistPtr, nOleId ); + std::unique_ptr<SvMemoryStream> pBas = ImportExOleObjStg( nPersistPtr, nOleId ); if ( pBas ) { - tools::SvRef<SotStorage> xSource( new SotStorage( pBas, true ) ); + tools::SvRef<SotStorage> xSource( new SotStorage( pBas.release(), true ) ); tools::SvRef<SotStorage> xDest( new SotStorage( new SvMemoryStream(), true ) ); if ( xSource.is() && xDest.is() ) { |