diff options
6 files changed, 14 insertions, 1 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() ); diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 7c5505d1d87d..f3c56cc6cd88 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -233,7 +233,7 @@ namespace frm { // Ctrl-Tab is used to step out of the control // -> build a new key event without the Ctrl-key, and let the very base class handle it - KeyCode aNewCode( KEY_TAB, bShift, sal_False, sal_False ); + KeyCode aNewCode( KEY_TAB, bShift, sal_False, sal_False, sal_False ); ::KeyEvent aNewEvent( pKeyEvent->GetCharCode(), aNewCode ); Control::KeyInput( aNewEvent ); return 1; // handled |