ByteString::GetToken->comphelper::string::getToken

12 files changed, 55 insertions, 41 deletions

diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 6033500532c6..bcaa77e3cede 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -284,8 +284,8 @@ namespace connectivity
                                 {
                                     if ( sLine.Len() == 0 )
                                         continue;
-                                    const ByteString sIniKey = sLine.GetToken( 0, '=' );
-                                    const ByteString sValue = sLine.GetToken( 1, '=' );
+                                    const ByteString sIniKey = comphelper::string::getToken(sLine, 0, '=');
+                                    const ByteString sValue = comphelper::string::getToken(sLine, 1, '=');
                                     if ( sIniKey.Equals( "hsqldb.compatible_version" ) )
                                     {
                                         sVersionString = sValue;
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 4841162afcc3..6408f4a8fa86 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -33,8 +33,10 @@
 #include "RtfReader.hxx"
 #include "HtmlReader.hxx"
 #include "dbustrings.hrc"
-#include <connectivity/dbtools.hxx>
+#include <comphelper/componentcontext.hxx>
+#include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
+#include <connectivity/dbtools.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
@@ -61,7 +63,6 @@
 #include <svtools/htmlcfg.hxx>
 #include <connectivity/formattedcolumnvalue.hxx>
 #include <unotools/syslocale.hxx>
-#include <comphelper/componentcontext.hxx>
 #include <rtl/logfile.hxx>
 
 using namespace dbaui;
@@ -426,7 +427,7 @@ sal_Bool ORTFImportExport::Write()
         (*m_pStream) << "\\f";
         m_pStream->WriteNumber(static_cast<sal_Int32>(j));
         (*m_pStream) << "\\fcharset0\\fnil ";
-        (*m_pStream) << aFonts.GetToken(j).GetBuffer();
+        (*m_pStream) << comphelper::string::getToken(aFonts, j, ';').getStr();
         (*m_pStream) << ';';
     }
     (*m_pStream) << '}' ;
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index d816d44076b4..715f90c80a67 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -31,6 +31,7 @@
 #ifdef UNX
 #include <stdio.h>
 #endif
+#include <comphelper/string.hxx>
 #include <sal/types.h>
 #include <tools/string.hxx>
 #include <vcl/msgbox.hxx>
@@ -149,16 +150,19 @@ namespace desktop
 #ifdef UNX
         // on unix use console for output
         fprintf(stdout, "%s%s",
-                ByteString(aHelpMessage_version, RTL_TEXTENCODING_ASCII_US).GetBuffer(),
-                ByteString(aHelpMessage_head, RTL_TEXTENCODING_ASCII_US).GetBuffer());
+                rtl::OUStringToOString(aHelpMessage_version, RTL_TEXTENCODING_ASCII_US).getStr(),
+                rtl::OUStringToOString(aHelpMessage_head, RTL_TEXTENCODING_ASCII_US).getStr());
         // merge left and right column
-        int n = aHelpMessage_left.GetTokenCount ('\n');
-        ByteString bsLeft(aHelpMessage_left, RTL_TEXTENCODING_ASCII_US);
-        ByteString bsRight(aHelpMessage_right, RTL_TEXTENCODING_ASCII_US);
-        for ( int i = 0; i < n; i++ )
+        sal_Int32 n = aHelpMessage_left.GetTokenCount ('\n');
+        rtl::OString bsLeft(rtl::OUStringToOString(aHelpMessage_left,
+            RTL_TEXTENCODING_ASCII_US));
+        ByteString bsRight(rtl::OUStringToOString(aHelpMessage_right,
+            RTL_TEXTENCODING_ASCII_US));
+        for ( sal_Int32 i = 0; i < n; ++i )
         {
-            fprintf(stdout, "%s", bsLeft.GetToken(i, '\n').GetBuffer());
-            fprintf(stdout, "%s\n", bsRight.GetToken(i, '\n').GetBuffer());
+            using comphelper::string::getToken;
+            fprintf(stdout, "%s", getToken(bsLeft, i, '\n').getStr());
+            fprintf(stdout, "%s\n", getToken(bsRight, i, '\n').getStr());
         }
         fprintf(stdout, "%s", ByteString(aHelpMessage_bottom,
                     RTL_TEXTENCODING_ASCII_US).GetBuffer());
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 123d5b9b6cb7..9d513af9d878 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -27,6 +27,7 @@
  ************************************************************************/
 
 #include <stdio.h>
+#include <comphelper/string.hxx>
 #include <tools/string.hxx>
 #include <tools/fsys.hxx>
 
@@ -35,6 +36,8 @@
 #include "cfgmerge.hxx"
 #include "tokens.h"
 
+using comphelper::string::getToken;
+
 extern "C" { int yyerror( char * ); }
 extern "C" { int YYWarning( char * ); }
 
