From 0d62716f67b6269448eeae1f012f9512b503f390 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 17 Nov 2015 14:46:26 +0200 Subject: use unique_ptr for pImpl in svl/ Change-Id: Ieef897314ac0f056c0a09a5182ca59800fd58f41 --- svl/source/items/itemprop.cxx | 4 +--- svl/source/items/stylepool.cxx | 3 ++- svl/source/misc/gridprinter.cxx | 1 - svl/source/misc/inethist.cxx | 1 - svl/source/misc/sharedstringpool.cxx | 1 - svl/source/notify/SfxBroadcaster.cxx | 2 -- svl/source/notify/lstner.cxx | 2 -- svl/source/numbers/numuno.cxx | 5 ++--- svl/source/undo/undo.cxx | 2 -- 9 files changed, 5 insertions(+), 16 deletions(-) (limited to 'svl') diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index a815405a1afb..753602cd4090 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -71,13 +71,12 @@ SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries } SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMap& rSource ) : - m_pImpl( new SfxItemPropertyMap_Impl( rSource.m_pImpl ) ) + m_pImpl( new SfxItemPropertyMap_Impl( rSource.m_pImpl.get() ) ) { } SfxItemPropertyMap::~SfxItemPropertyMap() { - delete m_pImpl; } const SfxItemPropertySimpleEntry* SfxItemPropertyMap::getByName( const OUString &rName ) const @@ -344,7 +343,6 @@ Sequence< Property > SAL_CALL SfxItemPropertySetInfo::getProperties( ) SfxItemPropertySetInfo::~SfxItemPropertySetInfo() { delete m_pImpl->m_pOwnMap; - delete m_pImpl; } Property SAL_CALL SfxItemPropertySetInfo::getPropertyByName( const OUString& rName ) diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx index 5e3afe6aadaf..c0947c450885 100644 --- a/svl/source/items/stylepool.cxx +++ b/svl/source/items/stylepool.cxx @@ -467,6 +467,7 @@ IStylePoolIteratorAccess* StylePool::createIterator( const bool bSkipUnusedItemS return pImpl->createIterator( bSkipUnusedItemSets, bSkipIgnorableItems ); } -StylePool::~StylePool() { delete pImpl; } +StylePool::~StylePool() +{} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx index f15c8e7658fb..4044b3ed9902 100644 --- a/svl/source/misc/gridprinter.cxx +++ b/svl/source/misc/gridprinter.cxx @@ -64,7 +64,6 @@ GridPrinter::GridPrinter( size_t nRows, size_t nCols, bool bPrint ) : GridPrinter::~GridPrinter() { - delete mpImpl; } void GridPrinter::set( size_t nRow, size_t nCol, const OUString& rStr ) diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index 68428ebda073..ce76e2bd6b99 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -312,7 +312,6 @@ INetURLHistory::INetURLHistory() : m_pImpl (new INetURLHistory_Impl()) INetURLHistory::~INetURLHistory() { - DELETEZ (m_pImpl); } /* diff --git a/svl/source/misc/sharedstringpool.cxx b/svl/source/misc/sharedstringpool.cxx index 435209a68874..70d76955ed50 100644 --- a/svl/source/misc/sharedstringpool.cxx +++ b/svl/source/misc/sharedstringpool.cxx @@ -65,7 +65,6 @@ SharedStringPool::SharedStringPool( const CharClass* pCharClass ) : SharedStringPool::~SharedStringPool() { - delete mpImpl; } SharedString SharedStringPool::intern( const OUString& rStr ) diff --git a/svl/source/notify/SfxBroadcaster.cxx b/svl/source/notify/SfxBroadcaster.cxx index 0a7ef4b4e963..eaeed4dbee49 100644 --- a/svl/source/notify/SfxBroadcaster.cxx +++ b/svl/source/notify/SfxBroadcaster.cxx @@ -64,8 +64,6 @@ SfxBroadcaster::~SfxBroadcaster() if (pListener) pListener->RemoveBroadcaster_Impl(*this); } - - delete mpImpl; } diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx index e24becc4f1e1..8c3bdfb58e76 100644 --- a/svl/source/notify/lstner.cxx +++ b/svl/source/notify/lstner.cxx @@ -58,8 +58,6 @@ SfxListener::~SfxListener() SfxBroadcaster *pBC = mpImpl->maBCs[nPos]; pBC->RemoveListener(*this); } - - delete mpImpl; } diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx index 5f7bd780d1bc..21d211514f99 100644 --- a/svl/source/numbers/numuno.cxx +++ b/svl/source/numbers/numuno.cxx @@ -40,18 +40,17 @@ public: // Default ctor for getReflection SvNumberFormatsSupplierObj::SvNumberFormatsSupplierObj() + : pImpl( new SvNumFmtSuppl_Impl(nullptr) ) { - pImpl = new SvNumFmtSuppl_Impl(nullptr); } SvNumberFormatsSupplierObj::SvNumberFormatsSupplierObj(SvNumberFormatter* pForm) + : pImpl( new SvNumFmtSuppl_Impl(pForm) ) { - pImpl = new SvNumFmtSuppl_Impl(pForm); } SvNumberFormatsSupplierObj::~SvNumberFormatsSupplierObj() { - delete pImpl; } ::comphelper::SharedMutex& SvNumberFormatsSupplierObj::getSharedMutex() const diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index c65ea1bfef5f..7c3965de3585 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -169,7 +169,6 @@ SfxUndoActions::SfxUndoActions( const SfxUndoActions& r ) : SfxUndoActions::~SfxUndoActions() { - delete mpImpl; } bool SfxUndoActions::empty() const @@ -1335,7 +1334,6 @@ SfxListUndoAction::SfxListUndoAction( SfxListUndoAction::~SfxListUndoAction() { - delete mpImpl; } void SfxListUndoAction::Undo() -- cgit