diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-24 11:30:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-25 08:47:22 +0200 |
| commit | 97c993b681bb059d1974b29ade5b433f93a85e46 (patch) | |
| tree | e229a6a328558b103c9f40da413d3c15b36b5d32 | |
| parent | cc60fd2285515b17b893ab4c106f5b060cf31a38 (diff) | |
loplugin:useuniqueptr in SwView_Impl
Change-Id: Id92590b00dbcd9b64ca90116fb6a275d66001519
Reviewed-on: https://gerrit.libreoffice.org/57945
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | sw/source/uibase/inc/uivwimp.hxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/uivwimp.cxx | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx index 46b627c518b7..67c90d732ea9 100644 --- a/sw/source/uibase/inc/uivwimp.hxx +++ b/sw/source/uibase/inc/uivwimp.hxx @@ -104,8 +104,8 @@ class SwView_Impl std::shared_ptr<SwMailMergeConfigItem> xConfigItem; - sfx2::DocumentInserter* m_pDocInserter; - SfxRequest* m_pRequest; + std::unique_ptr<sfx2::DocumentInserter> m_pDocInserter; + std::unique_ptr<SfxRequest> m_pRequest; sal_Int16 m_nParam; Point m_aEditingPosition; @@ -162,7 +162,7 @@ public: SfxMedium* CreateMedium(); void InitRequest( const SfxRequest& rRequest ); - SfxRequest* GetRequest() const { return m_pRequest; } + SfxRequest* GetRequest() const { return m_pRequest.get(); } sal_Int16 GetParam() const { return m_nParam; } void SetParam( sal_Int16 nParam ) { m_nParam = nParam; } }; diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx index 70d688111a4b..f626480715e1 100644 --- a/sw/source/uibase/uiview/uivwimp.cxx +++ b/sw/source/uibase/uiview/uivwimp.cxx @@ -87,8 +87,8 @@ SwView_Impl::~SwView_Impl() #if HAVE_FEATURE_DBCONNECTIVITY xConfigItem.reset(); #endif - delete m_pDocInserter; - delete m_pRequest; + m_pDocInserter.reset(); + m_pRequest.reset(); } void SwView_Impl::SetShellMode(ShellMode eSet) @@ -261,8 +261,7 @@ void SwView_Impl::StartDocumentInserter( break; } - delete m_pDocInserter; - m_pDocInserter = new ::sfx2::DocumentInserter(pView->GetFrameWeld(), rFactory, mode); + m_pDocInserter.reset(new ::sfx2::DocumentInserter(pView->GetFrameWeld(), rFactory, mode)); m_pDocInserter->StartExecuteModal( rEndDialogHdl ); } @@ -273,8 +272,7 @@ SfxMedium* SwView_Impl::CreateMedium() void SwView_Impl::InitRequest( const SfxRequest& rRequest ) { - delete m_pRequest; - m_pRequest = new SfxRequest( rRequest ); + m_pRequest.reset(new SfxRequest( rRequest )); } SwScannerEventListener::~SwScannerEventListener() |