summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2016-05-30 07:10:25 +0300
committerJustin Luth <justin_luth@sil.org>2016-05-30 09:34:47 +0000
commit8038cab377a5ac726cf38f5f95bc987063b95de5 (patch)
treeb7609039d792e236065e355e9b28ea1e3370e919
parent0e999353c53cf1aa357cc6769f4ece1a8d8a74db (diff)
tdf#99870 writer: don't delete selection with delete-comment
When using the keyboard to select text and then deleting a comment, all the text between the cursor and the comment would also be deleted. (Not necessarily the selected text, but everything from the point or the mark would be included in the delete.) Change-Id: Id15a00d112d118227bc4a34b5102bb09d8d167b0 Reviewed-on: https://gerrit.libreoffice.org/25216 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 12868914a39b0e8fb32f63d1307c1bb1c535fb9c) Reviewed-on: https://gerrit.libreoffice.org/25652 Tested-by: Justin Luth <justin_luth@sil.org>
-rw-r--r--sw/source/uibase/docvw/AnnotationWin.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 8c03679510b7..17bc48ebc4b2 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -158,6 +158,7 @@ void SwAnnotationWin::Delete()
SwSidebarWin::Delete();
// we delete the field directly, the Mgr cleans up the PostIt by listening
GrabFocusToDocument();
+ DocView().GetWrtShellPtr()->ClearMark();
DocView().GetWrtShellPtr()->DelRight();
}
}