From e528b7fd3a064eea788ae4f8b6901a941be3bc4c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 27 Jun 2018 10:30:17 +0200 Subject: [PATCH] loplugin:useuniqueptr in ScAccessibleNoteTextData Change-Id: I38101b3046c4354f48b6c9d34a016351659e9795 Reviewed-on: https://gerrit.libreoffice.org/56551 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sc/source/ui/Accessibility/AccessibleText.cxx | 8 ++++---- sc/source/ui/inc/AccessibleText.hxx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index f82b3d812043..7983e978c160 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -1439,7 +1439,7 @@ ScAccessibleNoteTextData::~ScAccessibleNoteTextData() if (mpEditEngine) mpEditEngine->SetNotifyHdl(Link()); mpEditEngine.reset(); - delete mpForwarder; + mpForwarder.reset(); } ScAccessibleTextData* ScAccessibleNoteTextData::Clone() const @@ -1478,11 +1478,11 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder() mpEditEngine->SetRefDevice(mpDocSh->GetRefDevice()); else mpEditEngine->SetRefMapMode(MapMode(MapUnit::Map100thMM)); - mpForwarder = new SvxEditEngineForwarder(*mpEditEngine); + mpForwarder.reset( new SvxEditEngineForwarder(*mpEditEngine) ); } if (mbDataValid) - return mpForwarder; + return mpForwarder.get(); if (!msText.isEmpty()) { @@ -1506,7 +1506,7 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder() mpEditEngine->SetNotifyHdl( LINK(this, ScAccessibleNoteTextData, NotifyHdl) ); - return mpForwarder; + return mpForwarder.get(); } SvxViewForwarder* ScAccessibleNoteTextData::GetViewForwarder() diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 286bdb6463ec..057515a329e3 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -245,7 +245,7 @@ private: ScPreviewViewForwarder* mpViewForwarder; ScPreviewShell* mpViewShell; std::unique_ptr mpEditEngine; - SvxEditEngineForwarder* mpForwarder; + std::unique_ptr mpForwarder; ScDocShell* mpDocSh; OUString msText; ScAddress maCellPos;