From 36f8b5ec35440fa0b1dadadf28ce9d1a83f8dc50 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 24 Jul 2018 11:31:56 +0200 Subject: loplugin:useuniqueptr in SwSrcView Change-Id: I550d184ddd158e32abc353f8f1d458319bd4c2c5 Reviewed-on: https://gerrit.libreoffice.org/57946 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sw/source/uibase/inc/srcview.hxx | 2 +- sw/source/uibase/uiview/srcview.cxx | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx index 298983510f4d..60b866371352 100644 --- a/sw/source/uibase/inc/srcview.hxx +++ b/sw/source/uibase/inc/srcview.hxx @@ -34,7 +34,7 @@ class SwSrcView: public SfxViewShell { VclPtr aEditWin; - SvxSearchItem* pSearchItem; + std::unique_ptr pSearchItem; bool bSourceSaved :1; rtl_TextEncoding eLoadEncoding; diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 5aefb75da632..7160f1ec66cb 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -234,7 +234,7 @@ SwSrcView::~SwSrcView() pDocShell->SetAutoLoad(INetURLObject(url), delay, (delay != 0) || !url.isEmpty()); EndListening(*pDocShell); - delete pSearchItem; + pSearchItem.reset(); aEditWin.disposeAndClear(); } @@ -548,15 +548,14 @@ SvxSearchItem* SwSrcView::GetSearchItem() { if(!pSearchItem) { - pSearchItem = new SvxSearchItem(SID_SEARCH_ITEM); + pSearchItem.reset(new SvxSearchItem(SID_SEARCH_ITEM)); } - return pSearchItem; + return pSearchItem.get(); } void SwSrcView::SetSearchItem( const SvxSearchItem& rItem ) { - delete pSearchItem; - pSearchItem = static_cast(rItem.Clone()); + pSearchItem.reset(static_cast(rItem.Clone())); } void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, -- cgit