diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-26 10:44:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-28 09:55:02 +0000 |
| commit | 48221d6a2bf4c327b6cadcdc65169997f7d7408d (patch) | |
| tree | c55de0fd2abb2e2729540d98a02f87dd38b7a526 /svtools | |
| parent | afb548ba6962c74ae99350bad0bd2c72c9ddd998 (diff) | |
ByteString::GetToken->comphelper::string::getToken
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/bmpmaker/bmpsum.cxx | 5 | ||||
| -rw-r--r-- | svtools/source/filter/ixbm/xbmread.cxx | 3 | ||||
| -rw-r--r-- | svtools/source/filter/sgvtext.cxx | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/svtools/bmpmaker/bmpsum.cxx b/svtools/bmpmaker/bmpsum.cxx index a9f1454f5a86..9169f40b5d4e 100644 --- a/svtools/bmpmaker/bmpsum.cxx +++ b/svtools/bmpmaker/bmpsum.cxx @@ -33,6 +33,7 @@ #include <set> #include <map> +#include <comphelper/string.hxx> #include <rtl/crc.h> #include <rtl/strbuf.hxx> #include <tools/stream.hxx> @@ -431,11 +432,11 @@ void BmpSum::ProcessFileList( const String& rInFileList, for( sal_uInt16 n = 0; ( n < nTokenCount - 1 ); n++ ) { - aNewDir += DirEntry( aFileName.GetToken( n, '/' ) ); + aNewDir += DirEntry( comphelper::string::getToken(aFileName, n, '/') ); aNewDir.MakeDir(); } - aNewDir += DirEntry( aFileName.GetToken( nTokenCount - 1, '/' ) ); + aNewDir += DirEntry( comphelper::string::getToken(aFileName, nTokenCount - 1, '/') ); aSrcFile.CopyTo( aNewDir, FSYS_ACTION_COPYFILE ); } } diff --git a/svtools/source/filter/ixbm/xbmread.cxx b/svtools/source/filter/ixbm/xbmread.cxx index 17c56b6d85e2..ff21e59f3728 100644 --- a/svtools/source/filter/ixbm/xbmread.cxx +++ b/svtools/source/filter/ixbm/xbmread.cxx @@ -31,6 +31,7 @@ #define _XBMPRIVATE #include <ctype.h> +#include <comphelper/string.hxx> #include "xbmread.hxx" // ------------- @@ -230,7 +231,7 @@ sal_Bool XBMReader::ParseData( SvStream* pInStm, const ByteString& aLastLine, XB for( sal_uInt16 i = 0; ( i < nCount ) && ( nRow < nHeight ); i++ ) { - const rtl::OString aToken(aLine.GetToken(i, ',')); + const rtl::OString aToken(comphelper::string::getToken(aLine,i, ',')); const sal_Int32 nLen = aToken.getLength(); sal_Bool bProcessed = sal_False; diff --git a/svtools/source/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx index 0454c6f80494..171d141a4e88 100644 --- a/svtools/source/filter/sgvtext.cxx +++ b/svtools/source/filter/sgvtext.cxx @@ -1188,7 +1188,7 @@ void SgfFontOne::ReadOne( const rtl::OString& rID, ByteString& Dsc ) n=Dsc.GetTokenCount(' '); for (i=0;i<n;i++) { - s = Dsc.GetToken( i,' ' ); + s = comphelper::string::getToken(Dsc, i,' '); if (!s.isEmpty()) { s = s.toAsciiUpperCase(); |