use unique_ptr for pImpl in svtools/

Change-Id: Ic82db5859464978ca58094e2b6f44e3c9ba30b4c

18 files changed, 19 insertions, 24 deletions

diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx
index d373d6aad0d9..99ca1268f872 100644
--- a/include/svtools/colorcfg.hxx
+++ b/include/svtools/colorcfg.hxx
@@ -24,6 +24,7 @@
 #include <tools/color.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <unotools/options.hxx>
+#include <memory>
 
 
 namespace svtools{
@@ -108,7 +109,7 @@ public:
 
 class SVT_DLLPUBLIC EditableColorConfig
 {
-    ColorConfig_Impl*   m_pImpl;
+    std::unique_ptr<ColorConfig_Impl> m_pImpl;
     bool                m_bModified;
 public:
     EditableColorConfig();
diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx
index 7dad21d020c8..29ac2dcd011c 100644
--- a/include/svtools/embedhlp.hxx
+++ b/include/svtools/embedhlp.hxx
@@ -26,6 +26,7 @@
 #include <vcl/graph.hxx>
 #include <tools/mapunit.hxx>
 #include <rtl/ustring.hxx>
+#include <memory>
 
 namespace comphelper
 {
@@ -45,7 +46,7 @@ struct EmbeddedObjectRef_Impl;
 
 class SVT_DLLPUBLIC EmbeddedObjectRef
 {
-    EmbeddedObjectRef_Impl* mpImpl;
+    std::unique_ptr<EmbeddedObjectRef_Impl> mpImpl;
 
     SVT_DLLPRIVATE SvStream* GetGraphicStream( bool bUpdate ) const;
     SVT_DLLPRIVATE void GetReplacement( bool bUpdate );
diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx
index a2b472665263..1f0db36ef777 100644
--- a/include/svtools/extcolorcfg.hxx
+++ b/include/svtools/extcolorcfg.hxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <svl/SfxBroadcaster.hxx>
 #include <svl/lstner.hxx>
+#include <memory>
 
 
 namespace svtools {
@@ -82,7 +83,7 @@ public:
 
 class SVT_DLLPUBLIC EditableExtendedColorConfig
 {
-    ExtendedColorConfig_Impl*   m_pImpl;
+    std::unique_ptr<ExtendedColorConfig_Impl> m_pImpl;
     bool                        m_bModified;
 public:
     EditableExtendedColorConfig();
diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx
index ed2357cd5f47..6627b1d81ad7 100644
--- a/include/svtools/fontsubstconfig.hxx
+++ b/include/svtools/fontsubstconfig.hxx
@@ -21,6 +21,7 @@
 
 #include <svtools/svtdllapi.h>
 #include <unotools/configitem.hxx>
+#include <memory>
 
 struct SvtFontSubstConfig_Impl;
 
@@ -37,7 +38,7 @@ class SVT_DLLPUBLIC SvtFontSubstConfig : public utl::ConfigItem
 {
 private:
     bool                        bIsEnabled;
-    SvtFontSubstConfig_Impl*    pImpl;
+    std::unique_ptr<SvtFontSubstConfig_Impl> pImpl;
 
     virtual void                ImplCommit() override;
 
diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx
index 5ddb37bd8daf..7195e670a89d 100644
--- a/include/svtools/scriptedtext.hxx
+++ b/include/svtools/scriptedtext.hxx
@@ -22,6 +22,7 @@
 
 #include <svtools/svtdllapi.h>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <memory>
 
 
 class OutputDevice;
@@ -39,7 +40,7 @@ This class provides drawing text with different script types on any output devic
 class SVT_DLLPUBLIC SvtScriptedTextHelper
 {
 private:
-    SvtScriptedTextHelper_Impl* mpImpl;             /// Implementation of class functionality.
+    std::unique_ptr<SvtScriptedTextHelper_Impl> mpImpl;             /// Implementation of class functionality.
 
     SvtScriptedTextHelper&      operator=( const SvtScriptedTextHelper& ) = delete;
 
diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx
index c9b56adacd20..0bbb46da65de 100644
--- a/include/svtools/svlbitm.hxx
+++ b/include/svtools/svlbitm.hxx
@@ -62,7 +62,7 @@ private:
     Link<SvLBoxButtonData*,void> aLink;
     long                    nWidth;
     long                    nHeight;
-    SvLBoxButtonData_Impl*  pImpl;
+    std::unique_ptr<SvLBoxButtonData_Impl> pImpl;
     bool                    bDataOk;
     SvButtonState           eState;
     std::vector<Image>      aBmps;  // indices s. constants BMP_ ....
diff --git a/include/svtools/templatefoldercache.hxx b/include/svtools/templatefoldercache.hxx
index c01bfd02b24a..dcb3e268e493 100644
--- a/include/svtools/templatefoldercache.hxx
+++ b/include/svtools/templatefoldercache.hxx
@@ -22,6 +22,7 @@
 
 #include <svtools/svtdllapi.h>
 #include <sal/types.h>
+#include <memory>
 
 
 namespace svt
@@ -60,7 +61,7 @@ namespace svt
     class SVT_DLLPUBLIC TemplateFolderCache
     {
     private:
-        TemplateFolderCacheImpl*        m_pImpl;
+        std::unique_ptr<TemplateFolderCacheImpl>     m_pImpl;
 
     public:
         /** ctor.
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index b256366ae7a0..1ade1a986d11 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
+#include <memory>
 
 class BitmapEx;
 class GDIMetaFile;
@@ -280,7 +281,7 @@ private:
     css::uno::Reference< css::datatransfer::clipboard::XClipboard >   mxClipboard;
     DataFlavorExVector*                                               mpFormats;
     TransferableObjectDescriptor*                                     mpObjDesc;
-    TransferableDataHelper_Impl*                                      mpImpl;
+    std::unique_ptr<TransferableDataHelper_Impl>                      mpImpl;
 
 protected:
     void                        InitFormats();
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 76f22afa5e84..8a1bd589a92d 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -532,7 +532,6 @@ EditableColorConfig::~EditableColorConfig()
         m_pImpl->SetModified();
     if(m_pImpl->IsModified())
         m_pImpl->Commit();
-    delete m_pImpl;
 }
 
 uno::Sequence< OUString >  EditableColorConfig::GetSchemeNames() const
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 9db6d6dc0963..37eb86115b68 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -624,7 +624,6 @@ EditableExtendedColorConfig::~EditableExtendedColorConfig()
         m_pImpl->SetModified();
     if(m_pImpl->IsModified())
         m_pImpl->Commit();
-    delete m_pImpl;
 }
 
 void EditableExtendedColorConfig::DeleteScheme(const OUString& rScheme )
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index 02a38444fdc7..6437788eb113 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -90,7 +90,6 @@ SvtFontSubstConfig::SvtFontSubstConfig() :
 
 SvtFontSubstConfig::~SvtFontSubstConfig()
 {
-    delete pImpl;
 }
 
 void SvtFontSubstConfig::Notify( const css::uno::Sequence< OUString >& )
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 1c507883c4b2..365c1a5817a7 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -41,8 +41,6 @@ void SvLBoxButtonData::InitData( bool bImagesFromDefault, bool _bRadioBtn, const
 
     aBmps.resize((int)SvBmp::STATICIMAGE+1);
 
-    pImpl = new SvLBoxButtonData_Impl;
-
     bDataOk = false;
     eState = SV_BUTTON_UNCHECKED;
     pImpl->bDefaultImages = bImagesFromDefault;
@@ -53,22 +51,19 @@ void SvLBoxButtonData::InitData( bool bImagesFromDefault, bool _bRadioBtn, const
 }
 
 SvLBoxButtonData::SvLBoxButtonData( const Control* pControlForSettings )
+    : pImpl( new SvLBoxButtonData_Impl )
 {
     InitData( true, false, pControlForSettings );
 }
 
 SvLBoxButtonData::SvLBoxButtonData( const Control* pControlForSettings, bool _bRadioBtn )
+    : pImpl( new SvLBoxButtonData_Impl )
 {
     InitData( true, _bRadioBtn, pControlForSettings );
 }
 
 SvLBoxButtonData::~SvLBoxButtonData()
 {
-
-    delete pImpl;
-#ifdef DBG_UTIL
-    pImpl = nullptr;
-#endif
 }
 
 void SvLBoxButtonData::CallLink()
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index cc2760efd840..55c1015640b9 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -316,7 +316,6 @@ SvtScriptedTextHelper::SvtScriptedTextHelper( const SvtScriptedTextHelper& _rCop
 
 SvtScriptedTextHelper::~SvtScriptedTextHelper()
 {
-    delete mpImpl;
 }
 
 void SvtScriptedTextHelper::SetFonts( vcl::Font* _pLatinFont, vcl::Font* _pAsianFont, vcl::Font* _pCmplxFont )
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 461de46f349c..9d50a68fa92d 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -303,7 +303,6 @@ EmbeddedObjectRef::EmbeddedObjectRef( const EmbeddedObjectRef& rObj ) :
 EmbeddedObjectRef::~EmbeddedObjectRef()
 {
     Clear();
-    delete mpImpl;
 }
 
 void EmbeddedObjectRef::Assign( const uno::Reference < embed::XEmbeddedObject >& xObj, sal_Int64 nAspect )
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 4487b12e5879..1bceffc6f5bf 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -832,7 +832,6 @@ namespace svt
 
     TemplateFolderCache::~TemplateFolderCache( )
     {
-        DELETEZ( m_pImpl );
     }
 
 
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 1d0bfb51b7d8..6a22fef255f0 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -1279,7 +1279,6 @@ TransferableDataHelper::~TransferableDataHelper()
         delete mpFormats, mpFormats = nullptr;
         delete mpObjDesc, mpObjDesc = nullptr;
     }
-    delete mpImpl;
 }
 
 
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index 29aacfa70e80..bda43e18a6a7 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -140,7 +140,6 @@ namespace svt { namespace table
 
     UnoControlTableModel::~UnoControlTableModel()
     {
-        DELETEZ( m_pImpl );
     }
 
 
diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
index ee3ca9d66aee..2ffc749f97fa 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -35,6 +35,7 @@
 #include <rtl/ref.hxx>
 
 #include <boost/noncopyable.hpp>
+#include <memory>
 
 
 namespace svt { namespace table
@@ -49,7 +50,7 @@ namespace svt { namespace table
     class UnoControlTableModel : public ITableModel, public ITableDataSort
     {
     private:
-        UnoControlTableModel_Impl*     m_pImpl;
+        std::unique_ptr<UnoControlTableModel_Impl>  m_pImpl;
 
     public:
         UnoControlTableModel();