diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 14:08:08 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 14:08:08 +0000 |
| commit | 4d42b4c00aaf343f9e15fc6ccf32d4d208a5d599 (patch) | |
| tree | 9ecc2aa4b560157b061c6f3b8cdeca35c1495fe4 /accessibility/bridge | |
| parent | 2ff4dd48a979a5387ff5d93f8c9d1addd9d65f5a (diff) | |
INTEGRATION: CWS tbe28 (1.7.30); FILE MERGED
2006/08/03 13:01:54 obr 1.7.30.2: #i56539# invoke default action for menu items when selected via AccessibleSelection
2006/08/03 10:08:30 obr 1.7.30.1: #i56539# no ACCESSIBLE_SELECTION_PROPERTY change events
Diffstat (limited to 'accessibility/bridge')
| -rw-r--r-- | accessibility/bridge/org/openoffice/java/accessibility/Menu.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Menu.java b/accessibility/bridge/org/openoffice/java/accessibility/Menu.java index 22c67710b0e9..2556aba7c9c3 100644 --- a/accessibility/bridge/org/openoffice/java/accessibility/Menu.java +++ b/accessibility/bridge/org/openoffice/java/accessibility/Menu.java @@ -4,9 +4,9 @@ * * $RCSfile: Menu.java,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-07 15:39:11 $ + * last change: $Author: vg $ $Date: 2006-11-01 15:08:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -176,10 +176,8 @@ public class Menu extends AbstractButton break; + // #i56539# Java 1.5 does not fire ACCESSIBLE_SELECTION_PROPERTY for menus case AccessibleEventId.SELECTION_CHANGED: - firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_SELECTION_PROPERTY, - null, null); - break; default: @@ -274,7 +272,13 @@ public class Menu extends AbstractButton /** Adds the specified Accessible child of the object to the object's selection */ public void addAccessibleSelection(int i) { try { - unoAccessibleSelection.selectAccessibleChild(i); + javax.accessibility.Accessible a = getAccessibleChild(i); + + // selecting menu items invokes the click action in Java 1.5 + if( a instanceof MenuItem ) + a.getAccessibleContext().getAccessibleAction().doAccessibleAction(0); + else + unoAccessibleSelection.selectAccessibleChild(i); } catch (java.lang.Exception e) { /* * Possible exceptions are: |