Remove unnecessary comphelper::string::getToken

Change-Id: I49192637121441b9a1980350b9bb32cd995d4386

25 files changed, 48 insertions, 93 deletions

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 8c1eafb9e435..a9ef314baf9c 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -950,7 +950,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
         sal_Int32 nLibs = comphelper::string::getTokenCount(aLibs, LIB_SEP);
         for ( sal_Int32 nLib = 0; nLib < nLibs; nLib++ )
         {
-            OUString aLibInfo(comphelper::string::getToken(aLibs, nLib, LIB_SEP));
+            OUString aLibInfo(aLibs.getToken(nLib, LIB_SEP));
             // TODO: Remove == 2
             DBG_ASSERT( ( comphelper::string::getTokenCount(aLibInfo, LIBINFO_SEP) == 2 ) || ( comphelper::string::getTokenCount(aLibInfo, LIBINFO_SEP) == 3 ), "Invalid Lib-Info!" );
             OUString aLibName( aLibInfo.getToken( 0, LIBINFO_SEP ) );
@@ -1795,7 +1795,7 @@ ErrCode BasicManager::ExecuteMacro( OUString const& i_fullyQualifiedName, OUStri
         for (sal_Int32 n = 0; n < nCount; ++n)
         {
             sQuotedArgs += "\"";
-            sQuotedArgs += comphelper::string::getToken(sArgs2, n, ',');
+            sQuotedArgs += sArgs2.getToken(n, ',');
             sQuotedArgs += "\"";
             if ( n < nCount - 1 )
             {
diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx
index d1831cee734a..8971a4312dfd 100644
--- a/comphelper/qa/string/test_string.cxx
+++ b/comphelper/qa/string/test_string.cxx
@@ -359,19 +359,19 @@ void TestString::testToken()
     OString aIn("10.11.12");
     OString aOut;
 
-    aOut = ::comphelper::string::getToken(aIn, -1, '.');
+    aOut = aIn.getToken(-1, '.');
     CPPUNIT_ASSERT(aOut.isEmpty());
 
-    aOut = ::comphelper::string::getToken(aIn, 0, '.');
+    aOut = aIn.getToken(0, '.');
     CPPUNIT_ASSERT(aOut == "10");
 
-    aOut = ::comphelper::string::getToken(aIn, 1, '.');
+    aOut = aIn.getToken(1, '.');
     CPPUNIT_ASSERT(aOut == "11");
 
-    aOut = ::comphelper::string::getToken(aIn, 2, '.');
+    aOut = aIn.getToken(2, '.');
     CPPUNIT_ASSERT(aOut == "12");
 
-    aOut = ::comphelper::string::getToken(aIn, 3, '.');
+    aOut = aIn.getToken(3, '.');
     CPPUNIT_ASSERT(aOut.isEmpty());
 }
 
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 04de49efa442..979b076ddc8c 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -276,8 +276,8 @@ namespace connectivity
                                 {
                                     if ( sLine.isEmpty() )
                                         continue;
-                                    const OString sIniKey = comphelper::string::getToken(sLine, 0, '=');
-                                    const OString sValue = comphelper::string::getToken(sLine, 1, '=');
+                                    const OString sIniKey = sLine.getToken(0, '=');
+                                    const OString sValue = sLine.getToken(1, '=');
                                     if( sIniKey == "hsqldb.compatible_version" )
                                     {
                                         sVersionString = sValue;
@@ -292,10 +292,9 @@ namespace connectivity
                                 }
                                 if (!sVersionString.isEmpty())
                                 {
-                                    using comphelper::string::getToken;
-                                    const sal_Int32 nMajor = getToken(sVersionString, 0, '.').toInt32();
-                                    const sal_Int32 nMinor = getToken(sVersionString, 1, '.').toInt32();
-                                    const sal_Int32 nMicro = getToken(sVersionString, 2, '.').toInt32();
+                                    const sal_Int32 nMajor = sVersionString.getToken(0, '.').toInt32();
+                                    const sal_Int32 nMinor = sVersionString.getToken(1, '.').toInt32();
+                                    const sal_Int32 nMicro = sVersionString.getToken(2, '.').toInt32();
                                     if (     nMajor > 1
                                         || ( nMajor == 1 && nMinor > 8 )
                                         || ( nMajor == 1 && nMinor == 8 && nMicro > 0 ) )
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index d1856f453deb..c4d3b3c9089e 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -219,7 +219,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni
 
     // the field listbox
     for (sal_Int32 i=0; i < comphelper::string::getTokenCount(strVisibleFields, ';'); ++i)
-        m_plbField->InsertEntry(comphelper::string::getToken(strVisibleFields, i, ';'));
+        m_plbField->InsertEntry(strVisibleFields.getToken(i, ';'));
 
 
     m_pConfig = new FmSearchConfigItem;
@@ -510,13 +510,13 @@ void FmSearchDialog::InitContext(sal_Int16 nContext)
         DBG_ASSERT(comphelper::string::getTokenCount(fmscContext.sFieldDisplayNames, ';') == comphelper::string::getTokenCount(fmscContext.strUsedFields, ';'),
             "FmSearchDialog::InitContext : invalid context description supplied !");
         for (sal_Int32 i=0; i < comphelper::string::getTokenCount(fmscContext.sFieldDisplayNames, ';'); ++i)
-            m_plbField->InsertEntry(comphelper::string::getToken(fmscContext.sFieldDisplayNames, i, ';'));
+            m_plbField->InsertEntry(fmscContext.sFieldDisplayNames.getToken(i, ';'));
     }
     else
     {
         // else use the field names
         for (sal_Int32 i=0; i < comphelper::string::getTokenCount(fmscContext.strUsedFields, ';'); ++i)
-            m_plbField->InsertEntry(comphelper::string::getToken(fmscContext.strUsedFields, i, ';'));
+            m_plbField->InsertEntry(fmscContext.strUsedFields.getToken(i, ';'));
     }
 
     if (nContext < (sal_Int32)m_arrContextFields.size() && !m_arrContextFields[nContext].isEmpty())
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 64d7d4162f24..d46d4733ba77 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -394,7 +394,7 @@ bool ORTFImportExport::Write()
         m_pStream->WriteCharPtr( "\\f" );
         m_pStream->WriteInt32AsString(j);
         m_pStream->WriteCharPtr( "\\fcharset0\\fnil " );
-        m_pStream->WriteCharPtr( comphelper::string::getToken(aFonts, j, ';').getStr() );
+        m_pStream->WriteCharPtr( aFonts.getToken(j, ';').getStr() );
         m_pStream->WriteChar( ';' );
     }
     m_pStream->WriteChar( '}' ) ;
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index e0d86b58c062..61694b8f2791 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -164,9 +164,8 @@ namespace desktop
             RTL_TEXTENCODING_ASCII_US));
         for ( sal_Int32 i = 0; i < n; ++i )
         {
-            using comphelper::string::getToken;
-            fprintf(stdout, "%s", getToken(bsLeft, i, '\n').getStr());
-            fprintf(stdout, "%s\n", getToken(bsRight, i, '\n').getStr());
+            fprintf(stdout, "%s", bsLeft.getToken(i, '\n').getStr());
+            fprintf(stdout, "%s\n", bsRight.getToken(i, '\n').getStr());
         }
         fprintf(stdout, "%s", OUStringToOString(aHelpMessage_bottom,
                     RTL_TEXTENCODING_ASCII_US).getStr());
diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx
index 45e5e77f2ecf..0b91202befde 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -91,7 +91,7 @@ const Sequence< OUString >& PluginManager::getAdditionalSearchPaths()
             sal_Int32 nPaths = comphelper::string::getTokenCount(aPluginPath, ';');
             aPaths.realloc( nPaths );
             for( sal_uInt16 i = 0; i < nPaths; i++ )
-                aPaths.getArray()[i] = comphelper::string::getToken(aPluginPath, i, ';');
+                aPaths.getArray()[i] = aPluginPath.getToken(i, ';');
         }
     }
 
diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx
index b062d7cd2677..b9680372c21b 100644
--- a/include/comphelper/string.hxx
+++ b/include/comphelper/string.hxx
@@ -168,38 +168,6 @@ COMPHELPER_DLLPUBLIC OString strip(const OString &rIn,
 COMPHELPER_DLLPUBLIC OUString strip(const OUString &rIn,
     sal_Unicode c);
 
-/** Returns a token in an OString
-
-    @deprecated  Use OString::getToken(nToken, cTok) instead.
-
-  @param    rIn         the input OString
-  @param    nToken      the number of the token to return
-  @param    cTok        the character which separate the tokens.
-  @return   the token   if token is negative or doesn't exist an empty token
-                        is returned
-*/
-inline OString getToken(const OString &rIn,
-    sal_Int32 nToken, sal_Char cTok)
-{
-    return rIn.getToken(nToken, cTok);
-}
-
-/** Returns a token in an OUString
-
-    @deprecated  Use OUString::getToken(nToken, cTok) instead.
-
-  @param    rIn         the input OUString
-  @param    nToken      the number of the token to return
-  @param    cTok        the character which separate the tokens.
-  @return   the token   if token is negative or doesn't exist an empty token
-                        is returned
-*/
-inline OUString getToken(const OUString &rIn,
-    sal_Int32 nToken, sal_Unicode cTok)
-{
-    return rIn.getToken(nToken, cTok);
-}
-
 /** Returns number of tokens in an OUString
 
   @param    rIn     the input OString
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index b5f72362a568..92babd05fd3a 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -126,7 +126,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
         bool bOneMore = true;
         while ( bOneMore )
         {
-            aIsoToken = comphelper::string::getToken(aEnvIsoTokens, nTokenCounter, ' ');
+            aIsoToken = aEnvIsoTokens.getToken(nTokenCounter, ' ');
             if ( !aIsoToken.isEmpty() )
             {
                 SetConstant( rNames.Put( aIsoToken.getStr(), CONSTNAME, mnLangId ), mnLangId );
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 3a2115bca037..402fb6711f21 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -54,7 +54,6 @@
 #include <vector>
 #include <algorithm>
 
-using comphelper::string::getToken;
 using comphelper::string::getTokenCount;
 
 OString*  pStdParType  = NULL;
@@ -851,9 +850,9 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
         while( aIStm.ReadLine( aLine ) )
         {
             if( ( getTokenCount(aLine, '=') == 2 ) &&
-                ( getToken(aLine, 0, '=').indexOf("File") != -1 ) )
+                ( aLine.getToken(0, '=').indexOf("File") != -1 ) )
             {
-                OString aBaseFileName( getToken(getToken(aLine, 1, '"'), 0, '.') );
+                OString aBaseFileName( aLine.getToken(1, '"').getToken(0, '.') );
 
                 if( GetImageFilePath( rOutputFile, rContext, aBaseFileName, aFilePath, pSysListFile ) )
                 {
@@ -883,7 +882,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
                     }
                     while (aLine.indexOf("Prefix") == -1);
 
-                    const OString aPrefix( getToken(aLine, 1, '"') );
+                    const OString aPrefix( aLine.getToken(1, '"') );
                     aIStm.Seek( nImgListStartPos );
 
                     do
diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx
index 777583f1697c..bd28c5472037 100644
--- a/sc/source/core/data/globalx.cxx
+++ b/sc/source/core/data/globalx.cxx
@@ -52,7 +52,7 @@ void ScGlobal::InitAddIns()
     sal_Int32 nTokens = comphelper::string::getTokenCount(aMultiPath, ';');
     for (sal_Int32 j = 0; j < nTokens; ++j)
     {
-        OUString aPath = comphelper::string::getToken(aMultiPath, j, ';');
+        OUString aPath = aMultiPath.getToken(j, ';');
         if (aPath.isEmpty())
             continue;
 
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 634d323f5e79..0fd1dbcc4e6a 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -924,8 +924,7 @@ namespace sfx2
         const SfxFilter* pDefaultFilter = SfxFilterContainer::GetDefaultFilter_Impl(_rFactory);
         // Only use one extension (#i32434#)
         // (and always the first if there are more than one)
-        using comphelper::string::getToken;
-        sExtension = getToken(pDefaultFilter->GetWildcard().getGlob(), 0, ';');
+        sExtension = pDefaultFilter->GetWildcard().getGlob().getToken(0, ';');
         sUIName = addExtension( pDefaultFilter->GetUIName(), sExtension, false, _rFileDlgImpl );
         try
         {
@@ -945,7 +944,7 @@ namespace sfx2
 
             // Only use one extension (#i32434#)
             // (and always the first if there are more than one)
-            sExtension = getToken(pFilter->GetWildcard().getGlob(), 0, ';');
+            sExtension = pFilter->GetWildcard().getGlob().getToken(0, ';');
             sUIName = addExtension( pFilter->GetUIName(), sExtension, false, _rFileDlgImpl );
             try
             {
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index cbbf0b7a5eac..08ac76eaaa92 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -104,7 +104,7 @@ SfxFilter::~SfxFilter()
 
 OUString SfxFilter::GetDefaultExtension() const
 {
-    return comphelper::string::getToken(GetWildcard().getGlob(), 0, ';');
+    return GetWildcard().getGlob().getToken(0, ';');
 }
 
 
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 04d0980e5c1a..ebd578c7dddc 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -130,9 +130,8 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot)
         if (m_xCfg.is())
         {
             using comphelper::string::getTokenCount;
-            using comphelper::string::getToken;
             sal_Int32 nTokenCount = getTokenCount(rConfigRoot, '/');
-            OUString sTok = getToken(rConfigRoot, nTokenCount - 1, '/');
+            OUString sTok = rConfigRoot.getToken(nTokenCount - 1, '/');
             m_xCfg->getByName(sTok) >>= m_xNode;
         }
     }
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 98c9277444ba..f94ec3041bd2 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -654,7 +654,7 @@ void AssignmentPersistentData::Commit()
             "AddressBookSourceDialog::AddressBookSourceDialog: inconsistence between logical and UI field names!");
         m_pImpl->aLogicalFieldNames.reserve(nAdjustedTokenCount);
         for (sal_Int32 i = 0; i<nAdjustedTokenCount; ++i)
-            m_pImpl->aLogicalFieldNames.push_back(comphelper::string::getToken(sLogicalFieldNames, i, ';'));
+            m_pImpl->aLogicalFieldNames.push_back(sLogicalFieldNames.getToken(i, ';'));
 
         PostUserEvent(LINK(this, AddressBookSourceDialog, OnDelayedInitialize));
             // so the dialog will at least show up before we do the loading of the
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 12ad0bbd765b..0a3f8a4161fe 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -409,7 +409,7 @@ namespace
                     OUString aListener = (*pCurrentListeners).getTypeName();
                     sal_Int32 nTokens = comphelper::string::getTokenCount(aListener, '.');
                     if (nTokens)
-                        aListener = comphelper::string::getToken(aListener, nTokens - 1, '.');
+                        aListener = aListener.getToken(nTokens - 1, '.');
 
                     if (aListener == pCurrent->ListenerType.getStr())
                         // the current ScriptEventDescriptor doesn't match the current listeners class
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 5992a0658ed8..0c239765724d 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -211,11 +211,11 @@ void Gallery::ImplLoad( const OUString& rMultiPath )
 
     if( bMultiPath )
     {
-        aRelURL = INetURLObject( comphelper::string::getToken(rMultiPath, 0, ';') );
+        aRelURL = INetURLObject( rMultiPath.getToken(0, ';') );
 
         for( sal_Int32 i = 0; i < nTokenCount; ++i )
         {
-            aCurURL = INetURLObject(comphelper::string::getToken(rMultiPath, i, ';'));
+            aCurURL = INetURLObject(rMultiPath.getToken(i, ';'));
 
             ImplLoadSubDirs( aCurURL, bIsReadOnlyDir );
 
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 378130caff4a..e00bef75d5fd 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -296,7 +296,7 @@ void SwImplProtocol::CheckLine( OString& rLine )
         return;
     if( '[' == rLine[0] )   // section: FrmIds, type or funciton
     {
-        OString aTmp = comphelper::string::getToken(rLine, 0, ']');
+        OString aTmp = rLine.getToken(0, ']');
         if (aTmp == "[frmid")      // section FrmIds
         {
             nInitFile = 1;
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index b5af54400312..697eeaa542f8 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -703,7 +703,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
             OUString sExtension = aURL.getExtension();
             if (sExtension.isEmpty())
             {
-                sExtension = comphelper::string::getToken(pSfxFlt->GetWildcard().getGlob(), 1, '.');
+                sExtension = pSfxFlt->GetWildcard().getGlob().getToken(1, '.');
                 sPath += "." + sExtension;
             }
             OUString sStat = OUString(SW_RES(STR_STATSTR_LETTER)) + " " + OUString::number( nDoc );
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index 4fbded72515c..94165b8f174e 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -84,8 +84,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 
-using ::comphelper::string::getToken;
-
 /*
  *  static helpers
  */
diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx
index 0c24c1b2f0ab..f0a431b150f4 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -45,7 +45,6 @@ static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, co
     if ( bAvailable )
     {
         using comphelper::string::getTokenCount;
-        using comphelper::string::getToken;
 
         sal_Int32 nTokenCount = getTokenCount(rTree, '/');
         sal_Int32 i = 0;
@@ -56,7 +55,7 @@ static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, co
             --nTokenCount;
 
         Any aAny;
-        aAny <<= getToken(rTree, i++, '/');
+        aAny <<= rTree.getToken(i++, '/');
 
         // creation arguments: nodepath
         PropertyValue aPathArgument;
@@ -88,7 +87,7 @@ static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, co
                     bAvailable = false;
                 else
                 {
-                    OUString aNode( getToken(rTree, i, '/') );
+                    OUString aNode( rTree.getToken(i, '/') );
                     if ( !xHierarchicalNameAccess->hasByHierarchicalName( aNode ) )
                         bAvailable = false;
                     else
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index b47e6745c44d..9ef46c8d423e 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -80,7 +80,6 @@
 using namespace ::com::sun::star;
 
 using comphelper::string::getTokenCount;
-using comphelper::string::getToken;
 
 typedef ::std::vector< GraphicFilter* > FilterList_impl;
 static FilterList_impl* pFilterHdlList = NULL;
@@ -1698,7 +1697,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
         sal_Int32 i, nTokenCount = getTokenCount(aFilterPath, ';');
         ImpFilterLibCache &rCache = Cache::get();
         for( i = 0; ( i < nTokenCount ) && ( pFilter == NULL ); i++ )
-            pFilter = rCache.GetFilter( getToken(aFilterPath, i, ';'), aFilterName );
+            pFilter = rCache.GetFilter( aFilterPath.getToken(i, ';'), aFilterName );
         if( !pFilter )
             nStatus = GRFILTER_FILTERERROR;
         else
@@ -2112,7 +2111,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
             for ( i = 0; i < nTokenCount; i++ )
             {
 #ifndef DISABLE_DYNLOADING
-                OUString aPhysicalName( ImpCreateFullFilterPath( getToken(aFilterPath, i, ';'), aFilterName ) );
+                OUString aPhysicalName( ImpCreateFullFilterPath( aFilterPath.getToken(i, ';'), aFilterName ) );
                 osl::Module aLibrary( aPhysicalName );
 
                 PFilterCall pFunc = (PFilterCall) aLibrary.getFunctionSymbol(OUString(EXPORT_FUNCTION_NAME));
diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx
index 95603d4dc6b9..58d8cb79d3dd 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -203,7 +203,7 @@ bool XBMReader::ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat
 
             for( sal_Int32 i = 0; ( i < nCount ) && ( nRow < nHeight ); ++i )
             {
-                const OString aToken(comphelper::string::getToken(aLine,i, ','));
+                const OString aToken(aLine.getToken(i, ','));
                 const sal_Int32 nLen = aToken.getLength();
                 bool bProcessed = false;
 
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index f4eb32eb8330..5dd8bfe7007c 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -230,15 +230,13 @@ void PrinterInfoManager::initialize()
             if (!aValue.isEmpty())
                 m_aGlobalDefaults.m_eOrientation = aValue.equalsIgnoreAsciiCase("Landscape") ? orientation::Landscape : orientation::Portrait;
 
-            using comphelper::string::getToken;
-
             aValue = aConfig.ReadKey( "MarginAdjust" );
             if (!aValue.isEmpty())
             {
-                m_aGlobalDefaults.m_nLeftMarginAdjust = getToken(aValue, 0, ',').toInt32();
-                m_aGlobalDefaults.m_nRightMarginAdjust  = getToken(aValue, 1, ',').toInt32();
-                m_aGlobalDefaults.m_nTopMarginAdjust = getToken(aValue, 2, ',').toInt32();
-                m_aGlobalDefaults.m_nBottomMarginAdjust = getToken(aValue, 3, ',').toInt32();
+                m_aGlobalDefaults.m_nLeftMarginAdjust = aValue.getToken(0, ',').toInt32();
+                m_aGlobalDefaults.m_nRightMarginAdjust  = aValue.getToken(1, ',').toInt32();
+                m_aGlobalDefaults.m_nTopMarginAdjust = aValue.getToken(2, ',').toInt32();
+                m_aGlobalDefaults.m_nBottomMarginAdjust = aValue.getToken(3, ',').toInt32();
             }
 
             aValue = aConfig.ReadKey( "ColorDepth", "24" );
@@ -415,15 +413,13 @@ void PrinterInfoManager::initialize()
                 if (!aValue.isEmpty())
                     aPrinter.m_aInfo.m_eOrientation = aValue.equalsIgnoreAsciiCase("Landscape") ? orientation::Landscape : orientation::Portrait;
 
-                using comphelper::string::getToken;
-
                 aValue = aConfig.ReadKey( "MarginAdjust" );
                 if (!aValue.isEmpty())
                 {
-                    aPrinter.m_aInfo.m_nLeftMarginAdjust = getToken(aValue, 0, ',' ).toInt32();
-                    aPrinter.m_aInfo.m_nRightMarginAdjust = getToken(aValue, 1, ',' ).toInt32();
-                    aPrinter.m_aInfo.m_nTopMarginAdjust = getToken(aValue, 2, ',' ).toInt32();
-                    aPrinter.m_aInfo.m_nBottomMarginAdjust = getToken(aValue, 3, ',' ).toInt32();
+                    aPrinter.m_aInfo.m_nLeftMarginAdjust = aValue.getToken(0, ',' ).toInt32();
+                    aPrinter.m_aInfo.m_nRightMarginAdjust = aValue.getToken(1, ',' ).toInt32();
+                    aPrinter.m_aInfo.m_nTopMarginAdjust = aValue.getToken(2, ',' ).toInt32();
+                    aPrinter.m_aInfo.m_nBottomMarginAdjust = aValue.getToken(3, ',' ).toInt32();
                 }
 
                 aValue = aConfig.ReadKey( "ColorDepth" );
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index e2af3e5fb751..a9c42cf90576 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -726,7 +726,7 @@ bool lcl_matchFilter( const rtl::OUString& rFilter, const rtl::OUString& rExt )
 
     for ( int n = 0; n != nCount; ++n )
     {
-        const rtl::OUString aToken = comphelper::string::getToken( rFilter, n, ';' );
+        const rtl::OUString aToken = rFilter.getToken( n, ';' );
         if ( aToken == rExt )
             return true;
     }