[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source

[Caolán McNamara]

 sc/source/ui/view/tabview5.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 34e5922c2dea4bb3a54c3df3822b9d843c5be277
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu May 3 15:08:17 2018 +0100

    Resolves: tdf#117005 undo/redo skips comment when switching sheets
    
    while insert comment is active
    
    regression from....
    
    commit 80509950d35cebaede89fcb52c446a1fd3e45ba3
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Mon Jul 4 15:31:29 2016 +0100
    
        Resolves: tdf#100761 after insert note, focus cannot return to inputbar
    
    which is a suspected regression from.
    
    commit 11d605cc5a0c221d2423b6e63f502db660d085d2
    Date:   Mon Feb 1 18:39:51 2016 +0200
    
        tdf#84843 Stop using PseudoSlots for drawing slots
    
    Change-Id: Id4614624cbb85411ba0d368ae072a05f5f9e09ad
    Reviewed-on: https://gerrit.libreoffice.org/53799
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 005399636816..b36e86271764 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -372,7 +372,8 @@ void ScTabView::DrawDeselectAll()
     if (pDrawView)
     {
         ScTabViewShell* pViewSh = aViewData.GetViewShell();
-        if (pDrawActual && pViewSh->IsDrawTextShell())
+        if ( pDrawActual &&
+            ( pViewSh->IsDrawTextShell() || pDrawActual->GetSlotID() == SID_DRAW_NOTEEDIT ) )
         {
             // end text edit (as if escape pressed, in FuDraw)
             aViewData.GetDispatcher().Execute( pDrawActual->GetSlotID(),