Kaydet (Commit) d824ddbd authored tarafından Matteo Casalin's avatar Matteo Casalin

Avoid getTokenCount

Change-Id: Ib5fb26de4d51a348ed44987bac0131d18eaed921
Reviewed-on: https://gerrit.libreoffice.org/65675
Tested-by: Jenkins
Reviewed-by: 's avatarMatteo Casalin <matteo.casalin@yahoo.com>
üst b39ee3f4
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#include <comphelper/documentinfo.hxx> #include <comphelper/documentinfo.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <comphelper/sequenceashashmap.hxx> #include <comphelper/sequenceashashmap.hxx>
#include <comphelper/string.hxx>
#include <svtools/imagemgr.hxx> #include <svtools/imagemgr.hxx>
#include <vcl/treelistentry.hxx> #include <vcl/treelistentry.hxx>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
...@@ -1138,14 +1137,20 @@ void SfxConfigGroupListBox::SelectMacro( const OUString& rBasic, ...@@ -1138,14 +1137,20 @@ void SfxConfigGroupListBox::SelectMacro( const OUString& rBasic,
const OUString& rMacro ) const OUString& rMacro )
{ {
const OUString aBasicName(rBasic + " " + xImp->m_sMacros); const OUString aBasicName(rBasic + " " + xImp->m_sMacros);
const sal_Int32 nCount = comphelper::string::getTokenCount(rMacro, '.'); sal_Int32 nIdx {rMacro.lastIndexOf('.')};
const OUString aMethod( rMacro.copy(rMacro.lastIndexOf('.')+1) ); const OUString aMethod( rMacro.copy(nIdx+1) );
OUString aLib; OUString aLib;
OUString aModule; OUString aModule;
if ( nCount > 2 ) if ( nIdx>0 )
{ {
aLib = rMacro.getToken( 0, '.' ); // string contains at least 2 tokens
aModule = rMacro.getToken( nCount-2, '.' ); nIdx = rMacro.lastIndexOf('.', nIdx);
if (nIdx>=0)
{
// string contains at least 3 tokens
aLib = rMacro.getToken( 0, '.' );
aModule = rMacro.getToken( 0, '.', ++nIdx );
}
} }
SvTreeListEntry *pEntry = FirstChild(nullptr); SvTreeListEntry *pEntry = FirstChild(nullptr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment