diff options
| author | László Németh <nemeth@numbertext.org> | 2021-03-17 11:24:42 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2021-03-17 22:17:12 +0100 |
| commit | a001a66ba27e2fe9a485388869d53f001f2b09af (patch) | |
| tree | 2a6837a7f55c43a168bd23c3db753abf9b6f1125 /sw/source/uibase/shells | |
| parent | feb6fd1f4213ef114e63a3dd398c2cba6a5e93ea (diff) | |
tdf#140982 sw ChangesInMargin: fix annotation ranges
Annotation ranges of tracked deletions collapsed in
ChangesInMargin mode (as before saving the document,
see commit d325cd0c69b7c0cc4f47105749a98995de81cc9d
"tdf#115815 sw: fix lost annotation ranges of redlines").
Change-Id: I413804cfcdf972f054b65e28e6265c30d25731e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112644
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/source/uibase/shells')
| -rw-r--r-- | sw/source/uibase/shells/basesh.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index c91fab016851..41e1c96f2711 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -1065,6 +1065,12 @@ void SwBaseShell::Execute(SfxRequest &rReq) if ( !bAllInText ) aViewOption.SetShowChangesInMargin2( FN_SET_TRACKED_INSERTIONS_IN_MARGIN == nSlot ); rSh.ApplyViewOptions( aViewOption ); + + // tdf#140982 restore annotation ranges stored in temporary bookmarks + // (only remove temporary bookmarks during file saving to avoid possible + // conflict with lazy deletion of the bookmarks of the moved tracked deletions) + if ( bAllInText || FN_SET_TRACKED_INSERTIONS_IN_MARGIN == nSlot ) + rSh.GetDoc()->getIDocumentMarkAccess()->restoreAnnotationMarks(false); } break; case SID_CONTOUR_DLG: |