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

tdf#105625 related: don't duplicate dummy character on copy

Browse Source 
Change-Id: I5881887c7a0fd0c9ccd954a36482a3ada5103098
Reviewed-on: https://gerrit.libreoffice.org/34025
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2017-02-07 12:20:10 +03:00
parent 36bd85083d
commit d4036d3a89
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sw/source/core/doc/DocumentContentOperationsManager.cxx
View File

@ -266,6 +266,15 @@ namespace
lcl_SetCpyPos(pMark->GetOtherMarkPos(), rStt, *pCpyStt, *aTmpPam.GetMark(), nDelCount); lcl_SetCpyPos(pMark->GetOtherMarkPos(), rStt, *pCpyStt, *aTmpPam.GetMark(), nDelCount);
} }
const IDocumentMarkAccess::MarkType aMarkType = IDocumentMarkAccess::GetType(*pMark);
if (aMarkType == IDocumentMarkAccess::MarkType::CHECKBOX_FIELDMARK)
{
// Node's CopyText() copies also dummy characters, which need to be removed
// (they will be added later in MarkBase::InitDoc inside IDocumentMarkAccess::makeMark)
// CHECKBOX_FIELDMARK doesn't contain any other data in its range, so just clear it
pDestDoc->getIDocumentContentOperations().DeleteRange(aTmpPam);
}
::sw::mark::IMark* const pNewMark = pDestDoc->getIDocumentMarkAccess()->makeMark( ::sw::mark::IMark* const pNewMark = pDestDoc->getIDocumentMarkAccess()->makeMark(
aTmpPam, aTmpPam,
pMark->GetName(), pMark->GetName(),