diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-04-19 15:02:52 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-04-19 20:09:27 +0200 |
| commit | 0271fa73dccabeadbd43c3b633df6b5725f2c427 (patch) | |
| tree | baaa6a788c09cbeeb5fa6a1fd98a44e18bb2a4fc /sw/source/uibase | |
| parent | 2f920c1da7d7021774cbc9ea8dbc4aefa2409a91 (diff) | |
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 <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 68e50768b7f24f12c52a0eb3da0892d4eb39635a)
Reviewed-on: https://gerrit.libreoffice.org/36687
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
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() ) |