summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-04-23 15:31:38 +0200
committerMichael Stahl <mstahl@redhat.com>2013-04-23 15:54:45 +0200
commitccb77a732c0d6017062b59ab32c6978d6d8713c5 (patch)
tree4cc0fa07fafde0ffaa5ca1961b44dd4849e50993
parentd92932744fdbaa78cec8dd8b991d5f442f6eef4b (diff)
fdo#49076: copy numbering to clipboard only if start of para selected
SwTxtNode::CopyText: If the selection does not include the start of the paragraph, copy an empty string to the clipboard, which suppresses numbering output in ASCII text format. Change-Id: Ie467999b4e82e7f5149ffe8bb773aa74ccedcca7
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index a02f8b3b04d1..437cf447a91b 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1469,8 +1469,9 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
if (pDest->GetDoc()->IsClipBoard() && this->GetNum())
{
// #i111677# cache expansion of source (for clipboard)
- pDest->m_pNumStringCache.reset(
- new OUString(this->GetNumString()));
+ pDest->m_pNumStringCache.reset( (nTxtStartIdx != 0)
+ ? new OUString // fdo#49076: numbering only if copy from para start
+ : new OUString(this->GetNumString()));
}
if( !nLen )