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

[Juergen Funk]

 vcl/win/source/window/salframe.cxx |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 3ac9942c624cb627c8b09122498b45b05cf455f6
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date:   Thu Nov 12 10:50:59 2015 +0100

    tdf#95761 All Hotkeys with CTRL+ALT+ not worked
    
    The problem was always masked out the combination ALT+CTRL, this only
    needed when press the ALTGR key, but the other ALT-Key (left side) is
    valid.
    
    Change-Id: I8a6f953f519627418fb48ee8d1d68b3cbf797250
    Reviewed-on: https://gerrit.libreoffice.org/19923
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 0203b05..705335f 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -3399,8 +3399,10 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
         nModCode |= KEY_SHIFT;
     if ( GetKeyState( VK_CONTROL ) & 0x8000 )
         nModCode |= KEY_MOD1;
-    if ( GetKeyState( VK_MENU ) & 0x8000 )
+    if ( GetKeyState( VK_LMENU ) & 0x8000 )
         nModCode |= KEY_MOD2;
+    if ( GetKeyState( VK_RMENU ) & 0x8000 )  // this is the ALTGR-Key in this case
+        nModCode &= ~KEY_MOD1;               // remove the Control flag
 
     if ( (nMsg == WM_CHAR) || (nMsg == WM_SYSCHAR) )
     {
@@ -3607,13 +3609,6 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
                 aKeyEvt.mnCode     |= nModCode;
                 aKeyEvt.mnRepeat    = nRepeat;
 
-                if( (nModCode & (KEY_MOD1|KEY_MOD2)) == (KEY_MOD1|KEY_MOD2) &&
-                    aKeyEvt.mnCharCode )
-                {
-                     // this is actually AltGr and should not be handled as Alt
-                     aKeyEvt.mnCode &= ~(KEY_MOD1|KEY_MOD2);
-                }
-
                 bIgnoreCharMsg = bCharPeek ? TRUE : FALSE;
                 long nRet = pFrame->CallCallback( nEvent, &aKeyEvt );
                 // independent part only reacts on keyup but Windows does not send