summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2018-01-18 13:57:22 +0100
committerJan Holesovsky <kendy@collabora.com>2018-01-19 16:52:26 +0100
commitc163db958f0e105b8d37eaef6388a4f89c57d251 (patch)
tree5b255162e2c9f49731a7497304040b6865e9cf7e
parentf7d3af010bb36f4a1fdf8a936d9d60af14feb38e (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/48204 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.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 e3045b0edee8..bd9af08c3cb7 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -481,7 +481,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;
}