diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-15 10:54:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-15 14:21:31 +0100 |
| commit | a98465920f0c82759d3e74b437c4fb4dd9f2c4c6 (patch) | |
| tree | ee74aefd790b7f586010ea65314bde6ead1a3694 /sd/source/ui/app | |
| parent | 509c69a9936f6af051f4888bbc88b7f2678783b3 (diff) | |
loplugin:useuniqueptr in SdModule
Change-Id: I3b79696f06b33703cf61b73867014e4fd86ee9c7
Reviewed-on: https://gerrit.libreoffice.org/51313
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/app')
| -rw-r--r-- | sd/source/ui/app/sdmod.cxx | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index d442e6c50357..c519302a8fa5 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -71,18 +71,16 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) pTransferSelection(nullptr), pImpressOptions(nullptr), pDrawOptions(nullptr), - pSearchItem(nullptr), - pNumberFormatter( nullptr ), bWaterCan(false), mbEventListenerAdded(false), mpColorConfig(new svtools::ColorConfig) { SetName( "StarDraw" ); // Do not translate! - pSearchItem = new SvxSearchItem(SID_SEARCH_ITEM); + pSearchItem.reset( new SvxSearchItem(SID_SEARCH_ITEM) ); pSearchItem->SetAppFlag(SvxSearchApp::DRAW); StartListening( *SfxGetpApp() ); SvxErrorHandler::ensure(); - mpErrorHdl = new SfxErrorHandler(RID_SD_ERRHDL, ErrCodeArea::Sd, ErrCodeArea::Sd, GetResLocale()); + mpErrorHdl.reset( new SfxErrorHandler(RID_SD_ERRHDL, ErrCodeArea::Sd, ErrCodeArea::Sd, GetResLocale()) ); // Create a new ref device and (by calling SetReferenceDevice()) // set its resolution to 600 DPI. This leads to a visually better @@ -100,18 +98,23 @@ OUString SdResId(const char* pId) // Dtor SdModule::~SdModule() { - delete pSearchItem; - delete pNumberFormatter; + pSearchItem.reset(); + pNumberFormatter.reset(); if (mbEventListenerAdded) { Application::RemoveEventListener( LINK( this, SdModule, EventListenerHdl ) ); } - delete mpErrorHdl; + mpErrorHdl.reset(); mpVirtualRefDevice.disposeAndClear(); } +void SdModule::SetSearchItem(std::unique_ptr<SvxSearchItem> pItem) +{ + pSearchItem = std::move(pItem); +} + /// get notifications void SdModule::Notify( SfxBroadcaster&, const SfxHint& rHint ) { @@ -205,9 +208,9 @@ tools::SvRef<SotStorageStream> SdModule::GetOptionStream( const OUString& rOptio SvNumberFormatter* SdModule::GetNumberFormatter() { if( !pNumberFormatter ) - pNumberFormatter = new SvNumberFormatter( ::comphelper::getProcessComponentContext(), LANGUAGE_SYSTEM ); + pNumberFormatter.reset( new SvNumberFormatter( ::comphelper::getProcessComponentContext(), LANGUAGE_SYSTEM ) ); - return pNumberFormatter; + return pNumberFormatter.get(); } svtools::ColorConfig& SdModule::GetColorConfig() |