Kaydet (Commit) e4376445 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in GalleryBrowser1

Change-Id: I0b95beed2c056e10cb40d09bf1040143778724ca
Reviewed-on: https://gerrit.libreoffice.org/53710Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 18b5b3ae
......@@ -150,8 +150,7 @@ void GalleryBrowser1::dispose()
EndListening( *mpGallery );
mpThemePropertiesDialog.clear();
mpThemes.disposeAndClear();
delete mpExchangeData;
mpExchangeData = nullptr;
mpExchangeData.reset();
maNewTheme.disposeAndClear();
Control::dispose();
}
......@@ -259,14 +258,14 @@ void GalleryBrowser1::ImplGetExecuteVector(std::vector<OString>& o_aExec)
void GalleryBrowser1::ImplGalleryThemeProperties( const OUString & rThemeName, bool bCreateNew )
{
DBG_ASSERT(!mpThemePropsDlgItemSet, "mpThemePropsDlgItemSet already set!");
mpThemePropsDlgItemSet = new SfxItemSet( SfxGetpApp()->GetPool() );
mpThemePropsDlgItemSet.reset(new SfxItemSet( SfxGetpApp()->GetPool() ));
GalleryTheme* pTheme = mpGallery->AcquireTheme( rThemeName, *this );
ImplFillExchangeData( pTheme, *mpExchangeData );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
assert(pFact && "Got no AbstractDialogFactory!");
mpThemePropertiesDialog = pFact->CreateGalleryThemePropertiesDialog(this, mpExchangeData, mpThemePropsDlgItemSet);
mpThemePropertiesDialog = pFact->CreateGalleryThemePropertiesDialog(this, mpExchangeData.get(), mpThemePropsDlgItemSet.get());
assert(mpThemePropertiesDialog && "Got no GalleryThemePropertiesDialog!");
if ( bCreateNew )
......@@ -336,8 +335,7 @@ IMPL_LINK( GalleryBrowser1, EndThemePropertiesDlgHdl, Dialog&, /*rDialog*/, void
IMPL_LINK( GalleryBrowser1, DestroyThemePropertiesDlgHdl, void*, /*p*/, void )
{
mpThemePropertiesDialog.disposeAndClear();
delete mpThemePropsDlgItemSet;
mpThemePropsDlgItemSet = nullptr;
mpThemePropsDlgItemSet.reset();
}
void GalleryBrowser1::ImplExecute(const OString &rIdent)
......
......@@ -78,8 +78,8 @@ private:
VclPtr<GalleryThemeListBox> mpThemes;
VclPtr<VclAbstractDialog2> mpThemePropertiesDialog; // to keep it alive during execution
Gallery* mpGallery;
ExchangeData* mpExchangeData;
SfxItemSet* mpThemePropsDlgItemSet;
std::unique_ptr<ExchangeData> mpExchangeData;
std::unique_ptr<SfxItemSet> mpThemePropsDlgItemSet;
Image aImgNormal;
Image aImgDefault;
......
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