[Libreoffice-commits] .: vcl/unx

[David Tardon]

 vcl/unx/inc/salframe.h             |    1 -
 vcl/unx/source/window/salframe.cxx |   24 ++----------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

New commits:
commit b9d3e82c547abf924c698190702c5d70d07dbfa0
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Feb 17 13:48:00 2011 +0100

    fdo#32552 alt key opens "File" menu

diff --git a/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h
index 7986ee1..25bb004 100644
--- a/vcl/unx/inc/salframe.h
+++ b/vcl/unx/inc/salframe.h
@@ -91,7 +91,6 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame
     USHORT			nKeyCode_;			// last key code
     USHORT			nKeyState_;			// last key state
     int				nCompose_;			// compose state
-    bool			mbKeyMenu;
     bool			mbSendExtKeyModChange;
     USHORT			mnExtKeyMod;
     
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index f52f780..9affd50 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.cxx
@@ -679,7 +679,6 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, ULONG nSalFrameStyle, SystemParentD
     nKeyCode_					= 0;
     nKeyState_					= 0;
     nCompose_					= -1;
-    mbKeyMenu					= false;
     mbSendExtKeyModChange		= false;
     mnExtKeyMod					= 0;
 
@@ -3294,29 +3293,10 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
 
         int nRet = CallCallback( SALEVENT_KEYMODCHANGE, &aModEvt );
 
-        // emulate KEY_MENU
-        if ( ( (nKeySym == XK_Alt_L) || (nKeySym == XK_Alt_R) ) &&
-             ( (nModCode & ~(KEY_MOD3|KEY_MOD2)) == 0 ) )
-        {
-            if( pEvent->type == XLIB_KeyPress )
-                mbKeyMenu = true;
-            else if( mbKeyMenu )
-            {
-                // simulate KEY_MENU
-                aKeyEvt.mnCode	   = KEY_MENU | nModCode;
-                aKeyEvt.mnRepeat   = 0;
-                aKeyEvt.mnTime	   = pEvent->time;
-                aKeyEvt.mnCharCode = 0;
-                nRet = CallCallback( SALEVENT_KEYINPUT, &aKeyEvt );
-                nRet = CallCallback( SALEVENT_KEYUP, &aKeyEvt );
-            }
-        }
-        else
-            mbKeyMenu = false;
         return nRet;
     }
 
-    mbSendExtKeyModChange = mbKeyMenu = false;
+    mbSendExtKeyModChange = false;
 
     // try to figure out the vcl code for the keysym
     // #i52338# use the unmodified KeySym if there is none for the real KeySym
@@ -3515,7 +3495,7 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent )
         else
         {
             mbInputFocus = False;
-            mbSendExtKeyModChange = mbKeyMenu = false;
+            mbSendExtKeyModChange = false;
             mnExtKeyMod = 0;
             return CallCallback( SALEVENT_LOSEFOCUS, 0 );
         }