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

[Xisco Fauli]

 include/unotools/defaultoptions.hxx       |    3 ++-
 unotools/source/config/defaultoptions.cxx |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 7bc1c79c26e52d5196fb36eee5c2f12f12d49ba6
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Sun May 29 20:46:29 2016 +0200

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

diff --git a/include/unotools/defaultoptions.hxx b/include/unotools/defaultoptions.hxx
index 7877087..f493766 100644
--- a/include/unotools/defaultoptions.hxx
+++ b/include/unotools/defaultoptions.hxx
@@ -22,6 +22,7 @@
 #include <unotools/unotoolsdllapi.h>
 #include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
+#include <memory>
 
 class SvtDefaultOptions_Impl;
 
@@ -29,7 +30,7 @@ class SvtDefaultOptions_Impl;
 class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtDefaultOptions : public utl::detail::Options
 {
 private:
-    SvtDefaultOptions_Impl* pImp;
+    std::unique_ptr<SvtDefaultOptions_Impl> pImpl;
 
 public:
 
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index 92d5a04..6f021d4 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -326,7 +326,7 @@ SvtDefaultOptions::SvtDefaultOptions()
         ItemHolder1::holdConfigItem(E_DEFAULTOPTIONS);
     }
     ++nRefCount;
-    pImp = pOptions;
+    pImpl.reset(pOptions);
 }
 
 SvtDefaultOptions::~SvtDefaultOptions()
@@ -343,7 +343,7 @@ SvtDefaultOptions::~SvtDefaultOptions()
 
 OUString SvtDefaultOptions::GetDefaultPath( sal_uInt16 nId ) const
 {
-    return pImp->GetDefaultPath( nId );
+    return pImpl->GetDefaultPath( nId );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */