Skip to content

C
core
Kaydet (Commit) f72b5d4b authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

loplugin:useuniqueptr in SdrEscherImport 

Change-Id: Id37c4cb7a8eb88b2f83ed0bfb4b72fe38a128096
Reviewed-on: https://gerrit.libreoffice.org/50694Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst cab19696
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 25 deletions
filter/source/msfilter/svdfppt.cxx
Dosyayı görüntüle @ f72b5d4b
...@@ -525,10 +525,6 @@ SdrEscherImport::SdrEscherImport( PowerPointImportParam& rParam, const OUString& ...@@ -525,10 +525,6 @@ SdrEscherImport::SdrEscherImport( PowerPointImportParam& rParam, const OUString&
SdrEscherImport::~SdrEscherImport() SdrEscherImport::~SdrEscherImport()
{ {
for (PPTOleEntry* i : aOleObjectList)
delete i;
aOleObjectList.clear();
delete m_pFonts;
} }
const PptSlideLayoutAtom* SdrEscherImport::GetSlideLayoutAtom() const const PptSlideLayoutAtom* SdrEscherImport::GetSlideLayoutAtom() const
...@@ -1820,12 +1816,12 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId, ...@@ -1820,12 +1816,12 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId,
} }
} }
for (PPTOleEntry* pOe : const_cast<SdrPowerPointImport*>(this)->aOleObjectList) for (PPTOleEntry& rOe : const_cast<SdrPowerPointImport*>(this)->aOleObjectList)
{ {
if ( pOe->nId != nOLEId ) if ( rOe.nId != nOLEId )
continue; continue;
rStCtrl.Seek( pOe->nRecHdOfs ); rStCtrl.Seek( rOe.nRecHdOfs );
DffRecordHeader aHd; DffRecordHeader aHd;
ReadDffRecordHeader( rStCtrl, aHd ); ReadDffRecordHeader( rStCtrl, aHd );
...@@ -1878,23 +1874,23 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId, ...@@ -1878,23 +1874,23 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId,
OUString aNm; OUString aNm;
// if ( nSvxMSDffOLEConvFlags ) // if ( nSvxMSDffOLEConvFlags )
{ {
uno::Reference < embed::XStorage > xDestStorage( pOe->pShell->GetStorage() ); uno::Reference < embed::XStorage > xDestStorage( rOe.pShell->GetStorage() );
uno::Reference < embed::XEmbeddedObject > xObj = uno::Reference < embed::XEmbeddedObject > xObj =
CheckForConvertToSOObj(nSvxMSDffOLEConvFlags, *xObjStor, xDestStorage, rGraf, rVisArea, maBaseURL); CheckForConvertToSOObj(nSvxMSDffOLEConvFlags, *xObjStor, xDestStorage, rGraf, rVisArea, maBaseURL);
if( xObj.is() ) if( xObj.is() )
{ {
pOe->pShell->getEmbeddedObjectContainer().InsertEmbeddedObject( xObj, aNm ); rOe.pShell->getEmbeddedObjectContainer().InsertEmbeddedObject( xObj, aNm );
svt::EmbeddedObjectRef aObj( xObj, pOe->nAspect ); svt::EmbeddedObjectRef aObj( xObj, rOe.nAspect );
// TODO/LATER: need MediaType for Graphic // TODO/LATER: need MediaType for Graphic
aObj.SetGraphic( rGraf, OUString() ); aObj.SetGraphic( rGraf, OUString() );
pRet = new SdrOle2Obj( aObj, aNm, rBoundRect ); pRet = new SdrOle2Obj( aObj, aNm, rBoundRect );
} }
} }
if ( !pRet && ( pOe->nType == PPT_PST_ExControl ) ) if ( !pRet && ( rOe.nType == PPT_PST_ExControl ) )
{ {
uno::Reference< frame::XModel > xModel( pOe->pShell->GetModel() ); uno::Reference< frame::XModel > xModel( rOe.pShell->GetModel() );
PPTConvertOCXControls aPPTConvertOCXControls( this, xModel, eAktPageKind ); PPTConvertOCXControls aPPTConvertOCXControls( this, xModel, eAktPageKind );
css::uno::Reference< css::drawing::XShape > xShape; css::uno::Reference< css::drawing::XShape > xShape;
if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape ) ) if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape ) )
...@@ -1903,10 +1899,10 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId, ...@@ -1903,10 +1899,10 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId,
} }
if ( !pRet ) if ( !pRet )
{ {
aNm = pOe->pShell->getEmbeddedObjectContainer().CreateUniqueObjectName(); aNm = rOe.pShell->getEmbeddedObjectContainer().CreateUniqueObjectName();
// object is not an own object // object is not an own object
const css::uno::Reference < css::embed::XStorage >& rStorage = pOe->pShell->GetStorage(); const css::uno::Reference < css::embed::XStorage >& rStorage = rOe.pShell->GetStorage();
if (rStorage.is()) if (rStorage.is())
{ {
tools::SvRef<SotStorage> xTarget = SotStorage::OpenOLEStorage(rStorage, aNm, StreamMode::READWRITE); tools::SvRef<SotStorage> xTarget = SotStorage::OpenOLEStorage(rStorage, aNm, StreamMode::READWRITE);
...@@ -1920,34 +1916,34 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId, ...@@ -1920,34 +1916,34 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId,
} }
uno::Reference < embed::XEmbeddedObject > xObj = uno::Reference < embed::XEmbeddedObject > xObj =
pOe->pShell->getEmbeddedObjectContainer().GetEmbeddedObject( aNm ); rOe.pShell->getEmbeddedObjectContainer().GetEmbeddedObject( aNm );
if ( xObj.is() ) if ( xObj.is() )
{ {
if ( pOe->nAspect != embed::Aspects::MSOLE_ICON ) if ( rOe.nAspect != embed::Aspects::MSOLE_ICON )
{ {
//TODO/LATER: keep on hacking?! //TODO/LATER: keep on hacking?!
// we don't want to be modified // we don't want to be modified
//xInplaceObj->EnableSetModified( sal_False ); //xInplaceObj->EnableSetModified( sal_False );
if ( rVisArea.IsEmpty() ) if ( rVisArea.IsEmpty() )
{ {
MapUnit aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( pOe->nAspect ) ); MapUnit aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( rOe.nAspect ) );
Size aSize( OutputDevice::LogicToLogic( aGraphic.GetPrefSize(), Size aSize( OutputDevice::LogicToLogic( aGraphic.GetPrefSize(),
aGraphic.GetPrefMapMode(), MapMode( aMapUnit ) ) ); aGraphic.GetPrefMapMode(), MapMode( aMapUnit ) ) );
awt::Size aSz; awt::Size aSz;
aSz.Width = aSize.Width(); aSz.Width = aSize.Width();
aSz.Height = aSize.Height(); aSz.Height = aSize.Height();
xObj->setVisualAreaSize( pOe->nAspect, aSz ); xObj->setVisualAreaSize( rOe.nAspect, aSz );
} }
else else
{ {
awt::Size aSize( rVisArea.GetSize().Width(), rVisArea.GetSize().Height() ); awt::Size aSize( rVisArea.GetSize().Width(), rVisArea.GetSize().Height() );
xObj->setVisualAreaSize( pOe->nAspect, aSize ); xObj->setVisualAreaSize( rOe.nAspect, aSize );
} }
//xInplaceObj->EnableSetModified( sal_True ); //xInplaceObj->EnableSetModified( sal_True );
} }
svt::EmbeddedObjectRef aObj( xObj, pOe->nAspect ); svt::EmbeddedObjectRef aObj( xObj, rOe.nAspect );
// TODO/LATER: need MediaType for Graphic // TODO/LATER: need MediaType for Graphic
aObj.SetGraphic( aGraphic, OUString() ); aObj.SetGraphic( aGraphic, OUString() );
...@@ -2136,8 +2132,8 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt ...@@ -2136,8 +2132,8 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt
if ( aHd.nRecType == DFF_PST_ExOleObjStg ) if ( aHd.nRecType == DFF_PST_ExOleObjStg )
{ {
rStCtrl.ReadUInt32( nId ); rStCtrl.ReadUInt32( nId );
aOleObjectList.push_back( aOleObjectList.emplace_back(
new PPTOleEntry( aAt.nId, aHd.nFilePos, pShell, nRecType, aAt.nAspect ) ); aAt.nId, aHd.nFilePos, pShell, nRecType, aAt.nAspect );
} }
} }
} }
...@@ -2164,7 +2160,7 @@ bool SdrPowerPointImport::ReadFontCollection() ...@@ -2164,7 +2160,7 @@ bool SdrPowerPointImport::ReadFontCollection()
{ {
bRet = true; bRet = true;
if (!m_pFonts) if (!m_pFonts)
m_pFonts = new PptFontCollection; m_pFonts.reset( new PptFontCollection );
std::unique_ptr<PptFontEntityAtom> pFont(new PptFontEntityAtom); std::unique_ptr<PptFontEntityAtom> pFont(new PptFontEntityAtom);
ReadPptFontEntityAtom( rStCtrl, *pFont ); ReadPptFontEntityAtom( rStCtrl, *pFont );
......
include/filter/msfilter/svdfppt.hxx
Dosyayı görüntüle @ f72b5d4b
...@@ -460,9 +460,9 @@ protected: ...@@ -460,9 +460,9 @@ protected:
PptDocumentAtom aDocAtom; PptDocumentAtom aDocAtom;
DffRecordManager aDocRecManager; // contains all first level container and atoms of the document container DffRecordManager aDocRecManager; // contains all first level container and atoms of the document container
::std::vector< PPTOleEntry* > aOleObjectList; ::std::vector< PPTOleEntry > aOleObjectList;
PptFontCollection* m_pFonts; std::unique_ptr<PptFontCollection> m_pFonts;
sal_uInt32 nStreamLen; sal_uInt32 nStreamLen;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment