[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sd/source

[Samuel Mehrbrodt (via logerrit)]

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

New commits:
commit 29de1e98d30db95b4045537b6c867c7ea0090c4e
Author:     Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
AuthorDate: Wed Apr 21 10:57:16 2021 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Apr 21 14:46:15 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/+/114368
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index e1c7831e11a7..baccb46cac5a 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -147,9 +147,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()
@@ -226,6 +226,9 @@ bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
         }
     }
 
+    if (!bRet)
+        bRet = GetView()->KeyInput(rKEvt, pWin);
+
     return bRet;
 }