[Libreoffice-commits] core.git: 7 commits - scaddins/source
Noel Grandin
noel at peralex.com
Mon Jan 20 03:15:20 PST 2014
scaddins/source/analysis/analysis.cxx | 48 ++----
scaddins/source/analysis/analysishelper.cxx | 88 ++----------
scaddins/source/analysis/analysishelper.hxx | 202 ++++------------------------
scaddins/source/analysis/financial.cxx | 12 -
4 files changed, 74 insertions(+), 276 deletions(-)
New commits:
commit a506352ecb17623feadc09b3edd6a108d64fb740
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jan 10 11:09:15 2014 +0200
remove now dead MyList class
Change-Id: I96411ecb072e5135e7d0e6bb276ff782dcb0270c
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index a122abc..0c91ab8 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1391,56 +1391,6 @@ double GetCoupnum( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_I
-const sal_uInt32 MyList::nStartSize = 16;
-const sal_uInt32 MyList::nIncrSize = 16;
-
-
-void MyList::_Grow( void )
-{
- nSize += nIncrSize;
-
- void** pNewData = new void*[ nSize ];
- memcpy( pNewData, pData, nNew * sizeof( void* ) );
-
- delete[] pData;
- pData = pNewData;
-}
-
-
-MyList::MyList( void )
-{
- nSize = nStartSize;
- pData = new void*[ nSize ];
- nNew = nAct = 0;
-}
-
-
-MyList::~MyList()
-{
- delete[] pData;
-}
-
-
-void MyList::Insert( void* p, sal_uInt32 n )
-{
- if( n >= nNew )
- Append( p );
- else
- {
- Grow();
-
- void** pIns = pData + n;
- memmove( pIns + 1, pIns, ( nNew - n ) * sizeof( void* ) );
-
- *pIns = p;
-
- nNew++;
- }
-}
-
-
-
-
class AnalysisRscStrArrLoader : public Resource
{
private:
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index f2c74a3..f565820 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -148,35 +148,6 @@ double GetCoupdays( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int
-class MyList
-{
-private:
- static const sal_uInt32 nStartSize;
- static const sal_uInt32 nIncrSize;
-
- void** pData; // pointer array
- sal_uInt32 nSize; // array size
- sal_uInt32 nNew; // next index to be inserted at
- sal_uInt32 nAct; // actual for iterations
-
- void _Grow( void );
- inline void Grow( void );
-protected:
-public:
- MyList( void );
- virtual ~MyList();
-
- inline const void* GetObject( sal_uInt32 nIndex ) const;
- inline const void* First( void );
- inline const void* Next( void );
-
- inline void Append( void* pNewElement );
- void Insert( void* pNewLement, sal_uInt32 nPlace );
-
- inline sal_uInt32 Count( void ) const;
-};
-
-
enum FDCategory
{
FDCat_AddIn,
@@ -616,61 +587,6 @@ inline void AlignDate( sal_uInt16& rD, sal_uInt16 nM, sal_uInt16 nY )
}
-inline void MyList::Grow( void )
-{
- if( nNew >= nSize )
- _Grow();
-}
-
-
-inline const void* MyList::GetObject( sal_uInt32 n ) const
-{
- if( n < nNew )
- return pData[ n ];
- else
- return NULL;
-}
-
-
-inline const void* MyList::First( void )
-{
- nAct = 0;
- if( nNew )
- return pData[ 0 ];
- else
- return NULL;
-}
-
-
-inline const void* MyList::Next( void )
-{
- nAct++;
- if( nAct < nNew )
- return pData[ nAct ];
- else
- {
- nAct--;
- return NULL;
- }
-}
-
-
-inline void MyList::Append( void* p )
-{
- Grow();
- pData[ nNew ] = p;
- nNew++;
-}
-
-
-inline sal_uInt32 MyList::Count( void ) const
-{
- return nNew;
-}
-
-
-
-
inline sal_uInt16 FuncData::GetUINameID( void ) const
{
return nUINameID;
commit 1f3eed97de1c3dcbf532cd63023239a4543ae1dc
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jan 10 11:07:59 2014 +0200
convert custom list implementation ScaDoubleList to std::vector
Change-Id: I98865a54f675ebdb7724327305f9f9a5eeccfeb4
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index f2fa49f..8e9590b 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -683,9 +683,10 @@ AnalysisAddIn::getMultinomial( const uno::Reference< beans::XPropertySet >& xOpt
double nZ = 0;
double fRet = 1.0;
- for( const double *p = aValList.First(); p; p = aValList.Next() )
+ for( sal_uInt32 i = 0; i < aValList.Count(); ++i )
{
- double n = (*p >= 0.0) ? rtl::math::approxFloor( *p ) : rtl::math::approxCeil( *p );
+ const double d = aValList.Get(i);
+ double n = (d >= 0.0) ? rtl::math::approxFloor( d ) : rtl::math::approxCeil( d );
if ( n < 0.0 )
throw lang::IllegalArgumentException();
@@ -787,15 +788,10 @@ double SAL_CALL AnalysisAddIn::getGcd( const uno::Reference< beans::XPropertySet
if( aValList.Count() == 0 )
return 0.0;
- const double* p = aValList.First();
- double f = *p;
-
- p = aValList.Next();
-
- while( p )
+ double f = aValList.Get(0);
+ for( sal_uInt32 i = 1; i < aValList.Count(); ++i )
{
- f = GetGcd( *p, f );
- p = aValList.Next();
+ f = GetGcd( aValList.Get(i), f );
}
RETURN_FINITE( f );
@@ -812,22 +808,18 @@ double SAL_CALL AnalysisAddIn::getLcm( const uno::Reference< beans::XPropertySet
if( aValList.Count() == 0 )
return 0.0;
- const double* p = aValList.First();
- double f = *p;
+ double f = aValList.Get(0);
if( f == 0.0 )
return f;
- p = aValList.Next();
-
- while( p )
+ for( sal_uInt32 i = 1; i < aValList.Count(); ++i )
{
- double fTmp = *p;
+ double fTmp = aValList.Get(i);
if( f == 0.0 )
return f;
else
f = fTmp * f / GetGcd( fTmp, f );
- p = aValList.Next();
}
RETURN_FINITE( f );
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index e7b24a1..a122abc 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1660,13 +1660,6 @@ void SortedIndividualInt32List::InsertHolidayList(
//-----------------------------------------------------------------------------
-ScaDoubleList::~ScaDoubleList()
-{
- for( double* pDbl = const_cast< double* >( First() ); pDbl; pDbl = const_cast< double* >( Next() ) )
- delete pDbl;
-}
-
-
void ScaDoubleList::Append(
const uno::Sequence< uno::Sequence< double > >& rValueSeq ) throw( uno::RuntimeException, lang::IllegalArgumentException )
{
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index d250f73..f2c74a3 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -331,12 +331,13 @@ public:
//-----------------------------------------------------------------------------
-class ScaDoubleList : protected MyList
+class ScaDoubleList
{
+private:
+ std::vector<double> maVector;
protected:
- inline void ListAppend( double fValue ) { MyList::Append( new double( fValue ) ); }
+ inline void ListAppend( double fValue ) { maVector.push_back(fValue); }
- using MyList::Append;
inline void Append( double fValue ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
{ if( CheckInsert( fValue ) ) ListAppend( fValue ); }
@@ -362,14 +363,12 @@ protected:
sal_Bool bIgnoreEmpty ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
public:
- virtual ~ScaDoubleList();
-
- using MyList::Count;
- inline const double* Get( sal_uInt32 nIndex ) const
- { return static_cast< const double* >( MyList::GetObject( nIndex ) ); }
+ virtual ~ScaDoubleList() {}
- inline const double* First() { return static_cast< const double* >( MyList::First() ); }
- inline const double* Next() { return static_cast< const double* >( MyList::Next() ); }
+ inline sal_uInt32 Count() const
+ { return maVector.size(); }
+ inline double Get( sal_uInt32 n ) const
+ { return maVector[n]; }
void Append( const css::uno::Sequence< css::uno::Sequence< double > >& rValueArr )
throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
diff --git a/scaddins/source/analysis/financial.cxx b/scaddins/source/analysis/financial.cxx
index bfaec15..0378222 100644
--- a/scaddins/source/analysis/financial.cxx
+++ b/scaddins/source/analysis/financial.cxx
@@ -461,8 +461,8 @@ double SAL_CALL AnalysisAddIn::getOddlyield( const css::uno::Reference< css::bea
// ============================================================================
// XIRR helper functions
-#define V_(i) (*rValues.Get(i))
-#define D_(i) (*rDates.Get(i))
+#define V_(i) (rValues.Get(i))
+#define D_(i) (rDates.Get(i))
/** Calculates the resulting amount for the passed interest rate and the given XIRR parameters. */
static double lcl_sca_XirrResult( const ScaDoubleList& rValues, const ScaDoubleList& rDates, double fRate )
@@ -579,11 +579,11 @@ double SAL_CALL AnalysisAddIn::getXnpv(
throw css::lang::IllegalArgumentException();
double fRet = 0.0;
- double fNull = *aDateList.Get( 0 );
+ double fNull = aDateList.Get( 0 );
fRate++;
for( sal_Int32 i = 0 ; i < nNum ; i++ )
- fRet += *aValList.Get( i ) / ( pow( fRate, ( *aDateList.Get( i ) - fNull ) / 365.0 ) );
+ fRet += aValList.Get( i ) / ( pow( fRate, ( aDateList.Get( i ) - fNull ) / 365.0 ) );
RETURN_FINITE( fRet );
}
@@ -654,8 +654,8 @@ double SAL_CALL AnalysisAddIn::getFvschedule( double fPrinc, const css::uno::Seq
aSchedList.Append( rSchedule );
- for( const double* p = aSchedList.First() ; p ; p = aSchedList.Next() )
- fPrinc *= 1.0 + *p;
+ for( sal_uInt32 i = 0; i < aSchedList.Count(); ++i )
+ fPrinc *= 1.0 + aSchedList.Get(i);
RETURN_FINITE( fPrinc );
}
commit 20c4de49ac040e4c232d59f1ce0c86660b0ebc09
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jan 10 10:57:43 2014 +0200
convert custom list implementation SortedIndividualInt32List
.. to std::vector
Change-Id: I882653fbe6e42bf2a4f79c5b7c353e6667c79879
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index bade2db..e7b24a1 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1564,11 +1564,11 @@ void SortedIndividualInt32List::Insert( sal_Int32 nDay )
return;
else if( nDay > nRef )
{
- MyList::Insert( (void*)(sal_IntPtr)nDay, nIndex + 1 );
+ maVector.insert( maVector.begin() + nIndex + 1, nDay );
return;
}
}
- MyList::Insert( (void*)(sal_IntPtr)nDay, 0UL );
+ maVector.insert( maVector.begin(), nDay );
}
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 1208b36..d250f73 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -286,10 +286,11 @@ public:
//-----------------------------------------------------------------------------
/// sorted list with unique sal_Int32 values
-class SortedIndividualInt32List : private MyList
+class SortedIndividualInt32List
{
+private:
+ std::vector<sal_Int32> maVector;
protected:
- using MyList::Insert;
void Insert( sal_Int32 nDay );
void Insert( sal_Int32 nDay, sal_Int32 nNullDate, sal_Bool bInsertOnWeekend );
void Insert( double fDay, sal_Int32 nNullDate, sal_Bool bInsertOnWeekend )
@@ -307,11 +308,12 @@ public:
SortedIndividualInt32List();
virtual ~SortedIndividualInt32List();
- using MyList::Count;
+ inline sal_uInt32 Count() const
+ { return maVector.size(); }
/// @return element on position nIndex or 0 on invalid index
- inline sal_Int32 Get( sal_uInt32 nIndex ) const
- { return (sal_Int32)(sal_IntPtr) MyList::GetObject( nIndex ); }
+ inline sal_Int32 Get( sal_uInt32 n ) const
+ { return maVector[n]; }
/// @return sal_True if nVal (internal date representation) is contained
sal_Bool Find( sal_Int32 nVal ) const;
commit 22b928d7d7e03e0a8506263ae556a0e3d15b0d86
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jan 10 10:53:06 2014 +0200
convert custom list implementation FuncDataList to use std::vector
Change-Id: Id73464d135dd41e6a24663da654a3c623c2814d4
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index d9e7a42..bade2db 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1508,8 +1508,8 @@ FuncDataList::FuncDataList( ResMgr& rResMgr )
FuncDataList::~FuncDataList()
{
- for( FuncData* p = ( FuncData* ) First() ; p ; p = ( FuncData* ) Next() )
- delete p;
+ for( std::vector<FuncData*>::iterator it = maVector.begin(); it != maVector.end(); ++it )
+ delete *it;
}
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 85dc8f5..1208b36 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -237,17 +237,19 @@ public:
-class FuncDataList : private MyList
+class FuncDataList
{
- OUString aLastName;
+ OUString aLastName;
sal_uInt32 nLast;
+ std::vector<FuncData*> maVector;
public:
FuncDataList( ResMgr& );
virtual ~FuncDataList();
- using MyList::Append;
+
inline void Append( FuncData* pNew );
inline const FuncData* Get( sal_uInt32 nIndex ) const;
- using MyList::Count;
+ inline sal_uInt32 Count() const
+ { return maVector.size(); }
const FuncData* Get( const OUString& aProgrammaticName ) const;
};
@@ -712,13 +714,13 @@ inline FDCategory FuncData::GetCategory( void ) const
inline void FuncDataList::Append( FuncData* p )
{
- MyList::Append( p );
+ maVector.push_back( p );
}
inline const FuncData* FuncDataList::Get( sal_uInt32 n ) const
{
- return ( const FuncData* ) MyList::GetObject( n );
+ return maVector[n];
}
commit 4cc5d3f2d720e9900c6a58880bb979da81326166
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jan 10 10:48:41 2014 +0200
convert custom list implement ConvertDataList to std::vector
Change-Id: I32fbab56f21709a79b1d7fd13bc85ad5a9a107dd
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index c60bc08..d9e7a42 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 81a48eb..85dc8f5 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
commit 9ed624752f2a3648ab109e57680e285683387d64
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jan 10 10:42:12 2014 +0200
Convert custom list implementation ComplexList to use std::vector
Change-Id: Ifd02215e2b86fb9c527db0d4011781c4959c29bf
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index bec4960..f2fa49f 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -1120,15 +1120,12 @@ OUString SAL_CALL AnalysisAddIn::getImproduct( const uno::Reference< beans::XPro
z_list.Append( aNum1, AH_IgnoreEmpty );
z_list.Append( aNL, AH_IgnoreEmpty );
- const Complex* p = z_list.First();
-
- if( !p )
+ if( z_list.empty() )
return Complex( 0 ).GetString();
- Complex z( *p );
-
- for( p = z_list.Next() ; p ; p = z_list.Next() )
- z.Mult( *p );
+ Complex z( *(z_list.Get(0)) );
+ for( sal_uInt32 i = 1; i < z_list.Count(); ++i )
+ z.Mult( *(z_list.Get(i)) );
return z.GetString();
}
@@ -1168,15 +1165,12 @@ OUString SAL_CALL AnalysisAddIn::getImsum( const uno::Reference< beans::XPropert
z_list.Append( aNum1, AH_IgnoreEmpty );
z_list.Append( aFollowingPars, AH_IgnoreEmpty );
- const Complex* p = z_list.First();
-
- if( !p )
+ if( z_list.empty() )
return Complex( 0 ).GetString();
- Complex z( *p );
-
- for( p = z_list.Next() ; p ; p = z_list.Next() )
- z.Add( *p );
+ Complex z( *(z_list.Get(0)) );
+ for( sal_uInt32 i = 1; i < z_list.Count(); ++i )
+ z.Add( *(z_list.Get(i)) );
return z.GetString();
}
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 11c4eb5..c60bc08 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2195,8 +2195,8 @@ void Complex::Csch(void) throw( uno::RuntimeException, lang::IllegalArgumentExce
ComplexList::~ComplexList()
{
- for( Complex* p = ( Complex* ) First() ; p ; p = ( Complex* ) Next() )
- delete p;
+ for( sal_uInt32 i = 0; i < maVector.size(); ++i )
+ delete maVector[i];
}
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 510c6bd..81a48eb 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -466,18 +466,20 @@ enum ComplListAppendHandl
};
-class ComplexList : protected MyList
+class ComplexList
{
+private:
+ std::vector<Complex*> maVector;
public:
virtual ~ComplexList();
inline const Complex* Get( sal_uInt32 nIndex ) const;
- inline const Complex* First( void );
- inline const Complex* Next( void );
- using MyList::Count;
+ inline bool empty( void ) const
+ { return maVector.empty(); }
+ inline sal_uInt32 Count( void ) const
+ { return maVector.size(); }
- using MyList::Append;
inline void Append( Complex* pNew );
void Append( const css::uno::Sequence< css::uno::Sequence< OUString > >& rComplexNumList, ComplListAppendHandl eAH = AH_EmpyAs0 ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
void Append( const css::uno::Sequence< css::uno::Any >& aMultPars,ComplListAppendHandl eAH = AH_EmpyAs0 ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
@@ -791,25 +793,13 @@ inline void Complex::Add( const Complex& rAdd )
inline const Complex* ComplexList::Get( sal_uInt32 n ) const
{
- return ( const Complex* ) MyList::GetObject( n );
-}
-
-
-inline const Complex* ComplexList::First( void )
-{
- return ( const Complex* ) MyList::First();
-}
-
-
-inline const Complex* ComplexList::Next( void )
-{
- return ( const Complex* ) MyList::Next();
+ return maVector[n];
}
inline void ComplexList::Append( Complex* p )
{
- MyList::Append( p );
+ maVector.push_back(p);
}
commit a08633b07a4370d16cdba43427ddb57a7feb7552
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jan 10 10:30:48 2014 +0200
remove unused CStrList class
Change-Id: I22b74ab50fbef728c3a0d8a04e212fe1b1fce86e
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index df56154..510c6bd 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -237,18 +237,6 @@ public:
-class CStrList : private MyList
-{
-public:
- using MyList::Append;
- inline void Append( const sal_Char* pNew );
- inline const sal_Char* Get( sal_uInt32 nIndex ) const;
- using MyList::Count;
-};
-
-
-
-
class FuncDataList : private MyList
{
OUString aLastName;
@@ -722,22 +710,6 @@ inline FDCategory FuncData::GetCategory( void ) const
}
-
-
-inline void CStrList::Append( const sal_Char* p )
-{
- MyList::Append( ( void* ) p );
-}
-
-
-inline const sal_Char* CStrList::Get( sal_uInt32 n ) const
-{
- return ( const sal_Char* ) MyList::GetObject( n );
-}
-
-
-
-
inline void FuncDataList::Append( FuncData* p )
{
MyList::Append( p );
More information about the Libreoffice-commits
mailing list