[Libreoffice-commits] core.git: 2 commits - sc/source

[Noel Grandin]

 sc/source/ui/Accessibility/AccessibleText.cxx |    8 ++++----
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx       |    2 +-
 sc/source/ui/inc/AccessibleText.hxx           |    2 +-
 sc/source/ui/inc/tbzoomsliderctrl.hxx         |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit dee73a9af5e1c59588137634c1d048e4321d6908
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Jun 27 10:30:34 2018 +0200

    loplugin:useuniqueptr in ScZoomSliderWnd
    
    Change-Id: If6cc62d08fbd589f332514e01a42aae8f919e68f
    Reviewed-on: https://gerrit.libreoffice.org/56552
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 02657aec409c..a38b609a3b1c 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -234,7 +234,7 @@ ScZoomSliderWnd::~ScZoomSliderWnd()
 
 void ScZoomSliderWnd::dispose()
 {
-    delete mpImpl;
+    mpImpl.reset();
     vcl::Window::dispose();
 }
 
diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx
index 026a4c9b7b18..9782ad17ad77 100644
--- a/sc/source/ui/inc/tbzoomsliderctrl.hxx
+++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx
@@ -40,7 +40,7 @@ class ScZoomSliderWnd: public vcl::Window
 {
 private:
     struct ScZoomSliderWnd_Impl;
-    ScZoomSliderWnd_Impl* mpImpl;
+    std::unique_ptr<ScZoomSliderWnd_Impl> mpImpl;
     Size aLogicalSize;
     css::uno::Reference<css::frame::XDispatchProvider> m_xDispatchProvider;
 
commit e528b7fd3a064eea788ae4f8b6901a941be3bc4c
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Jun 27 10:30:17 2018 +0200

    loplugin:useuniqueptr in ScAccessibleNoteTextData
    
    Change-Id: I38101b3046c4354f48b6c9d34a016351659e9795
    Reviewed-on: https://gerrit.libreoffice.org/56551
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

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<EENotify&,void>());
     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<ScEditEngineDefaulter> mpEditEngine;
-    SvxEditEngineForwarder* mpForwarder;
+    std::unique_ptr<SvxEditEngineForwarder> mpForwarder;
     ScDocShell*             mpDocSh;
     OUString                msText;
     ScAddress               maCellPos;