convert custom list implement ConvertDataList to std::vector

Change-Id: I32fbab56f21709a79b1d7fd13bc85ad5a9a107dd

2 files changed, 12 insertions, 24 deletions

diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index c60bc08fcb20..d9e7a422946d 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2483,10 +2483,10 @@ double ConvertDataLinear::ConvertFromBase( double f, sal_Int16 n ) const
 
 ConvertDataList::ConvertDataList( void )
 {
-#define NEWD(str,unit,cl)   Append(new ConvertData(str,unit,cl))
-#define NEWDP(str,unit,cl)  Append(new ConvertData(str,unit,cl,sal_True))
-#define NEWL(str,unit,offs,cl)  Append(new ConvertDataLinear(str,unit,offs,cl))
-#define NEWLP(str,unit,offs,cl) Append(new ConvertDataLinear(str,unit,offs,cl,sal_True))
+#define NEWD(str,unit,cl)   maVector.push_back(new ConvertData(str,unit,cl))
+#define NEWDP(str,unit,cl)  maVector.push_back(new ConvertData(str,unit,cl,sal_True))
+#define NEWL(str,unit,offs,cl)  maVector.push_back(new ConvertDataLinear(str,unit,offs,cl))
+#define NEWLP(str,unit,offs,cl) maVector.push_back(new ConvertDataLinear(str,unit,offs,cl,sal_True))
 
     // *** are extra and not standard Excel Analysis Addin!
 
@@ -2663,8 +2663,8 @@ ConvertDataList::ConvertDataList( void )
 
 ConvertDataList::~ConvertDataList()
 {
-    for( ConvertData* p = First() ; p ; p = Next() )
-        delete p;
+    for( std::vector<ConvertData*>::const_iterator it = maVector.begin(); it != maVector.end(); ++it )
+        delete *it;
 }
 
 
@@ -2677,9 +2677,10 @@ double ConvertDataList::Convert( double fVal, const OUString& rFrom, const OUStr
     sal_Int16       nLevelFrom = 0;
     sal_Int16       nLevelTo = 0;
 
-    ConvertData*    p = First();
-    while( p && ( bSearchFrom || bSearchTo ) )
+    std::vector<ConvertData*>::iterator it = maVector.begin();
+    while( it != maVector.end() && ( bSearchFrom || bSearchTo ) )
     {
+        ConvertData*    p = *it;
         if( bSearchFrom )
         {
             sal_Int16   n = p->GetMatchingLevel( rFrom );
@@ -2718,7 +2719,7 @@ double ConvertDataList::Convert( double fVal, const OUString& rFrom, const OUStr
             }
         }
 
-        p = Next();
+        ++it;
     }
 
     if( pFrom && pTo )
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 81a48ebb8a2e..85dc8f5dab96 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -566,12 +566,10 @@ public:
 
 
 
-class ConvertDataList : protected MyList
+class ConvertDataList
 {
 private:
-protected:
-    inline ConvertData*     First( void );
-    inline ConvertData*     Next( void );
+    std::vector<ConvertData*> maVector;
 public:
                             ConvertDataList( void );
     virtual                 ~ConvertDataList();
@@ -827,17 +825,6 @@ inline ConvertDataLinear::ConvertDataLinear( const sal_Char* p, double fC, doubl
 
 
 
-inline ConvertData* ConvertDataList::First( void )
-{
-    return ( ConvertData* ) MyList::First();
-}
-
-
-inline ConvertData* ConvertDataList::Next( void )
-{
-    return ( ConvertData* ) MyList::Next();
-}
-
 //-----------------------------------------------------------------------------
 
 /// Helper class for date calculation for various financial functions