DECL_PTRARRAY->std::vector

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

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;
     }
 }