add a comphelper::string::getTokenCount

suitable for conversion from [Byte]String::GetTokenCount
converted low-hanging variants to rtl::O[UString]::getToken loops
added unit test

8 files changed, 42 insertions, 35 deletions

diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index a17214b471ee..e54d0db86b81 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -40,6 +40,7 @@
 #include "core_resource.hxx"
 #include "core_resource.hrc"
 #include <comphelper/documentconstants.hxx>
+#include <comphelper/string.hxx>
 
 //.........................................................................
 namespace dbaccess
@@ -55,7 +56,7 @@ namespace dbaccess
     {
         void lcl_extractHostAndPort(const String& _sUrl,String& _sHostname,sal_Int32& _nPortNumber)
         {
-            if ( _sUrl.GetTokenCount(':') >= 2 )
+            if ( comphelper::string::getTokenCount(_sUrl, ':') >= 2 )
             {
                 _sHostname      = _sUrl.GetToken(0,':');
                 _nPortNumber    = _sUrl.GetToken(1,':').ToInt32();
@@ -229,14 +230,14 @@ void ODsnTypeCollection::extractHostNamePort(const ::rtl::OUString& _rDsn,String
     if ( _rDsn.matchIgnoreAsciiCaseAsciiL("jdbc:oracle:thin:",sizeof("jdbc:oracle:thin:")-1) )
     {
         lcl_extractHostAndPort(sUrl,_rsHostname,_nPortNumber);
-        if ( !_rsHostname.Len() && sUrl.GetTokenCount(':') == 2 )
+        if ( !_rsHostname.Len() && comphelper::string::getTokenCount(sUrl, ':') == 2 )
         {
             _nPortNumber = -1;
             _rsHostname = sUrl.GetToken(0,':');
         }
         if ( _rsHostname.Len() )
-            _rsHostname = _rsHostname.GetToken(_rsHostname.GetTokenCount('@') - 1,'@');
-        _sDatabaseName = sUrl.GetToken(sUrl.GetTokenCount(':') - 1,':');
+            _rsHostname = _rsHostname.GetToken(comphelper::string::getTokenCount(_rsHostname, '@') - 1, '@');
+        _sDatabaseName = sUrl.GetToken(comphelper::string::getTokenCount(sUrl, ':') - 1, ':');
     }
     else if ( _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:address:ldap:",sizeof("sdbc:address:ldap:")-1) )
     {
@@ -244,17 +245,17 @@ void ODsnTypeCollection::extractHostNamePort(const ::rtl::OUString& _rDsn,String
     }
     else if ( _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:adabas:",sizeof("sdbc:adabas:")-1) )
     {
-        if ( sUrl.GetTokenCount(':') == 2 )
+        if ( comphelper::string::getTokenCount(sUrl, ':') == 2 )
             _rsHostname = sUrl.GetToken(0,':');
-        _sDatabaseName = sUrl.GetToken(sUrl.GetTokenCount(':') - 1,':');
+        _sDatabaseName = sUrl.GetToken(comphelper::string::getTokenCount(sUrl, ':') - 1, ':');
     }
     else if ( _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:mysql:mysqlc:",sizeof("sdbc:mysql:mysqlc:")-1) || _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:mysql:jdbc:",sizeof("sdbc:mysql:jdbc:")-1) )
     {
         lcl_extractHostAndPort(sUrl,_rsHostname,_nPortNumber);
 
-        if ( _nPortNumber == -1 && !_rsHostname.Len() && sUrl.GetTokenCount('/') == 2 )
+        if ( _nPortNumber == -1 && !_rsHostname.Len() && comphelper::string::getTokenCount(sUrl, '/') == 2 )
             _rsHostname = sUrl.GetToken(0,'/');
-        _sDatabaseName = sUrl.GetToken(sUrl.GetTokenCount('/') - 1,'/');
+        _sDatabaseName = sUrl.GetToken(comphelper::string::getTokenCount(sUrl, '/') - 1, '/');
     }
     else if ( _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=",sizeof("sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=")-1)
          || _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=",sizeof("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=")-1))
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
index 4c31eff2989e..897f88978414 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
@@ -45,6 +45,7 @@
 #include <toolkit/unohlp.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <comphelper/extract.hxx>
+#include <comphelper/string.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <com/sun/star/sdbc/SQLException.hpp>
@@ -652,7 +653,7 @@ IMPL_LINK( OAdabasNewDbDlg, PwdClickHdl, Button *, pButton )
     {
         String sPwd = aDlg.GetPassword().ToUpperAscii();
         // no space in password allowed
-        if ( sPwd.GetTokenCount(' ') == 1 )
+        if ( comphelper::string::getTokenCount(sPwd, ' ') == 1 )
         {
             if(pButton == &m_PB_CONPWD)
             {
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index a38c26eeeaf9..238418e5c871 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -60,10 +60,11 @@
 #include <com/sun/star/ucb/AuthenticationRequest.hpp>
 /** === end UNO includes === **/
 
+#include <comphelper/guarding.hxx>
 #include <comphelper/interaction.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/sequence.hxx>
-#include <comphelper/guarding.hxx>
+#include <comphelper/string.hxx>
 #include <connectivity/DriversConfig.hxx>
 #include <connectivity/dbexception.hxx>
 #include <osl/file.hxx>
@@ -525,7 +526,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
                 SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True);
                 sNewUrl = lcl_createHostWithPort(pHostName,NULL);
                 String sUrl = pCollection->cutPrefix(pUrlItem->GetValue());
-                if ( sUrl.GetTokenCount(':') == 1 )
+                if ( comphelper::string::getTokenCount(sUrl, ':') == 1 )
                     sNewUrl += String::CreateFromAscii(":");
 
                 sNewUrl += sUrl;
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 91c3a364f8ca..d8ce26f8d3ef 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -50,6 +50,7 @@
 #include <connectivity/CommonTools.hxx>
 #include "DriverSettings.hxx"
 #include "dbadmin.hxx"
+#include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
 
 #include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
@@ -110,13 +111,13 @@ DBG_NAME(OTextConnectionHelper)
     {
         DBG_CTOR(OTextConnectionHelper,NULL);
 
-        xub_StrLen nCnt = m_aFieldSeparatorList.GetTokenCount( '\t' );
+        xub_StrLen nCnt = comphelper::string::getTokenCount(m_aFieldSeparatorList, '\t');
         xub_StrLen i;
 
         for( i = 0 ; i < nCnt ; i += 2 )
             m_aFieldSeparator.InsertEntry( m_aFieldSeparatorList.GetToken( i, '\t' ) );
 
-        nCnt = m_aTextSeparatorList.GetTokenCount( '\t' );
+        nCnt = comphelper::string::getTokenCount(m_aTextSeparatorList, '\t');
         for( i=0 ; i<nCnt ; i+=2 )
             m_aTextSeparator.InsertEntry( m_aTextSeparatorList.GetToken( i, '\t' ) );
         m_aTextSeparator.InsertEntry(m_aTextNone);
@@ -512,7 +513,7 @@ DBG_NAME(OTextConnectionHelper)
     void OTextConnectionHelper::SetSeparator( ComboBox& rBox, const String& rList, const String& rVal )
     {
         char    nTok = '\t';
-        xub_StrLen  nCnt(rList.GetTokenCount( nTok ));
+        xub_StrLen  nCnt(comphelper::string::getTokenCount(rList, nTok));
         xub_StrLen  i;
 
         for( i=0 ; i<nCnt ; i+=2 )
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 40f3624cb88a..6b0a1bb7dda2 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <comphelper/string.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include "moduledbu.hxx"
@@ -225,7 +226,7 @@ DlgFilterCrit::~DlgFilterCrit()
 sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const String& _rSelectedPredicate ) const
 {
     sal_Int32 nPredicateIndex = -1;
-    for ( xub_StrLen i=0; i<aSTR_COMPARE_OPERATORS.GetTokenCount(); ++i)
+    for ( xub_StrLen i=0; i < comphelper::string::getTokenCount(aSTR_COMPARE_OPERATORS, ';'); ++i)
         if ( aSTR_COMPARE_OPERATORS.GetToken(i) == _rSelectedPredicate )
         {
             nPredicateIndex = i;
@@ -733,7 +734,7 @@ IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox *, pListBox )
 
         if(eColumnSearch  == ColumnSearch::FULL)
         {
-            for(xub_StrLen i=0;i<aSTR_COMPARE_OPERATORS.GetTokenCount();i++)
+            for(xub_StrLen i=0;i < comphelper::string::getTokenCount(aSTR_COMPARE_OPERATORS, ';');i++)
                 pComp->InsertEntry(aSTR_COMPARE_OPERATORS.GetToken(i));
         }
         else if(eColumnSearch == ColumnSearch::CHAR)
@@ -746,7 +747,7 @@ IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox *, pListBox )
             xub_StrLen i;
             for( i = 0; i < 6; i++ )
                 pComp->InsertEntry(aSTR_COMPARE_OPERATORS.GetToken(i));
-            for(i=8;i<aSTR_COMPARE_OPERATORS.GetTokenCount();i++)
+            for(i=8; i < comphelper::string::getTokenCount(aSTR_COMPARE_OPERATORS, ';'); ++i)
                 pComp->InsertEntry(aSTR_COMPARE_OPERATORS.GetToken(i));
         }
         else
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index ef1ec82a91c0..c43da50d568d 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -119,7 +119,7 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor&
     osl_incrementInterlockedCount( &m_refCount );
     impl_initFromDescriptor( _aDataDescriptor, false );
 
-    xub_StrLen nCount = rExchange.GetTokenCount(char(11));
+    xub_StrLen nCount = comphelper::string::getTokenCount(rExchange, char(11));
     if( nCount > SBA_FORMAT_SELECTION_COUNT && rExchange.GetToken(4).Len())
     {
         m_pRowMarker = new sal_Int32[nCount-SBA_FORMAT_SELECTION_COUNT];
@@ -421,7 +421,7 @@ sal_Bool ORTFImportExport::Write()
     ByteString aFontNr;
 
     (*m_pStream)    << "{\\fonttbl";
-    xub_StrLen nTokenCount = aFonts.GetTokenCount();
+    xub_StrLen nTokenCount = comphelper::string::getTokenCount(aFonts, ';');
     for(sal_uInt32 j=0;j<nTokenCount;++j)
     {
         (*m_pStream) << "\\f";
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index d253d134be69..16c87e4657c5 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -43,6 +43,8 @@
 #include "SelectionBrowseBox.hxx"
 #include "dbu_qry.hrc"
 #include <unotools/configmgr.hxx>
+#include <comphelper/extract.hxx>
+#include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
@@ -56,7 +58,6 @@
 #include "ConnectionLineData.hxx"
 #include "QTableConnectionData.hxx"
 #include "dbustrings.hrc"
-#include <comphelper/extract.hxx>
 #include "UITools.hxx"
 #include "querycontainerwindow.hxx"
 #include "QueryTableView.hxx"
@@ -966,7 +967,7 @@ namespace
             {
                 const sal_Int32 nMaxOrder = xMetaData->getMaxColumnsInOrderBy();
                 String sToken(aWorkStr);
-                if ( nMaxOrder && nMaxOrder < sToken.GetTokenCount(',') )
+                if ( nMaxOrder && nMaxOrder < comphelper::string::getTokenCount(sToken, ',') )
                     eErrorCode = eStatementTooLong;
                 else
                 {
@@ -3056,7 +3057,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
         if ( !sFunction.Len() )
             sFunction = pEntry->GetField();
 
-        if(sFunction.GetTokenCount('(') > 1)
+        if (comphelper::string::getTokenCount(sFunction, '(') > 1)
             sFunction = sFunction.GetToken(0,'('); // this should be the name of the function
 
         sal_Int32 nType = ::connectivity::OSQLParser::getFunctionReturnType(sFunction,&rParser.getContext());
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 8aefc3d402f8..f3140b08f1be 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -33,6 +33,9 @@
 #include "querycontroller.hxx"
 #include "QueryTableView.hxx"
 #include "browserids.hxx"
+#include <comphelper/extract.hxx>
+#include <comphelper/stl_types.hxx>
+#include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
 #include "TableFieldInfo.hxx"
 #include "dbu_qry.hrc"
@@ -44,8 +47,6 @@
 #include <vcl/msgbox.hxx>
 #include "QueryDesignFieldUndoAct.hxx"
 #include <svx/dbexch.hrc>
-#include <comphelper/stl_types.hxx>
-#include <comphelper/extract.hxx>
 #include "sqlmessage.hxx"
 #include "UITools.hxx"
 #include <osl/diagnose.h>
@@ -78,7 +79,7 @@ namespace
         if ( !bAsterix )
         {
             String sName = _sFieldName;
-            xub_StrLen nTokenCount = sName.GetTokenCount('.');
+            xub_StrLen nTokenCount = comphelper::string::getTokenCount(sName, '.');
             if (    (nTokenCount == 2 && sName.GetToken(1,'.').GetChar(0) == '*' )
                 ||  (nTokenCount == 3 && sName.GetToken(2,'.').GetChar(0) == '*' ) )
             {
@@ -150,7 +151,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
     SetTitleFont(aTitleFont);
 
     String aTxt(ModuleRes(STR_QUERY_SORTTEXT));
-    xub_StrLen nCount = aTxt.GetTokenCount();
+    xub_StrLen nCount = comphelper::string::getTokenCount(aTxt, ';');
     xub_StrLen nIdx = 0;
     for (; nIdx < nCount; nIdx++)
         m_pOrderCell->InsertEntry(aTxt.GetToken(nIdx));
@@ -198,7 +199,7 @@ void OSelectionBrowseBox::initialize()
             ,IParseContext::KEY_INTERSECTION
         };
 
-        String sGroup = m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount() - 1);
+        String sGroup = m_aFunctionStrings.GetToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';') - 1);
         m_aFunctionStrings = m_aFunctionStrings.GetToken(0);
 
         for (size_t i = 0; i < SAL_N_ELEMENTS(eFunctions); ++i)
@@ -213,7 +214,7 @@ void OSelectionBrowseBox::initialize()
         // Diese Funktionen stehen nur unter CORE zur Verf�gung
         if ( lcl_SupportsCoreSQLGrammar(xConnection) )
         {
-            xub_StrLen nCount   = m_aFunctionStrings.GetTokenCount();
+            xub_StrLen nCount = comphelper::string::getTokenCount(m_aFunctionStrings, ';');
             for (xub_StrLen nIdx = 0; nIdx < nCount; nIdx++)
                 m_pFunctionCell->InsertEntry(m_aFunctionStrings.GetToken(nIdx));
         }
@@ -829,7 +830,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes
                     aSelEntry->SetField(sParameters);
                     if ( aSelEntry->IsGroupBy() )
                     {
-                        sOldLocalizedFunctionName = m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount()-1);
+                        sOldLocalizedFunctionName = m_aFunctionStrings.GetToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1);
                         aSelEntry->SetGroupBy(sal_False);
                     }
 
@@ -957,7 +958,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
 
                         sal_uInt16 nPos = m_pFieldCell->GetEntryPos(aFieldName);
                         String aAliasName = pEntry->GetAlias();
-                        if ( nPos != COMBOBOX_ENTRY_NOTFOUND && !aAliasName.Len() && aFieldName.GetTokenCount('.') > 1 )
+                        if ( nPos != COMBOBOX_ENTRY_NOTFOUND && !aAliasName.Len() && comphelper::string::getTokenCount(aFieldName, '.') > 1 )
                         { // special case, we have a table field so we must cut the table name
                             String sTableAlias = aFieldName.GetToken(0,'.');
                             pEntry->SetAlias(sTableAlias);
@@ -1051,7 +1052,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
                     sal_uInt16 nPos = m_pFunctionCell->GetSelectEntryPos();
                     // Diese Funktionen stehen nur unter CORE zur Verf�gung
                     String sFunctionName        = m_pFunctionCell->GetEntry(nPos);
-                    String sGroupFunctionName   = m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount()-1);
+                    String sGroupFunctionName   = m_aFunctionStrings.GetToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1);
                     sal_Bool bGroupBy = sal_False;
                     if ( sGroupFunctionName.Equals(sFunctionName) ) // check if the function name is GROUP
                     {
@@ -2229,7 +2230,7 @@ String OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
         case BROW_FUNCTION_ROW:
             // we always show the group function at first
             if ( pEntry->IsGroupBy() )
-                aText = m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount()-1);
+                aText = m_aFunctionStrings.GetToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1);
             else if ( pEntry->isNumericOrAggreateFunction() )
                 aText = pEntry->GetFunction();
             break;
@@ -2293,7 +2294,7 @@ sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId,Strin
             break;
         default:
             {
-                xub_StrLen nCount = m_aFunctionStrings.GetTokenCount();
+                xub_StrLen nCount = comphelper::string::getTokenCount(m_aFunctionStrings, ';');
                 xub_StrLen i;
                 for ( i = 0; i < nCount-1; i++) // Gruppierung wird nicht mit gez"ahlt
                 {
@@ -2372,7 +2373,7 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, sal_uInt16 nColId, con
         case BROW_FUNCTION_ROW:
         {
             String sOldFunctionName   = pEntry->GetFunction();
-            String sGroupFunctionName = m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount()-1);
+            String sGroupFunctionName = m_aFunctionStrings.GetToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1);
             pEntry->SetFunction(strNewText);
             // first reset this two member
             sal_Int32 nFunctionType = pEntry->GetFunctionType();
@@ -2745,7 +2746,7 @@ void OSelectionBrowseBox::setFunctionCell(OTableFieldDescRef& _pEntry)
                 m_pFunctionCell->InsertEntry(m_aFunctionStrings.GetToken(2)); // 2 -> COUNT
             else
             {
-                xub_StrLen nCount = m_aFunctionStrings.GetTokenCount();
+                xub_StrLen nCount = comphelper::string::getTokenCount(m_aFunctionStrings, ';');
                 if ( _pEntry->isNumeric() )
                     --nCount;
                 for (xub_StrLen nIdx = 1; nIdx < nCount; nIdx++)