diff options
| author | Maciej Rumianowski <maciej.rumianowski@gmail.com> | 2011-09-27 22:04:20 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-09-29 08:09:19 +0200 |
| commit | ef01fae2759ac225f281f11a2b24ebaad40be941 (patch) | |
| tree | 9ccc0ed54ee2795b719710260bbc4db0e5ea47c3 /svtools/source/svhtml | |
| parent | f446ca6fe8fe9ebdc66c230f4608fd3de74d0ca9 (diff) | |
Replace SvULongs with std::vector in sfx2
Bug 38831, replace SvULongs with std::vector in sfx2 and related svtools
Diffstat (limited to 'svtools/source/svhtml')
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 770f03bda8ee..8ec3503303e8 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -36,10 +36,6 @@ #include <tools/color.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> -#ifndef _SVSTDARR_HXX -#define _SVSTDARR_ULONGS -#include <svl/svstdarr.hxx> -#endif #include <tools/tenccvt.hxx> #include <tools/datetime.hxx> @@ -176,10 +172,9 @@ sal_Int32 HTMLOption::GetSNumber() const return aTmp.ToInt32(); } -void HTMLOption::GetNumbers( SvULongs &rLongs, bool bSpaceDelim ) const +void HTMLOption::GetNumbers( std::vector<sal_uInt32> &rNumbers, bool bSpaceDelim ) const { - if( rLongs.Count() ) - rLongs.Remove( 0, rLongs.Count() ); + rNumbers.clear(); if( bSpaceDelim ) { @@ -198,14 +193,14 @@ void HTMLOption::GetNumbers( SvULongs &rLongs, bool bSpaceDelim ) const } else if( bInNum ) { - rLongs.Insert( nNum, rLongs.Count() ); + rNumbers.push_back( nNum ); bInNum = false; nNum = 0; } } if( bInNum ) { - rLongs.Insert( nNum, rLongs.Count() ); + rNumbers.push_back( nNum ); } } else @@ -222,23 +217,21 @@ void HTMLOption::GetNumbers( SvULongs &rLongs, bool bSpaceDelim ) const nPos++; if( nPos==aValue.Len() ) - rLongs.Insert( sal_uLong(0), rLongs.Count() ); + rNumbers.push_back(0); else { xub_StrLen nEnd = aValue.Search( (sal_Unicode)',', nPos ); if( STRING_NOTFOUND==nEnd ) { sal_Int32 nTmp = aValue.Copy(nPos).ToInt32(); - rLongs.Insert( nTmp >= 0 ? (sal_uInt32)nTmp : 0, - rLongs.Count() ); + rNumbers.push_back( nTmp >= 0 ? (sal_uInt32)nTmp : 0 ); nPos = aValue.Len(); } else { sal_Int32 nTmp = aValue.Copy(nPos,nEnd-nPos).ToInt32(); - rLongs.Insert( nTmp >= 0 ? (sal_uInt32)nTmp : 0, - rLongs.Count() ); + rNumbers.push_back( nTmp >= 0 ? (sal_uInt32)nTmp : 0 ); nPos = nEnd+1; } } |