Kaydet (Commit) 77366748 authored tarafından Ivan Timofeev's avatar Ivan Timofeev

String -> OUString

Change-Id: I94eafe01604b30d53d9021458a0a9c57dfc1144a
üst 37a2fa5d
......@@ -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
*
......
......@@ -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; };
......
......@@ -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);
......
......@@ -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;
......
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