sw/source/uibase/docvw/edtwin.cxx | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 0271fa73dccabeadbd43c3b633df6b5725f2c427
Author: Jan Holesovsky <ke...@collabora.com>
Date: Wed Apr 19 15:02:52 2017 +0200
sw lok: Don't open the separate formula input bar in writer tables.
With LOK, it steals focus from the user, and the user has no chance to get
the
focus back again.
Change-Id: Ie54a377a9543ddda88e739fe1ebdfcb04d000ea7
Reviewed-on: https://gerrit.libreoffice.org/36686
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
(cherry picked from commit 68e50768b7f24f12c52a0eb3da0892d4eb39635a)
Reviewed-on: https://gerrit.libreoffice.org/36687
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index d9dbc3ff4730..017c719c81f7 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -1620,13 +1620,17 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
#endif
- if( !rKeyCode.IsMod2() && '=' == aCh &&
+ if (!comphelper::LibreOfficeKit::isActive() &&
+ !rKeyCode.IsMod2() && '=' == aCh &&
!rSh.IsTableMode() && rSh.GetTableFormat() &&
rSh.IsSttPara() &&
- !rSh.HasReadonlySel() )
+ !rSh.HasReadonlySel())
{
// at the beginning of the table's cell a '=' ->
// call EditRow (F2-functionality)
+ // [Avoid this for LibreOfficeKit, as the separate input window
+ // steals the focus & things go wrong - the user never gets
+ // the focus back.]
rSh.Push();
if( !rSh.MoveSection( GoCurrSection, fnSectionStart) &&
!rSh.IsTableBoxTextFormat() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
