summaryrefslogtreecommitdiff
path: root/accessibility
diff options
context:
space:
mode:
authorOliver Braun <obr@openoffice.org>2002-08-14 11:12:13 +0000
committerOliver Braun <obr@openoffice.org>2002-08-14 11:12:13 +0000
commitc20e908cc4868a272d284faf068fbe9d72bbf226 (patch)
tree68e03441d4a4a39b50068d8a45254f5f219c7569 /accessibility
parent856095b1a3efd3e7a548676ee7e29cb559e33a7c (diff)
#100201# re-enabled actions for menu(item)s
Diffstat (limited to 'accessibility')
-rw-r--r--accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java25
-rwxr-xr-xaccessibility/bridge/org/openoffice/java/accessibility/makefile.mk7
2 files changed, 22 insertions, 10 deletions
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java
index 262dbadc0560..6621edafb7bc 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java
@@ -2,9 +2,9 @@
*
* $RCSfile: AccessibleObjectFactory.java,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: obr $ $Date: 2002-08-09 15:10:55 $
+ * last change: $Author: obr $ $Date: 2002-08-14 12:12:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -133,7 +133,11 @@ public class AccessibleObjectFactory {
switch(info.Role) {
case AccessibleRole.CHECKBOX:
- o = new AccessibleCheckBox(xAccessibleContext);
+ o = new AccessibleButton(
+ javax.accessibility.AccessibleRole.CHECK_BOX,
+ javax.accessibility.AccessibleState.CHECKED,
+ xAccessibleContext
+ );
break;
case AccessibleRole.COMBOBOX:
case AccessibleRole.LIST:
@@ -175,10 +179,18 @@ public class AccessibleObjectFactory {
o = new AccessibleParagraph(xAccessibleContext);
break;
case AccessibleRole.PUSHBUTTON:
- o = new AccessiblePushButton(xAccessibleContext);
+ o = new AccessibleButton(
+ javax.accessibility.AccessibleRole.PUSH_BUTTON,
+ javax.accessibility.AccessibleState.SELECTED,
+ xAccessibleContext
+ );
break;
case AccessibleRole.RADIOBUTTON:
- o = new AccessibleRadioButton(xAccessibleContext);
+ o = new AccessibleButton(
+ javax.accessibility.AccessibleRole.RADIO_BUTTON,
+ javax.accessibility.AccessibleState.CHECKED,
+ xAccessibleContext
+ );
break;
case AccessibleRole.SCROLLBAR:
o = new AccessibleScrollBar(xAccessibleContext);
@@ -294,6 +306,9 @@ public class AccessibleObjectFactory {
if(o instanceof AccessibleWindow) {
AccessibleWindow w = (AccessibleWindow) o;
w.setAccessibleChildrenCount(info.ChildrenCount);
+ } else if(o instanceof AccessibleMenu) {
+ AccessibleMenu m = (AccessibleMenu) o;
+ m.setAccessibleChildrenCount(info.ChildrenCount);
} else if(o instanceof AccessibleFixedText) {
AccessibleFixedText t = (AccessibleFixedText) o;
if( info.Text != null )
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
index 723dcc11f56b..852383062072 100755
--- a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
+++ b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: obr $ $Date: 2002-08-08 14:12:46 $
+# last change: $Author: obr $ $Date: 2002-08-14 12:12:13 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -76,7 +76,6 @@ JAVADIR = $(OUT)$/misc$/java
JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar
JAVAFILES = \
AccessibleButton.java \
- AccessibleCheckBox.java \
AccessibleContainer.java \
AccessibleDescendantManager.java \
AccessibleEditLine.java \
@@ -91,8 +90,6 @@ JAVAFILES = \
AccessibleObjectFactory.java \
AccessibleObject.java \
AccessibleParagraph.java \
- AccessiblePushButton.java \
- AccessibleRadioButton.java \
AccessibleRoleMap.java \
AccessibleScrollBar.java \
AccessibleSeparator.java \