diff options
author | László Németh <nemeth@numbertext.org> | 2020-11-13 20:07:09 +0100 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2020-11-14 20:41:54 +0100 |
commit | 4ad0459494303745b377c848c681a747f294fc64 (patch) | |
tree | b220587535a74762d4b5013aad0be2b18f0586af /sw/source/core/doc/DocumentContentOperationsManager.cxx | |
parent | e56c19c9aec4d118b247a6b7daa2cb529fee400a (diff) |
tdf#138135: sw ChangesInMargin: join characters at backspace
Words deleted by pressing multiple backspaces weren't shown
on margin, only their first letter.
Change-Id: I2f5d0bb057250d3bfd788e1007f1ad24f8c3c2fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105807
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/source/core/doc/DocumentContentOperationsManager.cxx')
-rw-r--r-- | sw/source/core/doc/DocumentContentOperationsManager.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 2e018b7a0567..146095349261 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -3992,6 +3992,15 @@ bool DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa // within a paragraph TODO: fix also for paragraph join pRedline->GetPoint()->nNode == pRedline->GetMark()->nNode) { + // show hidden previous deletion for joining + SwRedlineTable::size_type index = 0; + const SwRangeRedline* pPrevRedline = rTable.FindAtPosition( + *pRedline->End(), index, /*bNext=*/false, /*bGetVisible=*/false ); + if ( pPrevRedline && RedlineType::Delete == pPrevRedline->GetType() ) + { + SwRangeRedline* pPrevRed = rTable[ index ]; + pPrevRed->Show(1, index, /*bForced=*/true); + } pRedline->Show(0, rTable.GetPos(pRedline), /*bForced=*/false); pRedline->Show(1, rTable.GetPos(pRedline), /*bForced=*/false); } |