sw/source/core/txtnode/ndtxt.cxx | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit bb4ebb8bd143f641577fef69276da8dff62b197c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Aug 14 16:52:23 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Aug 17 10:20:38 2020 +0200
tdf#132892 Revert "sw: paragraph-sign: erase metafields ... correctly"
This reverts commit b402d0112a0bb53221b847fa372bfa3f6390a0e2.
Change-Id: I210d2fded01fb952d7384b78240e32d868b08575
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100753
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 3e0f8b16c254..6d6f241e7b2c 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2003,7 +2003,7 @@ void SwTextNode::CopyText( SwTextNode *const pDest,
{
CHECK_SWPHINTS_IF_FRM(this);
CHECK_SWPHINTS(pDest);
- const sal_Int32 nTextStartIdx = rStart.GetIndex();
+ sal_Int32 nTextStartIdx = rStart.GetIndex();
sal_Int32 nDestStart = rDestStart.GetIndex(); // remember old Pos
if (pDest->GetDoc()->IsClipBoard() && GetNum())
@@ -2094,6 +2094,7 @@ void SwTextNode::CopyText( SwTextNode *const pDest,
// Fetch end only now, because copying into self updates the start index
// and all attributes
+ nTextStartIdx = rStart.GetIndex();
const sal_Int32 nEnd = nTextStartIdx + nLen;
// 2. copy attributes
@@ -2241,10 +2242,8 @@ void SwTextNode::CopyText( SwTextNode *const pDest,
std::reverse(metaFieldRanges.begin(), metaFieldRanges.end());
for (const auto& pair : metaFieldRanges)
{
- const SwIndex aIdx(pDest, std::max<sal_Int32>(pair.first -
nTextStartIdx, 0));
- const sal_Int32 nCount = pair.second - pair.first;
- if (nCount > 0)
- pDest->EraseText(aIdx, nCount);
+ const SwIndex aIdx(pDest, pair.first);
+ pDest->EraseText(aIdx, pair.second - pair.first);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
