[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - sd/source

[Samuel Mehrbrodt (via logerrit)]

 sd/source/ui/view/drviews4.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit dda6fd722799b7aacdc62cc516df99e762d52cd4
Author:     Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
AuthorDate: Wed Apr 21 10:57:16 2021 +0200
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Fri Apr 23 17:08:35 2021 +0200

    tdf#141703 Restore tab function in sd tables
    
    Regression from 67ad205404211a2ae17c430a17ede6e9d04d0b7e
    
    Change-Id: Iadbdaf1b59d2481264e45b85aed248c84404c26b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114383
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
    (cherry picked from commit 75f5fdbbe48a847874397d9d126f832dbdfada5a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114370
    Tested-by: Thorsten Behrens <thorsten.behrens at allotropia.de>
    Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>

diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 4f9162f84069..e16e8a67dc53 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -130,9 +130,9 @@ void DrawViewShell::DeleteActualLayer()
 
 bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
 {
-    bool bRet = GetView()->KeyInput(rKEvt, pWin);
+    bool bRet = false;
 
-    if (!bRet && (!IsInputLocked() || (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE)))
+    if (!IsInputLocked() || (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE))
     {
         if(KEY_RETURN == rKEvt.GetKeyCode().GetCode()
             && rKEvt.GetKeyCode().IsMod1()
@@ -209,6 +209,9 @@ bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
         }
     }
 
+    if (!bRet)
+        bRet = GetView()->KeyInput(rKEvt, pWin);
+
     return bRet;
 }