Remove DECLARE_LIST( StringList, String * )

3 files changed, 10 insertions, 15 deletions

diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 3875e9fc7e1f..9e0840f619a0 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -154,20 +154,20 @@ void TestToolDebugMessageFilter( const sal_Char *pString, BOOL bIsOsl )
             printf("DbgPrintMsgBox failed: %s\n", pString );
         }
     }
-/*    DBG_INSTOUTERROR( DBG_OUT_MSGBOX )
-    DBG_ERROR( pString );
-    DBG_INSTOUTERROR( DBG_OUT_TESTTOOL )*/
     static_bInsideFilter = FALSE;
 }
+
 void SAL_CALL DBG_TestToolDebugMessageFilter( const sal_Char *pString )
 {
         TestToolDebugMessageFilter( pString, FALSE );
 }
+
 extern "C" void SAL_CALL osl_TestToolDebugMessageFilter( const sal_Char *pString )
 {
     if ( !getenv( "DISABLE_SAL_DBGBOX" ) )
         TestToolDebugMessageFilter( pString, TRUE );
 }
+
 #endif
 
 // #94145# Due to a tab in TT_SIGNATURE_FOR_UNICODE_TEXTFILES which is changed to blanks by some editors
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index 6bc0513ccafa..5e3802924f4a 100644
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -792,7 +792,7 @@ StringList* GenericOptions::GetAllGroups()
     for ( USHORT i = 0 ; i < aConf.GetGroupCount() ; i++ )
     {
         String *pGroup = new String( aConf.GetGroupName( i ), RTL_TEXTENCODING_UTF8 );
-        pGroups->Insert( pGroup );
+        pGroups->push_back( pGroup );
     }
     return pGroups;
 }
@@ -800,19 +800,17 @@ StringList* GenericOptions::GetAllGroups()
 void GenericOptions::LoadData()
 {
     StringList* pGroups = GetAllGroups();
-    String* pGroup;
-    while ( (pGroup = pGroups->First()) != NULL )
+    for ( size_t i = 0, n = pGroups->size(); i < n; ++i )
     {
-        pGroups->Remove( pGroup );
+        String* pGroup = pGroups->at( i );
         aConf.SetGroup( ByteString( *pGroup, RTL_TEXTENCODING_UTF8 ) );
         if ( aConf.ReadKey( C_KEY_AKTUELL ).Len() > 0 )
-        {
             aCbArea.InsertEntry( *pGroup );
-        }
         delete pGroup;
     }
+    pGroups->clear();
     delete pGroups;
-    aCbArea.SetText( aCbArea.GetEntry( 0 ) );
+        aCbArea.SetText( aCbArea.GetEntry( 0 ) );
     CheckButtons( aCbArea, aPbNewArea, aPbDelArea );
 
     // Add load the data
diff --git a/basic/source/app/dialogs.hxx b/basic/source/app/dialogs.hxx
index 278635e2825f..6c547efa8747 100644
--- a/basic/source/app/dialogs.hxx
+++ b/basic/source/app/dialogs.hxx
@@ -44,6 +44,7 @@
 #include <vcl/toolbox.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/ctrlbox.hxx>
+#include <vector>
 
 class SbxVariable;
 
@@ -239,8 +240,7 @@ public:
     void Save( Config &aConfig );
 };
 
-
-DECLARE_LIST( StringList, String * )
+typedef ::std::vector< String* > StringList;
 #define C_KEY_ALLE          CByteString("All")
 #define C_KEY_AKTUELL       CByteString("Current")
 #define C_KEY_TYPE          CByteString("Type")
@@ -349,9 +349,6 @@ protected:
 
     DECL_LINK( OKClick, Button * );
 
-//  BOOL bCompare = FALSE;
-//  String aCompareString;
-
 public:
     VarEditDialog( Window * pParent, SbxVariable *pPVar );
 };