diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-05-17 00:15:01 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-17 14:03:25 +0100 |
commit | acd9cda35457f0a839bf9713c261022c39cd8269 (patch) | |
tree | 4e0a5c5470a284545102d783d3257d31efef0baf | |
parent | 0e9c60d5964e27d0ff5b48edcb23b340e9a0233b (diff) |
XubString->rtl::OUString
Change-Id: Ic7426d9838bb1034618c3d553482256d1866878f
-rw-r--r-- | starmath/inc/cursor.hxx | 4 | ||||
-rw-r--r-- | starmath/source/cursor.cxx | 6 | ||||
-rw-r--r-- | starmath/source/view.cxx | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx index dcfea886736d..3c274cb7b7d2 100644 --- a/starmath/inc/cursor.hxx +++ b/starmath/inc/cursor.hxx @@ -139,7 +139,7 @@ public: void DeletePrev(OutputDevice* pDev); /** Insert text at the current position */ - void InsertText(XubString aString); + void InsertText(rtl::OUString aString); /** Insert an element into the formula */ void InsertElement(SmFormulaElement element); @@ -166,7 +166,7 @@ public: * For more complex expressions use InsertCommandText, this method doesn't * use SmParser, this means that it's faster, but not as strong. */ - void InsertSpecial(XubString aString); + void InsertSpecial(rtl::OUString aString); /** Create sub-/super script * diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index 684521fef6a6..ed81f1e47538 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -981,7 +981,8 @@ void SmCursor::InsertFraction() { FinishEdit(pLineList, pLineParent, nParentIndex, SmCaretPos(pSelectedNode, 1)); } -void SmCursor::InsertText(XubString aString){ +void SmCursor::InsertText(rtl::OUString aString) +{ BeginEdit(); Delete(); @@ -1109,7 +1110,8 @@ void SmCursor::InsertElement(SmFormulaElement element){ EndEdit(); } -void SmCursor::InsertSpecial(XubString aString) { +void SmCursor::InsertSpecial(rtl::OUString aString) +{ BeginEdit(); Delete(); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 8b2d602bacf7..e4625d8dd4d1 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -536,7 +536,7 @@ void SmGraphicWindow::KeyInput(const KeyEvent& rKEvt) rCursor.MoveAfterBracket(pBraceNode); }else{ if(code != 0){ - rCursor.InsertText(code); + rCursor.InsertText(rtl::OUString(code)); }else if (! (GetView() && GetView()->KeyInput(rKEvt)) ) ScrollableWindow::KeyInput(rKEvt); } |