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;