[Libreoffice-commits] core.git: cui/source

[Arnold Dumas]

 cui/source/inc/macroass.hxx      |    3 ++-
 cui/source/tabpages/macroass.cxx |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 6d9cf658eda57c29c2848a7b6eaf5a8285e14972
Author: Arnold Dumas <arnold at dumas.at>
Date:   Tue Aug 2 23:20:47 2016 +0200

    tdf#89329: use unique_ptr for mpImpl in macroass
    
    Change-Id: I6d3263cf35db3bef6963b2443cb8538343ca9a3a
    Reviewed-on: https://gerrit.libreoffice.org/27812
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 1ec314f..66986e4 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -26,6 +26,7 @@
 #include <svl/macitem.hxx>
 #include <vcl/lstbox.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
+#include <memory>
 
 class SfxMacroTabPage_;
 class SvTabListBox;
@@ -45,7 +46,7 @@ class SfxMacroTabPage : public SfxTabPage
     DECL_DLLPRIVATE_LINK_TYPED( TimeOut_Impl, Idle*, void );
 
 protected:
-    SfxMacroTabPage_Impl*       mpImpl;
+    std::unique_ptr<SfxMacroTabPage_Impl>       mpImpl;
 
     void                        InitAndSetHandler();
     void                        FillEvents();
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index e607a48..973b6b1 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -139,7 +139,7 @@ void SfxMacroTabPage::EnableButtons()
 SfxMacroTabPage::SfxMacroTabPage(vcl::Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rAttrSet )
     : SfxTabPage(pParent, "EventAssignPage", "cui/ui/eventassignpage.ui", &rAttrSet)
 {
-    mpImpl = new SfxMacroTabPage_Impl;
+    mpImpl.reset(new SfxMacroTabPage_Impl);
     mpImpl->sStrEvent = get<FixedText>("eventft")->GetText();
     mpImpl->sAssignedMacro = get<FixedText>("assignft")->GetText();
     get(mpImpl->pEventLB , "assignments");
@@ -166,7 +166,7 @@ SfxMacroTabPage::~SfxMacroTabPage()
 
 void SfxMacroTabPage::dispose()
 {
-    DELETEZ( mpImpl );
+    mpImpl.reset();
     SfxTabPage::dispose();
 }