diff options
| author | Noel Grandin <noel@peralex.com> | 2014-01-10 10:57:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-01-20 13:14:35 +0200 |
| commit | 20c4de49ac040e4c232d59f1ce0c86660b0ebc09 (patch) | |
| tree | 6ff8196fcf33cae961c5b8ed11b45d87df53c03d /scaddins | |
| parent | 22b928d7d7e03e0a8506263ae556a0e3d15b0d86 (diff) | |
convert custom list implementation SortedIndividualInt32List
.. to std::vector
Change-Id: I882653fbe6e42bf2a4f79c5b7c353e6667c79879
Diffstat (limited to 'scaddins')
| -rw-r--r-- | scaddins/source/analysis/analysishelper.cxx | 4 | ||||
| -rw-r--r-- | scaddins/source/analysis/analysishelper.hxx | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index bade2db20289..e7b24a138cd4 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 1208b36ec57d..d250f736c3a9 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; |