mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#132892 Revert "sw: paragraph-sign: erase metafields ... correctly"

Browse Source 
This reverts commit b402d0112a0bb53221b847fa372bfa3f6390a0e2.

Change-Id: I210d2fded01fb952d7384b78240e32d868b08575
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100753
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2020-08-14 16:52:23 +01:00
parent 00c9b04028
commit bb4ebb8bd1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sw/source/core/txtnode/ndtxt.cxx
View File

@ -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);
}
}