diff options
| author | August Sodora <augsod@gmail.com> | 2012-01-20 01:23:16 -0500 |
|---|---|---|
| committer | August Sodora <augsod@gmail.com> | 2012-01-20 13:47:58 -0500 |
| commit | ee0d6e3ab040ddd2ce1cd73945ee44da69201ca4 (patch) | |
| tree | f59d86ce7b0a27b0fc68b92dbcdebf28d4f28fe5 /sfx2 | |
| parent | 33e9d339224f2443bc5a69af814a0311d5a2ec7b (diff) | |
DECL_PTRARRAY->std::vector
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/msgpool.hxx | 3 | ||||
| -rw-r--r-- | sfx2/source/control/msgpool.cxx | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx index 0c7eab1fe453..35d4be615e98 100644 --- a/sfx2/inc/sfx2/msgpool.hxx +++ b/sfx2/inc/sfx2/msgpool.hxx @@ -40,9 +40,10 @@ class SfxInterface; class SfxSlot; -class SfxSlotTypeArr_Impl; +class SfxSlotType_Impl; typedef std::basic_string< sal_uInt16 > SfxSlotGroupArr_Impl; +typedef std::vector<SfxSlotType_Impl*> SfxSlotTypeArr_Impl; typedef std::vector<SfxInterface*> SfxInterfaceArr_Impl; class SFX2_DLLPUBLIC SfxSlotPool diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index 9201f86b0642..f49de947e4a5 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -43,7 +43,6 @@ #include <sfx2/sfx.hrc> - struct SfxSlotType_Impl { sal_uInt16 nId; @@ -54,9 +53,6 @@ struct SfxSlotType_Impl {} }; -DECL_PTRARRAY(SfxSlotTypeArr_Impl, SfxSlotType_Impl*, 8, 8) - - SfxSlotPool::SfxSlotPool( SfxSlotPool *pParent, ResMgr* pResManager ) : _pGroups(0) , _pTypes(0) @@ -82,8 +78,8 @@ SfxSlotPool::~SfxSlotPool() delete _pGroups; if ( _pTypes ) { - for ( sal_uInt16 n =_pTypes->Count(); n--; ) - delete _pTypes->GetObject(n); + for(sal_uInt16 n = 0; n < _pTypes->size(); ++n) + delete (*_pTypes)[n]; delete _pTypes; } } |