diff options
author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-10-01 20:46:34 +0400 |
---|---|---|
committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-10-01 20:59:50 +0400 |
commit | fa614231733800f4a961b77e36c86f8840d12251 (patch) | |
tree | bdf3877711bb11bd9326e67b0f1640f93cea2ba0 /starmath/inc | |
parent | e4080dce647edfcec832164fcfb56cb36e220e27 (diff) |
String -> OUString
Change-Id: Ie5e800df0c7663e6bb62a2019cf2fd8b0c1ae772
Diffstat (limited to 'starmath/inc')
-rw-r--r-- | starmath/inc/caret.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/node.hxx | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx index b97e00305e36..c38685d1a326 100644 --- a/starmath/inc/caret.hxx +++ b/starmath/inc/caret.hxx @@ -64,7 +64,7 @@ struct SmCaretPos{ */ static SmCaretPos GetPosAfter(SmNode* pNode) { if(pNode && pNode->GetType() == NTEXT) - return SmCaretPos(pNode, ((SmTextNode*)pNode)->GetText().Len()); + return SmCaretPos(pNode, ((SmTextNode*)pNode)->GetText().getLength()); return SmCaretPos(pNode, 1); } }; diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index 78167251c563..45c96696d433 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -443,16 +443,16 @@ public: */ class SmTextNode : public SmVisibleNode { - XubString aText; + OUString aText; sal_uInt16 nFontDesc; /** Index within text where the selection starts * @remarks Only valid if SmNode::IsSelected() is true */ - xub_StrLen nSelectionStart; + sal_Int32 nSelectionStart; /** Index within text where the selection ends * @remarks Only valid if SmNode::IsSelected() is true */ - xub_StrLen nSelectionEnd; + sal_Int32 nSelectionEnd; protected: SmTextNode(SmNodeType eNodeType, const SmToken &rNodeToken, sal_uInt16 nFontDescP ); @@ -461,10 +461,10 @@ public: SmTextNode(const SmToken &rNodeToken, sal_uInt16 nFontDescP ); sal_uInt16 GetFontDesc() const { return nFontDesc; } - void SetText(const XubString &rText) { aText = rText; } - const XubString & GetText() const { return aText; } + void SetText(const OUString &rText) { aText = rText; } + const OUString & GetText() const { return aText; } /** Change the text of this node, including the underlying token */ - void ChangeText(const XubString &rText) { + void ChangeText(const OUString &rText) { aText = rText; SmToken token = GetToken(); token.aText = rText; @@ -476,15 +476,15 @@ public: /** Index within GetText() where the selection starts * @remarks Only valid of SmNode::IsSelected() is true */ - xub_StrLen GetSelectionStart() const {return nSelectionStart;} + sal_Int32 GetSelectionStart() const {return nSelectionStart;} /** Index within GetText() where the selection end * @remarks Only valid of SmNode::IsSelected() is true */ - xub_StrLen GetSelectionEnd() const {return nSelectionEnd;} + sal_Int32 GetSelectionEnd() const {return nSelectionEnd;} /** Set the index within GetText() where the selection starts */ - void SetSelectionStart(xub_StrLen index) {nSelectionStart = index;} + void SetSelectionStart(sal_Int32 index) {nSelectionStart = index;} /** Set the index within GetText() where the selection end */ - void SetSelectionEnd(xub_StrLen index) {nSelectionEnd = index;} + void SetSelectionEnd(sal_Int32 index) {nSelectionEnd = index;} virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell); virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat); |