diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2019-02-28 18:09:40 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2019-03-14 22:41:30 +0100 |
| commit | b85b58feea3608f9a7c1456320eb13db6f16d942 (patch) | |
| tree | ec450199ec32f8e19b09d8160bc4d1688235d410 /framework | |
| parent | 87670fa998a26ab059e40bbe8f5e0acf0ad6ea04 (diff) | |
Use indexed getToken()
Change-Id: Ie6a69f8d7630fefd18404c7a93e2d38bd06e3d16
Reviewed-on: https://gerrit.libreoffice.org/69238
Tested-by: Jenkins
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/popuptoolbarcontroller.cxx | 5 | ||||
| -rw-r--r-- | framework/source/uielement/subtoolbarcontroller.cxx | 5 | ||||
| -rw-r--r-- | framework/source/uielement/thesaurusmenucontroller.cxx | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 64117b00e18d..94d056daf60d 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -289,10 +289,11 @@ GenericPopupToolbarController::GenericPopupToolbarController( { if ( ( arg >>= aPropValue ) && aPropValue.Name == "Value" ) { + sal_Int32 nIdx{ 0 }; OUString aValue; aPropValue.Value >>= aValue; - m_aPopupCommand = aValue.getToken(0, ';'); - m_bReplaceWithLast = aValue.getToken(1, ';').toBoolean(); + m_aPopupCommand = aValue.getToken(0, ';', nIdx); + m_bReplaceWithLast = aValue.getToken(0, ';', nIdx).toBoolean(); break; } } diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx index f83b9cf72cce..610b2685897b 100644 --- a/framework/source/uielement/subtoolbarcontroller.cxx +++ b/framework/source/uielement/subtoolbarcontroller.cxx @@ -96,10 +96,11 @@ SubToolBarController::SubToolBarController( const css::uno::Sequence< css::uno:: rxArgs[i] >>= aPropValue; if ( aPropValue.Name == "Value" ) { + sal_Int32 nIdx{ 0 }; OUString aValue; aPropValue.Value >>= aValue; - m_aSubTbName = aValue.getToken(0, ';'); - m_aLastCommand = aValue.getToken(1, ';'); + m_aSubTbName = aValue.getToken(0, ';', nIdx); + m_aLastCommand = aValue.getToken(0, ';', nIdx); break; } } diff --git a/framework/source/uielement/thesaurusmenucontroller.cxx b/framework/source/uielement/thesaurusmenucontroller.cxx index 4cc9523a914e..b1c1a873198f 100644 --- a/framework/source/uielement/thesaurusmenucontroller.cxx +++ b/framework/source/uielement/thesaurusmenucontroller.cxx @@ -67,8 +67,9 @@ void ThesaurusMenuController::statusChanged( const css::frame::FeatureStateEvent void ThesaurusMenuController::fillPopupMenu() { - OUString aText = m_aLastWord.getToken(0, '#'); - OUString aIsoLang = m_aLastWord.getToken(1, '#'); + sal_Int32 nIdx{ 0 }; + OUString aText = m_aLastWord.getToken(0, '#', nIdx); + OUString aIsoLang = m_aLastWord.getToken(0, '#', nIdx); if ( aText.isEmpty() || aIsoLang.isEmpty() ) return; |