diff options
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/svtools/parhtml.hxx | 4 | ||||
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 21 |
2 files changed, 8 insertions, 17 deletions
diff --git a/svtools/inc/svtools/parhtml.hxx b/svtools/inc/svtools/parhtml.hxx index 627e7870e0ff..ad228f5d7524 100644 --- a/svtools/inc/svtools/parhtml.hxx +++ b/svtools/inc/svtools/parhtml.hxx @@ -32,7 +32,6 @@ #include "svtools/svtdllapi.h" #include <tools/solar.h> #include <tools/string.hxx> -#include <svl/svarray.hxx> #include <svtools/svparser.hxx> #include <boost/ptr_container/ptr_vector.hpp> @@ -45,7 +44,6 @@ namespace com { namespace sun { namespace star { class Color; class SvNumberFormatter; -class SvULongs; class SvKeyValueIterator; #define HTMLFONTSZ1_DFLT 7 @@ -115,7 +113,7 @@ public: sal_uInt32 GetNumber() const; // ... als Zahl sal_Int32 GetSNumber() const; // ... als Zahl - void GetNumbers( SvULongs &rLongs, // ... als Zahlen + void GetNumbers( std::vector<sal_uInt32> &rNumbers, // ... als Zahlen bool bSpaceDelim=false ) const; void GetColor( Color& ) const; // ... als Farbe 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; } } |