summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>2021-04-21 10:57:16 +0200
committerCaolán McNamara <caolanm@redhat.com>2021-04-24 20:57:00 +0200
commit0a98fb761f23cdf268fea9c8fca3fe8c14aa0cfe (patch)
tree6d5de44a7f785ff0fe5801bd97dfa5c4fc8382c9
parentBetter handling of filelocs (diff)
downloadcore-0a98fb761f23cdf268fea9c8fca3fe8c14aa0cfe.tar.gz
core-0a98fb761f23cdf268fea9c8fca3fe8c14aa0cfe.zip
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@allotropia.de> (cherry picked from commit 75f5fdbbe48a847874397d9d126f832dbdfada5a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114368 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 29de1e98d30db95b4045537b6c867c7ea0090c4e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114414 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sd/source/ui/view/drviews4.cxx7
1 files changed, 5 insertions, 2 deletions
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;
}