summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2018-01-18 13:57:22 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-01-27 21:04:39 +0100
commit90ee98190302de9a5f570b73d48a628ce41190f3 (patch)
tree2b851378ff369b3e4c45393c2a653fd5f5602a82
parent32623337ba186bd7aac028920a1e1a6484e5e30f (diff)
tdf#115088: Pasting multi-line text from external source behaves strangely
Regression from: e68b6e349c31ac1376e90218013e1e7612f2b522 AppendTextNode might be sufficient for import (when there is no content in the document), but for clipboard operations better to use the original SplitNode method. Change-Id: I7de3e9bc9c5356acb0b4cc43927a0d39079522b2 Reviewed-on: https://gerrit.libreoffice.org/48124 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 657da4697379274295e9fd32d3abc1334ebd50d2) Reviewed-on: https://gerrit.libreoffice.org/48206 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/filter/ascii/parasc.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 39d36874efc9..0f0ebc4f7977 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -480,7 +480,10 @@ sal_uLong SwASCIIParser::ReadChars()
{
// We found a CR/LF, thus save the text
InsertText( OUString( pLastStt ));
- pDoc->getIDocumentContentOperations().AppendTextNode( *pPam->GetPoint() );
+ if(bNewDoc)
+ pDoc->getIDocumentContentOperations().AppendTextNode( *pPam->GetPoint() );
+ else
+ pDoc->getIDocumentContentOperations().SplitNode( *pPam->GetPoint(), false );
pLastStt = pStt;
nLineLen = 0;
}