[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source

[Jan Holesovsky]

 sw/source/uibase/docvw/edtwin.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 68e50768b7f24f12c52a0eb3da0892d4eb39635a
Author: Jan Holesovsky <kendy at 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 <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index e8665d2466a7..c552cdfe8df5 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -1637,13 +1637,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() )