[Libreoffice-commits] core.git: include/svtools svtools/source

Xisco Fauli anistenis at gmail.com
Thu May 26 07:40:29 UTC 2016


 include/svtools/wizardmachine.hxx        |    2 +-
 svtools/source/dialogs/wizardmachine.cxx |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 2c7a0652b86a24b6ea42746002dfaec09737f58a
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Thu May 26 01:58:04 2016 +0200

    tdf#89329: use unique_ptr for pImpl in wizardmachine
    
    Change-Id: Ie29a95fb913a7141ad6789db236f12c73c283a58
    Reviewed-on: https://gerrit.libreoffice.org/25481
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx
index 0203198..4289d6b 100644
--- a/include/svtools/wizardmachine.hxx
+++ b/include/svtools/wizardmachine.hxx
@@ -166,7 +166,7 @@ namespace svt
 
     private:
         // hold members in this structure to allow keeping compatible when members are added
-        WizardMachineImplData*  m_pImpl;
+        std::unique_ptr<WizardMachineImplData>  m_pImpl;
 
     public:
         OWizardMachine(vcl::Window* _pParent, const WinBits i_nStyle, WizardButtonFlags _nButtonFlags );
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index edeab91..f7066e0 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -211,8 +211,7 @@ namespace svt
                 if (pPage)
                     pPage->disposeOnce();
             }
-            delete m_pImpl;
-            m_pImpl = nullptr;
+            m_pImpl.reset();
         }
 
         WizardDialog::dispose();


More information about the Libreoffice-commits mailing list