diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-17 00:14:26 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-18 20:16:06 +0100 |
| commit | 8d25fde680beb9dafb7c9c861b5c00d1ae4f4985 (patch) | |
| tree | 9770332777df28c8cb6bc12793cf825366adec1e /sw/inc | |
| parent | 08dc5de900b2e5cca9d9443fc5d4ea7756842af9 (diff) | |
sw; convert SwTxtNode::m_Text to OUString
Do not convert any of the 16bit index variables at this time: the
enforced limit of TXTNODE_MAX should ensure that they are sufficient,
and there are thousands of these variables all around sw.
(also, STRING_LEN/STRING_NOTFOUND is used as a "not found" value all
over the place)
Change-Id: Id26a145701de731470b0bcb95359ed62d4d6d579
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/ndtxt.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index fb467170c257..854dbdc00e43 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -91,7 +91,7 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable mutable SwNodeNum* mpNodeNum; ///< Numbering for this paragraph. - XubString m_Text; + OUString m_Text; SwParaIdleData_Impl* m_pParaIdleData_Impl; @@ -218,7 +218,7 @@ protected: public: using SwCntntNode::GetAttr; - const String& GetTxt() const { return m_Text; } + const String& GetTxt() const { return (String&)m_Text; } //FIXME /// getters for SwpHints inline SwpHints &GetSwpHints(); |