Remove DECLARE_LIST( _SfxEventNamesList, SfxEventName* )

2 files changed, 28 insertions, 21 deletions

diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx
index fd2d506db4cf..66c8b345422d 100644
--- a/sfx2/inc/sfx2/evntconf.hxx
+++ b/sfx2/inc/sfx2/evntconf.hxx
@@ -45,6 +45,7 @@
 #endif
 #define ITEMID_MACRO SID_ATTR_MACROITEM
 #include <svl/macitem.hxx>
+#include <vector>
 
 class SfxMacroInfo;
 class SfxMacroInfoArr_Impl;
@@ -69,16 +70,26 @@ struct SFX2_DLLPUBLIC SfxEventName
                 , maUIName( rUIName ) {}
 };
 
-DECLARE_LIST( _SfxEventNamesList, SfxEventName* )
+typedef ::std::vector< SfxEventName* > _SfxEventNamesList;
 
-class SFX2_DLLPUBLIC SfxEventNamesList : public _SfxEventNamesList
+class SFX2_DLLPUBLIC SfxEventNamesList
 {
+private:
+    _SfxEventNamesList  aEventNamesList;
+    void DelDtor();
+
 public:
-    SfxEventNamesList( const USHORT nInitSz = 0, const USHORT nReSz = 1 ): _SfxEventNamesList( nInitSz, nReSz ) {}
-    SfxEventNamesList( const SfxEventNamesList &rCpy ) : _SfxEventNamesList() { *this = rCpy; }
+    SfxEventNamesList() {}
+    SfxEventNamesList( const SfxEventNamesList &rCpy ) { *this = rCpy; }
     ~SfxEventNamesList() { DelDtor(); }
     SfxEventNamesList& operator=( const SfxEventNamesList &rCpy );
-    void DelDtor();
+
+    size_t size() const { return aEventNamesList.size(); };
+
+    SfxEventName* at( size_t Index ) const
+        { return Index < aEventNamesList.size() ? aEventNamesList[ Index ] : NULL; }
+
+    void push_back( SfxEventName* Item ) { aEventNamesList.push_back( Item ); }
 };
 
 class SFX2_DLLPUBLIC SfxEventNamesItem : public SfxPoolItem
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 6e63989ee712..33c6346efe03 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -73,24 +73,20 @@ using namespace com::sun::star;
 SfxEventNamesList& SfxEventNamesList::operator=( const SfxEventNamesList& rTbl )
 {
     DelDtor();
-    for (USHORT n=0; n<rTbl.Count(); n++ )
+    for ( size_t i = 0, n = rTbl.size(); i < n; ++i )
     {
-        SfxEventName* pTmp = ((SfxEventNamesList&)rTbl).GetObject(n);
-        SfxEventName *pNew = new SfxEventName( *pTmp );
-        Insert( pNew, n );
+        SfxEventName* pTmp = rTbl.at( i );
+        SfxEventName* pNew = new SfxEventName( *pTmp );
+        aEventNamesList.push_back( pNew );
     }
     return *this;
 }
 
 void SfxEventNamesList::DelDtor()
 {
-    SfxEventName* pTmp = First();
-    while( pTmp )
-    {
-        delete pTmp;
-        pTmp = Next();
-    }
-    Clear();
+    for ( size_t i = 0, n = aEventNamesList.size(); i < n; ++i )
+        delete aEventNamesList[ i ];
+    aEventNamesList.clear();
 }
 
 int SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const
@@ -100,13 +96,13 @@ int SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const
     const SfxEventNamesList& rOwn = aEventsList;
     const SfxEventNamesList& rOther = ( (SfxEventNamesItem&) rAttr ).aEventsList;
 
-    if ( rOwn.Count() != rOther.Count() )
+    if ( rOwn.size() != rOther.size() )
         return FALSE;
 
-    for ( USHORT nNo = 0; nNo < rOwn.Count(); ++nNo )
+    for ( size_t nNo = 0, nCnt = rOwn.size(); nNo < nCnt; ++nNo )
     {
-        const SfxEventName *pOwn = rOwn.GetObject(nNo);
-        const SfxEventName *pOther = rOther.GetObject(nNo);
+        const SfxEventName *pOwn = rOwn.at( nNo );
+        const SfxEventName *pOther = rOther.at( nNo );
         if (    pOwn->mnId != pOther->mnId ||
                 pOwn->maEventName != pOther->maEventName ||
                 pOwn->maUIName != pOther->maUIName )
@@ -152,7 +148,7 @@ USHORT SfxEventNamesItem::GetVersion( USHORT ) const
 
 void SfxEventNamesItem::AddEvent( const String& rName, const String& rUIName, USHORT nID )
 {
-    aEventsList.Insert( new SfxEventName( nID, rName, rUIName.Len() ? rUIName : rName ) );
+    aEventsList.push_back( new SfxEventName( nID, rName, rUIName.Len() ? rUIName : rName ) );
 }