summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-09-13 19:21:46 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2018-09-19 10:18:32 +0200
commit29c8641fb20c27a3a9aafb94654b4a9afaaa578b (patch)
tree799a9022ae903decf9413da43b1e614f49d90c05
parent292fe0cdea073eb23b4ddb52df37dd8b2ae309bc (diff)
sw_redlinehide_2: rename SwCursorShell::GetText()
It's really not obvious *what* you can get here. Change-Id: I1f14b851a127847206f8eb5fd2da778d0acece9b
-rw-r--r--sw/inc/crsrsh.hxx2
-rw-r--r--sw/source/core/crsr/crsrsh.cxx2
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 8b736656dec9..ca221d5b6b35 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -568,7 +568,7 @@ public:
OUString GetSelText() const;
// return only the text starting from the current cursor position (to the
// end of the node)
- OUString GetText() const;
+ OUString GetTextUntilEndOfNode() const;
// Check of SPoint or Mark of current cursor are placed within a table.
inline const SwTableNode* IsCursorInTable() const;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 1c26480bd000..32aab859b611 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2351,7 +2351,7 @@ OUString SwCursorShell::GetSelText() const
}
/// get text only from current cursor position (until end of node)
-OUString SwCursorShell::GetText() const
+OUString SwCursorShell::GetTextUntilEndOfNode() const
{
OUString aText;
if( m_pCurrentCursor->GetPoint()->nNode.GetIndex() ==
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index a67325a730ec..9d5007bbb288 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -453,7 +453,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
//we may end up inside of a paragraph if the left margin is not at DEFAULT_LEFT_DISTANCE
rShell.MovePara(GoCurrPara, fnParaStart);
}
- bool bSplitNode = !rShell.GetText().isEmpty();
+ bool bSplitNode = !rShell.GetTextUntilEndOfNode().isEmpty();
sal_Int32 nMoves = rConfigItem.GetGreetingMoves();
if( !bExample && 0 != nMoves )
{