[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source

[Justin Luth]

 sw/source/uibase/docvw/AnnotationWin.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2a5fe37dfc48bfddc4fd4e47c1034fd76d53ba84
Author: Justin Luth <justin_luth at sil.org>
Date:   Mon May 30 07:10:25 2016 +0300

    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/25651
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 8c03679..17bc48e 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();
     }
 }