CWS-TOOLING: integrate CWS macshortcuts01

2009-04-02 18:13:38 +0200 pl  r270430 : CWS-TOOLING: rebase CWS macshortcuts01 to trunk@270033 (milestone: DEV300:m45)
2009-03-04 13:02:01 +0100 pl  r268816 : make compile with oldish gtk headers
2009-03-04 11:23:41 +0100 rvojta  r268799 : Remove #ifndef MACOSX as Mac OS X X11 port is obsolote, no need to check for non Mac OS X
2009-03-03 16:33:34 +0100 rvojta  r268764 : Meta/Super to MOD3 on all Unix platforms except Mac OS X
2009-03-03 16:08:46 +0100 rvojta  r268744 : Map GDK_Meta_L/R and GDK_Super_L/R keys to KEY_MOD3 on Unix systems except Mac OS X
2009-03-03 16:04:23 +0100 rvojta  r268742 : IsMod3(), IsLeftMod3(), IsRightMod3() added
2009-03-03 16:03:48 +0100 rvojta  r268741 : MODKEY_LMOD3, MODKEY_RMOD3, MODKEY_MOD3 support
2009-02-28 00:09:26 +0100 rvojta  r268620 : New KeyCode constructors support, by default MOD3 is not used here (probably temporary solution)
2009-02-25 22:53:02 +0100 rvojta  r268469 : MOD3 support (META_DOWN_MASK)
2009-02-25 13:22:13 +0100 rvojta  r268435 : Cmd-M to minimize window, Cmd-Option-M to minimize all windows
2009-02-25 11:09:20 +0100 rvojta  r268417 : Add back F11 for non Mac OS X platforms (removed by accident in r268405)
2009-02-24 18:32:31 +0100 rvojta  r268405 : F11 replaced by Cmd-T on Mac OS X
2009-02-23 15:21:53 +0100 sb  r268358 : #i99296# support values with both xml:lang and install:module (which are moved into the spool tree, not the res tree)
2009-02-16 22:45:34 +0100 rvojta  r267839 : Multiplatform shortcuts support
2009-02-16 22:41:03 +0100 rvojta  r267838 : Use install:module instead of separate xcu file
2009-02-16 18:35:36 +0100 rvojta  r267833 : Removed accelerators target
2009-02-16 09:27:42 +0100 rvojta  r267776 : MOD3 added
2009-02-16 09:18:32 +0100 rvojta  r267775 : MOD3 support
2009-02-16 09:17:11 +0100 rvojta  r267774 : MOD3 support
2009-02-15 22:11:37 +0100 rvojta  r267773 : Check for MOD3 too
2009-02-15 22:11:15 +0100 rvojta  r267772 : Check for MOD3 too
2009-02-15 22:10:37 +0100 rvojta  r267771 : Check for MOD3 too
2009-02-15 22:10:15 +0100 rvojta  r267770 : Check for MOD3 during mouse event too
2009-02-15 22:09:54 +0100 rvojta  r267769 : IsMod3() added
2009-02-15 19:34:59 +0100 rvojta  r267768 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:33:43 +0100 rvojta  r267767 : Cmd-M -> Ctrl-M for default format
2009-02-15 19:32:19 +0100 rvojta  r267766 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:31:30 +0100 rvojta  r267765 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:31:04 +0100 rvojta  r267764 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:30:33 +0100 rvojta  r267763 : MOD3 added (Ctrl on Mac OS X)
2009-02-15 19:30:09 +0100 rvojta  r267762 : MOD3 added (Ctrl on Mac OS X)
2009-02-13 22:11:22 +0100 rvojta  r267751 : Cmd-Shift-Z for .uno:Redo
2009-02-13 22:04:19 +0100 rvojta  r267748 : F11 -> Cmd-T for .uno:DesignerDialog
2009-02-13 21:09:11 +0100 rvojta  r267743 : F11 -> Cmd-T (all occurences)
2009-02-13 19:47:21 +0100 rvojta  r267741 : accelerators target added for Mac OS X shortcuts
2009-02-13 19:46:58 +0100 rvojta  r267740 : Spreadsheet - replace F11 with Cmd-T
2009-02-13 19:24:19 +0100 rvojta  r267739 : Remove Accelerators-Mac.xcs
2009-02-13 18:50:01 +0100 rvojta  r267738 : Accelerators-Mac.xcs test
2009-02-13 18:48:10 +0100 rvojta  r267737 : Accelerators-Mac.xcu added
2009-02-13 18:46:48 +0100 rvojta  r267736 : F11 -> Cmd-T for stylist in Spreadsheet

3 files changed, 9 insertions, 2 deletions

diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index febb6523e2cc..c8e5e1bd3853 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -682,6 +682,8 @@ namespace
             aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1;
         if (aVCLKey.IsMod2())
             aAWTKey.Modifiers |= css::awt::KeyModifier::MOD2;
+        if (aVCLKey.IsMod3())
+            aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3;
 
         return aAWTKey;
     }
@@ -691,9 +693,10 @@ namespace
         sal_Bool bShift = ((aAWTKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT );
         sal_Bool bMod1  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1  );
         sal_Bool bMod2  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2  );
+        sal_Bool bMod3  = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3  );
         USHORT   nKey   = (USHORT)aAWTKey.KeyCode;
 
-        return KeyCode(nKey, bShift, bMod1, bMod2);
+        return KeyCode(nKey, bShift, bMod1, bMod2, bMod3);
     }
 
 } // END ANONYMOUS NAMESPACE
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 8cb7ed60f2a4..b6d0ce5ff916 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1608,7 +1608,9 @@ long VCLXToolkit::callKeyHandlers(::VclSimpleEvent const * pEvent,
             | (pKeyEvent->GetKeyCode().IsMod1()
                ? ::css::awt::KeyModifier::MOD1 : 0)
             | (pKeyEvent->GetKeyCode().IsMod2()
-               ? ::css::awt::KeyModifier::MOD2 : 0),
+               ? ::css::awt::KeyModifier::MOD2 : 0)
+            | (pKeyEvent->GetKeyCode().IsMod3()
+               ? ::css::awt::KeyModifier::MOD3 : 0),
             pKeyEvent->GetKeyCode().GetCode(), pKeyEvent->GetCharCode(),
             sal::static_int_cast< sal_Int16 >(
                 pKeyEvent->GetKeyCode().GetFunction()));
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index c767458f03ae..09e318800184 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -548,6 +548,8 @@ void ImplInitKeyEvent( ::com::sun::star::awt::KeyEvent& rEvent, const KeyEvent&
         rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD1;
     if ( rEvt.GetKeyCode().IsMod2() )
         rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD2;
+        if ( rEvt.GetKeyCode().IsMod3() )
+                rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD3;
 
     rEvent.KeyCode = rEvt.GetKeyCode().GetCode();
     rEvent.KeyChar = rEvt.GetCharCode();