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

[Arnold Dumas]

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

New commits:
commit d18a6a56d39bed7a427e4fa0d55ea816d1a0b76d
Author: Arnold Dumas <arnold at dumas.at>
Date:   Mon Jun 13 23:14:53 2016 +0200

    tdf#89329: use unique_ptr for m_pImpl in chardlg
    
    Change-Id: Ic7ac35ebdab7143d75a9f2c8d0e6f99796ffb0e3
    Reviewed-on: https://gerrit.libreoffice.org/26232
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 07daa78..5b115c1 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -26,6 +26,7 @@
 #include <svx/checklbx.hxx>
 #include <svx/langbox.hxx>
 #include <vcl/layout.hxx>
+#include <memory>
 
 // forward ---------------------------------------------------------------
 
@@ -104,7 +105,7 @@ private:
     VclPtr<SvxLanguageBox>     m_pCTLFontLanguageLB;
     VclPtr<FixedText>          m_pCTLFontTypeFT;
 
-    SvxCharNamePage_Impl*   m_pImpl;
+    std::unique_ptr<SvxCharNamePage_Impl>   m_pImpl;
 
                         SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rSet );
 
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 1fcff97..1edfee5 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -374,8 +374,7 @@ SvxCharNamePage::~SvxCharNamePage()
 
 void SvxCharNamePage::dispose()
 {
-    delete m_pImpl;
-    m_pImpl = nullptr;
+    m_pImpl.reset();
     m_pWestFrame.clear();
     m_pWestFontNameFT.clear();
     m_pWestFontNameLB.clear();