[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - vcl/source

[Caolán McNamara]

 vcl/source/window/winproc.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 13511a077bb85a68a3d29d081d0f88090028185f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 8 17:38:43 2017 +0000

    Resolves: tdf#113562 desired window didn't get the input
    
    Change-Id: I4a2089a715dc67783bfd18d2ee0e55193c4ed741
    Reviewed-on: https://gerrit.libreoffice.org/44511
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 7a612ac0a494..9c900ce0e3d5 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2089,10 +2089,11 @@ static void ImplHandleSalKeyMod( vcl::Window* pWindow, SalKeyModEvent* pEvent )
     // #105224# send commandevent to allow special treatment of Ctrl-LeftShift/Ctrl-RightShift etc.
     // + auto-accelerator feature, tdf#92630
 
-    // find window
+    // try to find a key input window...
     vcl::Window* pChild = ImplGetKeyInputWindow( pWindow );
-    if ( !pChild )
-        return;
+    //...otherwise fail safe...
+    if (!pChild)
+        pChild = pWindow;
 
     CommandModKeyData data( pEvent->mnModKeyCode, pEvent->mbDown );
     ImplCallCommand( pChild, CommandEventId::ModKeyChange, &data );