summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-17 14:36:31 +0200
committerNoel Grandin <noel@peralex.com>2015-11-18 08:35:34 +0200
commitf43db673558a1139fba783973c87de9b79033425 (patch)
tree961efab15b7a334f94f5fd69f1b72a16838cbae0 /svtools
parent66d2b72667792cb18b25805387824d636e2a455c (diff)
use unique_ptr for pImpl in svtools/
Change-Id: Ic82db5859464978ca58094e2b6f44e3c9ba30b4c
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/config/colorcfg.cxx1
-rw-r--r--svtools/source/config/extcolorcfg.cxx1
-rw-r--r--svtools/source/config/fontsubstconfig.cxx1
-rw-r--r--svtools/source/contnr/svlbitm.cxx9
-rw-r--r--svtools/source/control/scriptedtext.cxx1
-rw-r--r--svtools/source/misc/embedhlp.cxx1
-rw-r--r--svtools/source/misc/templatefoldercache.cxx1
-rw-r--r--svtools/source/misc/transfer.cxx1
-rw-r--r--svtools/source/uno/unocontroltablemodel.cxx1
-rw-r--r--svtools/source/uno/unocontroltablemodel.hxx3
10 files changed, 4 insertions, 16 deletions
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();