Avoid getTokenCount

Change-Id: If4dcd0a3f316bd9812ffb12b8e64489d25ce89ca

Avoid getTokenCount
Change-Id: If4dcd0a3f316bd9812ffb12b8e64489d25ce89ca
4ede22cf · Matteo Casalin · a8f78db2 · 4ede22cf
Kaydet (Commit) 4ede22cf authored Kas 09, 2018 tarafından Matteo Casalin
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

SelectionBrowseBox.cxx dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +8 -5

No files found.
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2607,11 +2607,14 @@ void OSelectionBrowseBox::setFunctionCell(OTableFieldDescRef const & _pEntry)
                m_pFunctionCell->InsertEntry(m_aFunctionStrings.getToken(1, ';', nIdx)); // 2nd token: COUNT
            else
            {
-                sal_Int32 nCount = comphelper::string::getTokenCount(m_aFunctionStrings, ';');
+                const bool bSkipLastToken {_pEntry->isNumeric()};
-                if ( _pEntry->isNumeric() )
+                while (nIdx>0)
-                    --nCount;
+                {
-                for( sal_Int32 nTok = 1; nTok < nCount; ++nTok )
+                    const OUString sTok {m_aFunctionStrings.getToken(0, ';', nIdx)};
-                    m_pFunctionCell->InsertEntry(m_aFunctionStrings.getToken(0, ';', nIdx));
+                    if (bSkipLastToken && nIdx<0)
+                        break;
+                    m_pFunctionCell->InsertEntry(sTok);
+                }
            }
            if ( _pEntry->IsGroupBy() )