4 files changed, 5 insertions, 5 deletions
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 3c274cb7b7d2..b7a0d9c618e9 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -155,7 +155,7 @@ public:
      * This will work for stuff like "A intersection B". But stuff spaning multiple lines
      * or dependent on the context which position is placed in will not work!
      */
-    void InsertCommandText(String aCommandText);
+    void InsertCommandText(OUString aCommandText);
 
     /** Insert a special node created from aString
      *
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index e4f1c6a9a10c..e3a8d23c5154 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -263,7 +263,7 @@ public:
     /** Parse rBuffer to formula tree */
     SmNode      *Parse(const String &rBuffer);
     /** Parse rBuffer to formula subtree that constitutes an expression */
-    SmNode      *ParseExpression(const String &rBuffer);
+    SmNode      *ParseExpression(const OUString &rBuffer);
 
     const String & GetText() const { return m_aBufferString; };
 
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index 9edb83ea1e2f..489c339f4d49 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -1156,12 +1156,12 @@ void SmCursor::InsertCommand(sal_uInt16 nCommand) {
                 InsertLimit(CSUP, true);
             break;
         default:
-            InsertCommandText(SmResId(nCommand));
+            InsertCommandText(SM_RESSTR(nCommand));
             break;
     }
 }
 
-void SmCursor::InsertCommandText(XubString aCommandText) {
+void SmCursor::InsertCommandText(OUString aCommandText) {
     //Parse the the sub expression
     SmNode* pSubExpr = SmParser().ParseExpression(aCommandText);
 
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 827ff16251d5..51a60c2afbf8 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2452,7 +2452,7 @@ SmNode *SmParser::Parse(const String &rBuffer)
     return result;
 }
 
-SmNode *SmParser::ParseExpression(const String &rBuffer)
+SmNode *SmParser::ParseExpression(const OUString &rBuffer)
 {
     m_aBufferString = convertLineEnd(rBuffer, LINEEND_LF);
     m_nBufferIndex  = 0;