diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-23 16:03:53 +0200 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-12-26 18:35:59 +0000 |
| commit | 833e6ca9d284bca536d09f6a30b1a8cfbb1c86d8 (patch) | |
| tree | bd620398e39c9b2b84bb6127fa58575440193a80 /sfx2 | |
| parent | d6a7f7fe98af19b43d8e82555a10bf1e835d0533 (diff) | |
use std::vector instead of naked array in SfxItemPool
Change-Id: I2d4ac010ff5818e673567cee05700872588918e4
Reviewed-on: https://gerrit.libreoffice.org/32384
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/explorer/nochaos.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx index 9141d049bd10..13e305b68b3f 100644 --- a/sfx2/source/explorer/nochaos.cxx +++ b/sfx2/source/explorer/nochaos.cxx @@ -36,7 +36,7 @@ class CntItemPool; class CntStaticPoolDefaults_Impl { static const sal_uInt32 m_nItems = 1; - SfxPoolItem** m_ppDefaults; + std::vector<SfxPoolItem*>* m_pDefaults; SfxItemInfo* m_pItemInfos; private: @@ -48,8 +48,8 @@ public: CntStaticPoolDefaults_Impl(const CntStaticPoolDefaults_Impl&) = delete; CntStaticPoolDefaults_Impl& operator=(const CntStaticPoolDefaults_Impl&) = delete; - SfxPoolItem** GetDefaults() const { return m_ppDefaults; } - const SfxItemInfo* GetItemInfos() const { return m_pItemInfos; } + std::vector<SfxPoolItem*>* GetDefaults() const { return m_pDefaults; } + const SfxItemInfo* GetItemInfos() const { return m_pItemInfos; } }; @@ -162,7 +162,7 @@ inline void CntStaticPoolDefaults_Impl::Insert( { sal_uInt16 nPos = pItem->Which() - WID_CHAOS_START; - m_ppDefaults[ nPos ] = pItem; + (*m_pDefaults)[ nPos ] = pItem; m_pItemInfos[ nPos ]._nSID = 0; m_pItemInfos[ nPos ]._bPoolable = true; } @@ -171,18 +171,17 @@ inline void CntStaticPoolDefaults_Impl::Insert( CntStaticPoolDefaults_Impl::~CntStaticPoolDefaults_Impl() { for ( sal_uInt32 n = 0; n < m_nItems; ++n ) - delete m_ppDefaults[ n ]; + delete (*m_pDefaults)[ n ]; - delete [] m_ppDefaults; + delete m_pDefaults; delete [] m_pItemInfos; } CntStaticPoolDefaults_Impl::CntStaticPoolDefaults_Impl( CntItemPool* /*pPool*/ ) -: m_ppDefaults( new SfxPoolItem* [ m_nItems ] ), +: m_pDefaults( new std::vector<SfxPoolItem*>( m_nItems, nullptr ) ), m_pItemInfos( new SfxItemInfo [ m_nItems ] ) { - memset( m_ppDefaults, 0, sizeof( SfxPoolItem* ) * m_nItems ); memset( m_pItemInfos, 0, sizeof( SfxItemInfo ) * m_nItems ); Insert( new SfxStringItem( WID_CHAOS_START, OUString() ) ); } |