[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

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

New commits:
commit 65d69d95e88de25bcb59486231d92ace6be5feed
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/44500
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index fdc584eb7513..81cf9f67765f 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2063,10 +2063,11 @@ static void ImplHandleSalKeyMod( vcl::Window* pWindow, SalKeyModEvent const * pE
     // #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 );