diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-04-05 08:49:50 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-04-09 09:53:46 +0900 |
| commit | f0835373898edf650acb015188b0990f7f0eade6 (patch) | |
| tree | 6401fda47dbbc6512ca9fa3219cf206a34efb962 /svx | |
| parent | cleanup header tbcontrl.hxx (diff) | |
| download | core-f0835373898edf650acb015188b0990f7f0eade6.tar.gz core-f0835373898edf650acb015188b0990f7f0eade6.zip | |
use std::unique_ptr for Impl in SvxStyleToolBoxControl
Change-Id: Ia01755ee617002ef2c234e29b1edd497b031ef8a
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index b10b889d56e6..324c5c1e9b6f 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1987,9 +1987,9 @@ static const char* StyleSlotToStyleCommand[MAX_FAMILIES] = SvxStyleToolBoxControl::SvxStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl ( nSlotId, nId, rTbx ), + pImpl ( new Impl ), pStyleSheetPool ( NULL ), - nActFamily ( 0xffff ), - pImpl ( new Impl ) + nActFamily ( 0xffff ) { for ( sal_uInt16 i=0; i<MAX_FAMILIES; i++ ) { @@ -2001,7 +2001,6 @@ SvxStyleToolBoxControl::SvxStyleToolBoxControl( SvxStyleToolBoxControl::~SvxStyleToolBoxControl() { - delete pImpl; } void SAL_CALL SvxStyleToolBoxControl::initialize( const Sequence< Any >& aArguments ) @@ -2051,7 +2050,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) DELETEZ( pFamilyState[i] ); } pStyleSheetPool = NULL; - DELETEZ( pImpl ); + pImpl.reset(); } void SAL_CALL SvxStyleToolBoxControl::update() throw (RuntimeException, std::exception) |