summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>2021-04-21 10:57:16 +0200
committerThorsten Behrens <thorsten.behrens@allotropia.de>2021-04-23 17:08:13 +0200
commit76ae33f415e6df0e267022bddb5c1b75df4346a6 (patch)
tree1257e26bd2bc70a320bc9c829a06ed5f8f2aece4
parent0e5099beaa424938d4254e3998b61e94990fd01c (diff)
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/+/114369 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
-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 91b00f978496..d02d1105a4a6 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -124,9 +124,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()
@@ -203,6 +203,9 @@ bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
}
}
+ if (!bRet)
+ bRet = GetView()->KeyInput(rKEvt, pWin);
+
return bRet;
}