@@ -405,7 +408,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
         case ANYTOKEN:
         case CFG_TEXT_START:
         {
-            sTokenName = sToken.GetToken( 1, '<' ).GetToken( 0, '>' ).GetToken( 0, ' ' );
+            sTokenName = getToken(getToken(getToken(sToken, 1, '<'), 0, '>'), 0, ' ');
 
               if ( !IsTokenClosed( sToken )) {
                 ByteString sSearch;
@@ -441,7 +444,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
                         sCurrentResTyp = sTokenName;
 
                         ByteString sTemp = sToken.Copy( sToken.Search( "xml:lang=" ));
-                        sCurrentIsoLang = sTemp.GetToken( 1, '\"' ).GetToken( 0, '\"' );
+                        sCurrentIsoLang = getToken(getToken(sTemp, 1, '\"'), 0, '\"');
 
                         if ( sCurrentIsoLang == NO_TRANSLATE_ISO )
                             bLocalize = sal_False;
@@ -452,9 +455,10 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
                     }
                     break;
                 }
-                if ( sSearch.Len()) {
-                    ByteString sTemp = sToken.Copy( sToken.Search( sSearch ));
-                    sTokenId = sTemp.GetToken( 1, '\"' ).GetToken( 0, '\"' );
+                if ( sSearch.Len())
+                {
+                    rtl::OString sTemp = sToken.Copy( sToken.Search( sSearch ));
+                    sTokenId = getToken(getToken(sTemp, 1, '\"'), 0, '\"');
                 }
                 pStackData = aStack.Push( sTokenName, sTokenId );
 
@@ -479,7 +483,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
         }
         break;
         case CFG_CLOSETAG:
