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

6 files changed, 21 insertions, 11 deletions

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 3834e4de8677..5f41a441c6a1 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2903,8 +2903,8 @@ PopupMenu* Edit::CreatePopupMenu()
     pPopup->SetAccelKey( SV_MENU_EDIT_COPY, KeyCode( KEYFUNC_COPY ) );
     pPopup->SetAccelKey( SV_MENU_EDIT_PASTE, KeyCode( KEYFUNC_PASTE ) );
     pPopup->SetAccelKey( SV_MENU_EDIT_DELETE, KeyCode( KEYFUNC_DELETE ) );
-    pPopup->SetAccelKey( SV_MENU_EDIT_SELECTALL, KeyCode( KEY_A, FALSE, TRUE, FALSE ) );
-    pPopup->SetAccelKey( SV_MENU_EDIT_INSERTSYMBOL, KeyCode( KEY_S, TRUE, TRUE, FALSE ) );
+    pPopup->SetAccelKey( SV_MENU_EDIT_SELECTALL, KeyCode( KEY_A, FALSE, TRUE, FALSE, FALSE ) );
+    pPopup->SetAccelKey( SV_MENU_EDIT_INSERTSYMBOL, KeyCode( KEY_S, TRUE, TRUE, FALSE, FALSE ) );
     return pPopup;
 }
 
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 7dfc70c0fe32..34e831d2daf8 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -231,7 +231,8 @@ void Accelerator::ImplInsertAccel( USHORT nItemId, const KeyCode& rKeyCode,
         USHORT nCode1;
         USHORT nCode2;
         USHORT nCode3;
-        ImplGetKeyCode( rKeyCode.GetFunction(), nCode1, nCode2, nCode3 );
+                USHORT nCode4;
+        ImplGetKeyCode( rKeyCode.GetFunction(), nCode1, nCode2, nCode3, nCode4 );
         if ( nCode1 )
             ImplInsertAccel( nItemId, KeyCode( nCode1, nCode1 ), bEnable, pAutoAccel );
         if ( nCode2 )
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 1e9a3350c88e..392c2ceaa478 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -1166,7 +1166,7 @@ KeyEvent Window::GetActivationKey() const
             nCode = KEY_A + (nAccel-'A');
         else if( nAccel >= '0' && nAccel <= '9' )
             nCode = KEY_0 + (nAccel-'0');
-        KeyCode aKeyCode( nCode, FALSE, FALSE, TRUE );
+        KeyCode aKeyCode( nCode, FALSE, FALSE, TRUE, FALSE );
         aKeyEvent = KeyEvent( nAccel, aKeyCode );
     }
     return aKeyEvent;
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx
index 042eac37aa41..77af28241cb3 100644
--- a/vcl/source/window/keycod.cxx
+++ b/vcl/source/window/keycod.cxx
@@ -74,13 +74,14 @@ static USHORT aImplKeyFuncTab[(KEYFUNC_FRONT+1)*3] =
 
 // -----------------------------------------------------------------------
 
-void ImplGetKeyCode( KeyFuncType eFunc, USHORT& rCode1, USHORT& rCode2, USHORT& rCode3 )
+void ImplGetKeyCode( KeyFuncType eFunc, USHORT& rCode1, USHORT& rCode2, USHORT& rCode3, USHORT& rCode4 )
 {
     USHORT nIndex = (USHORT)eFunc;
-    nIndex *= 3;
+    nIndex *= 4;
     rCode1 = aImplKeyFuncTab[nIndex];
     rCode2 = aImplKeyFuncTab[nIndex+1];
     rCode3 = aImplKeyFuncTab[nIndex+2];
+        rCode4 = aImplKeyFuncTab[nIndex+3];
 }
 
 // =======================================================================
