diff options
author | Release Engineers <releng@openoffice.org> | 2009-04-12 04:24:43 +0000 |
---|---|---|
committer | Release Engineers <releng@openoffice.org> | 2009-04-12 04:24:43 +0000 |
commit | 2182dd7499013e970ca177142ec13f43c3ec184f (patch) | |
tree | dd3d03298a865eae37b4c0528743a83765f25ab4 /accessibility | |
parent | CWS-TOOLING: integrate CWS jl124 (diff) | |
download | core-2182dd7499013e970ca177142ec13f43c3ec184f.tar.gz core-2182dd7499013e970ca177142ec13f43c3ec184f.zip |
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
Diffstat (limited to 'accessibility')
5 files changed, 13 insertions, 0 deletions
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java index 09133cbf7a8a..bb9e32856f32 100644 --- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java +++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java @@ -57,6 +57,11 @@ public class AccessibleKeyBinding extends Object implements javax.accessibility. if ((s & com.sun.star.awt.KeyModifier.MOD2) != 0) { modifiers = modifiers | java.awt.event.KeyEvent.ALT_DOWN_MASK; } + + if ((s & com.sun.star.awt.KeyModifier.MOD3) != 0) { + modifiers = modifiers | java.awt.event.KeyEvent.META_DOWN_MASK; + } + return modifiers; } diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index 562e1a98f8d2..41f8c686bdde 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -247,6 +247,8 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB aKeyStroke.Modifiers |= awt::KeyModifier::MOD1; if ( aKeyCode.IsMod2() ) aKeyStroke.Modifiers |= awt::KeyModifier::MOD2; + if ( aKeyCode.IsMod3() ) + aKeyStroke.Modifiers |= awt::KeyModifier::MOD3; aKeyStroke.KeyCode = aKeyCode.GetCode(); aKeyStroke.KeyChar = aKeyEvent.GetCharCode(); aKeyStroke.KeyFunc = static_cast< sal_Int16 >( aKeyCode.GetFunction() ); diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index f90537b576bf..c6ea1603d647 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -275,6 +275,8 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe aKeyStroke.Modifiers |= awt::KeyModifier::MOD1; if ( aKeyCode.IsMod2() ) aKeyStroke.Modifiers |= awt::KeyModifier::MOD2; + if ( aKeyCode.IsMod3() ) + aKeyStroke.Modifiers |= awt::KeyModifier::MOD3; aKeyStroke.KeyCode = aKeyCode.GetCode(); aKeyStroke.KeyChar = aKeyEvent.GetCharCode(); aKeyStroke.KeyFunc = static_cast< sal_Int16 >( aKeyCode.GetFunction() ); diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index 0683ffc85bfd..2548ad0a7dbb 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -531,6 +531,8 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe aSeq3[0].Modifiers |= awt::KeyModifier::MOD1; if ( aAccelKeyCode.IsMod2() ) aSeq3[0].Modifiers |= awt::KeyModifier::MOD2; + if ( aAccelKeyCode.IsMod3() ) + aSeq3[0].Modifiers |= awt::KeyModifier::MOD3; aSeq3[0].KeyCode = aAccelKeyCode.GetCode(); aSeq3[0].KeyFunc = static_cast< sal_Int16 >( aAccelKeyCode.GetFunction() ); pKeyBindingHelper->AddKeyBinding( aSeq3 ); diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index 040881b7e347..f797ff2d70ae 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -235,6 +235,8 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActio aKeyStroke.Modifiers |= awt::KeyModifier::MOD1; if ( aKeyCode.IsMod2() ) aKeyStroke.Modifiers |= awt::KeyModifier::MOD2; + if ( aKeyCode.IsMod3() ) + aKeyStroke.Modifiers |= awt::KeyModifier::MOD3; aKeyStroke.KeyCode = aKeyCode.GetCode(); aKeyStroke.KeyChar = aKeyEvent.GetCharCode(); aKeyStroke.KeyFunc = static_cast< sal_Int16 >( aKeyCode.GetFunction() ); |