-            sTokenName = sToken.GetToken( 1, '/' ).GetToken( 0, '>' ).GetToken( 0, ' ' );
+            sTokenName = getToken(getToken(getToken(sToken, 1, '/'), 0, '>'), 0, ' ');
                if ( aStack.GetStackData() && ( aStack.GetStackData()->GetTagType() == sTokenName )) {
                 if ( ! sCurrentText.Len())
                     WorkOnRessourceEnd();
@@ -804,12 +808,12 @@ void CfgMerge::WorkOnRessourceEnd()
                     ByteString sTextTag = pStackData->sTextTag;
                     ByteString sTemp = sTextTag.Copy( sTextTag.Search( "xml:lang=" ));
 
-                    ByteString sSearch = sTemp.GetToken( 0, '\"' );
+                    ByteString sSearch = getToken(sTemp, 0, '\"');
                     sSearch += "\"";
-                    sSearch += sTemp.GetToken( 1, '\"' );
+                    sSearch += getToken(sTemp, 1, '\"');
                     sSearch += "\"";
 
-                    ByteString sReplace = sTemp.GetToken( 0, '\"' );
+                    ByteString sReplace = getToken(sTemp, 0, '\"');
                     sReplace += "\"";
                     sReplace += sCur;
                     sReplace += "\"";
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index 0bee6d257937..17b3d52ff940 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -148,17 +148,17 @@ GSILine::GSILine( const ByteString &rLine, sal_uLong nLine )
     {
         aFormat = FORMAT_SDF;
         aUniqId = getToken(rLine, 0, '\t');
-        aUniqId.Append("/").Append( rLine.GetToken( 1, '\t' ) ).Append("/").Append( rLine.GetToken( 3, '\t' ) ).Append("/").Append( rLine.GetToken( 4, '\t' ) ).Append("/").Append( rLine.GetToken( 5, '\t' ) ).Append("/").Append( rLine.GetToken( 6, '\t' ) ).Append("/").Append( rLine.GetToken( 7, '\t' ) );
+        aUniqId.Append("/").Append( getToken(rLine, 1, '\t') ).Append("/").Append( getToken(rLine, 3, '\t') ).Append("/").Append( getToken(rLine, 4, '\t') ).Append("/").Append( getToken(rLine, 5, '\t') ).Append("/").Append( getToken(rLine, 6, '\t') ).Append("/").Append( getToken(rLine, 7, '\t') );
         aLineType = "";
-        aLangId = rLine.GetToken( 9, '\t' );
-        aText = rLine.GetToken( 10, '\t' );
-        aQuickHelpText = rLine.GetToken( 12, '\t' );
-        aTitle = rLine.GetToken( 13, '\t' );
+        aLangId = getToken(rLine, 9, '\t');
+        aText = getToken(rLine, 10, '\t');
+        aQuickHelpText = getToken(rLine, 12, '\t');
+        aTitle = getToken(rLine, 13, '\t');
 
         // do some more format checks here
-        if (!comphelper::string::isdigitAsciiString(rLine.GetToken(8, '\t')))
+        if (!comphelper::string::isdigitAsciiString(getToken(rLine, 8, '\t')))
         {
-            PrintError( "The length field does not contain a number!", "Line format", rLine.GetToken( 8, '\t' ), sal_True, GetLineNumber(), GetUniqId() );
+            PrintError( "The length field does not contain a number!", "Line format", getToken(rLine, 8, '\t'), sal_True, GetLineNumber(), GetUniqId() );
             NotOK();
         }
         if ( !LanguageOK( aLangId ) )
@@ -167,7 +167,7 @@ GSILine::GSILine( const ByteString &rLine, sal_uLong nLine )
             NotOK();
         }
         // limit GID and LID to MAX_GID_LID_LEN chars each for database conformity, see #137575#
-        if ( rLine.GetToken( 4, '\t' ).Len() > MAX_GID_LID_LEN || rLine.GetToken( 5, '\t' ).Len() > MAX_GID_LID_LEN )
+        if ( getToken(rLine, 4, '\t').getLength() > MAX_GID_LID_LEN || getToken(rLine, 5, '\t').getLength() > MAX_GID_LID_LEN )
         {
             PrintError(rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("GID and LID may only be "))
                  .append(static_cast<sal_Int32>(MAX_GID_LID_LEN))
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 2f7246d73330..fbc0017b92f8 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -415,9 +415,10 @@ ByteString XRMResParser::GetAttribute( const ByteString &rToken, const ByteStrin
     sSearch += "=";
     sal_uInt16 nPos = sTmp.Search( sSearch );
 
-    if ( nPos != STRING_NOTFOUND ) {
+    if ( nPos != STRING_NOTFOUND )
+    {
         sTmp = sTmp.Copy( nPos );
-        ByteString sId = sTmp.GetToken( 1, '\"' );
+        ByteString sId = comphelper::string::getToken(sTmp, 1, '\"');
         return sId;
     }
     return "";
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();
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index c0d2a5dda168..c04874100e26 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -102,6 +102,7 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 
+using ::comphelper::string::getToken;
 using ::rtl::OUString;
 using ::rtl::OString;
 using ::rtl::OStringHash;
@@ -2991,8 +2992,8 @@ OUString PrintFontManager::getFontXLFD( fontID nFontID ) const
     OUString aRet;
     if( pFont )
     {
-        ByteString aXLFD( getXLFD( pFont ) );
-        rtl_TextEncoding aEncoding = aXLFD.GetToken( 6, '-' ).Search( "utf8" ) != STRING_NOTFOUND ? RTL_TEXTENCODING_UTF8 : RTL_TEXTENCODING_ISO_8859_1;
+        OString aXLFD( getXLFD( pFont ) );
+        rtl_TextEncoding aEncoding = getToken(aXLFD, 6, '-').indexOf( "utf8" ) != -1 ? RTL_TEXTENCODING_UTF8 : RTL_TEXTENCODING_ISO_8859_1;
         aRet = OStringToOUString( aXLFD, aEncoding );
     }
     return aRet;
@@ -3383,7 +3384,7 @@ bool PrintFontManager::checkChangeFontPropertiesPossible( fontID /*nFontID*/ ) c
 bool PrintFontManager::changeFontProperties( fontID nFontID, const ::rtl::OUString& rXLFD )
 {
     ByteString aXLFD( OUStringToOString( rXLFD, RTL_TEXTENCODING_UTF8 ) );
-    ByteString aAddStyle = aXLFD.GetToken( '-', 6 );
+    ByteString aAddStyle = comphelper::string::getToken(aXLFD, '-', 6);
     if( aAddStyle.Search( "utf8" ) == STRING_NOTFOUND )
     {
         aAddStyle.Append( aAddStyle.Len() ? ";utf8" : "utf8" );
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index 6c5525d2e5e7..43c2cbb27c8b 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/generic/print/common_gfx.cxx
@@ -30,6 +30,7 @@
 #include "psputil.hxx"
 #include "glyphset.hxx"
 
+#include <comphelper/string.hxx>
 #include "generic/printergfx.hxx"
 #include "generic/printerjob.hxx"
 #include "vcl/fontmanager.hxx"
@@ -1205,7 +1206,7 @@ PrinterGfx::DrawEPS( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize
             {
                 if( aLine.CompareIgnoreCaseToAscii( "%%BoundingBox:", 14 ) == COMPARE_EQUAL )
                 {
-                    aLine = WhitespaceToSpace( aLine.GetToken( 1, ':' ) );
+                    aLine = WhitespaceToSpace( comphelper::string::getToken(aLine, 1, ':') );
                     if( aLine.Len() && aLine.Search( "atend" ) == STRING_NOTFOUND )
                     {
                         fLeft   = StringToDouble( GetCommandLineToken( 0, aLine ) );
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 867cca5edc01..1fde94972895 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -978,7 +978,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines )
         if( aCurrentLine.GetChar(1) == '%' )
             continue;
 
-        ByteString aKey = GetCommandLineToken( 0, aCurrentLine.GetToken( 0, ':' ) );
+        ByteString aKey = GetCommandLineToken( 0, comphelper::string::getToken(aCurrentLine, 0, ':') );
         int nPos = aKey.Search( '/' );
         if( nPos != STRING_NOTFOUND )
             aKey.Erase( nPos );