@@ -88,7 +89,7 @@ void ImplGetKeyCode( KeyFuncType eFunc, USHORT& rCode1, USHORT& rCode2, USHORT&
 KeyCode::KeyCode( KeyFuncType eFunction )
 {
     USHORT nDummy;
-    ImplGetKeyCode( eFunction, nCode, nDummy, nDummy );
+    ImplGetKeyCode( eFunction, nCode, nDummy, nDummy, nDummy );
     eFunc = eFunction;
 }
 
@@ -111,7 +112,7 @@ KeyCode::KeyCode( const ResId& rResId )
         if ( eFunc != KEYFUNC_DONTKNOW )
         {
             USHORT nDummy;
-            ImplGetKeyCode( eFunc, nCode, nDummy, nDummy );
+            ImplGetKeyCode( eFunc, nCode, nDummy, nDummy, nDummy );
         }
         else
             nCode = sal::static_int_cast<USHORT>(nKeyCode | nModifier);
@@ -151,8 +152,9 @@ KeyFuncType KeyCode::GetFunction() const
             USHORT nKeyCode1;
             USHORT nKeyCode2;
             USHORT nKeyCode3;
-            ImplGetKeyCode( (KeyFuncType)i, nKeyCode1, nKeyCode2, nKeyCode3 );
-            if ( (nCompCode == nKeyCode1) || (nCompCode == nKeyCode2) || (nCompCode == nKeyCode3) )
+                        USHORT nKeyCode4;
+            ImplGetKeyCode( (KeyFuncType)i, nKeyCode1, nKeyCode2, nKeyCode3, nKeyCode4 );
+            if ( (nCompCode == nKeyCode1) || (nCompCode == nKeyCode2) || (nCompCode == nKeyCode3) || (nCompCode == nKeyCode4) )
                 return (KeyFuncType)i;
         }
     }
diff --git a/vcl/source/window/keyevent.cxx b/vcl/source/window/keyevent.cxx
index e3a92194040f..e8474c6efa5d 100644
--- a/vcl/source/window/keyevent.cxx
+++ b/vcl/source/window/keyevent.cxx
@@ -49,7 +49,8 @@ KeyEvent::KeyEvent( const ::com::sun::star::awt::KeyEvent& rEvent )
         rEvent.KeyCode,
         (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::SHIFT) != 0,
         (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD1) != 0,
-        (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD2) != 0 );
+        (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD2) != 0,
+                (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD3) != 0);
     mnRepeat = 0;
     mnCharCode = rEvent.KeyChar;
 }
@@ -64,6 +65,8 @@ void KeyEvent::InitKeyEvent( ::com::sun::star::awt::KeyEvent& rEvent ) const
         rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD1;
     if( GetKeyCode().IsMod2() )
         rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD2;
+        if( GetKeyCode().IsMod3() )
+                rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD3;
 
     rEvent.KeyCode = GetKeyCode().GetCode();
     rEvent.KeyChar = GetCharCode();
diff --git a/vcl/source/window/mouseevent.cxx b/vcl/source/window/mouseevent.cxx
index 90ca259cc425..a95b90f5e1d0 100644
--- a/vcl/source/window/mouseevent.cxx
+++ b/vcl/source/window/mouseevent.cxx
@@ -52,6 +52,8 @@ MouseEvent::MouseEvent( const ::com::sun::star::awt::MouseEvent& rEvent )
             mnCode |= KEY_MOD1;
         if( (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD2) != 0 )
             mnCode |= KEY_MOD2;
+                if( (rEvent.Modifiers & ::com::sun::star::awt::KeyModifier::MOD3) != 0 )
+                        mnCode |= KEY_MOD3;
     }
 
     if( rEvent.Buttons )
@@ -75,6 +77,8 @@ void MouseEvent::InitMouseEvent( ::com::sun::star::awt::MouseEvent& rEvent ) con
         rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD1;
     if ( IsMod2() )
         rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD2;
+        if ( IsMod3() )
+                rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD3;
 
     rEvent.Buttons = 0;
     if ( IsLeft() )