From 9e33aa7f957df7a37a2e0496f964003950ad5526 Mon Sep 17 00:00:00 2001
From: Oliver Braun <obr@openoffice.org>
Date: Mon, 19 Aug 2002 08:36:22 +0000
Subject: #102387# reimplemented actions for combobox and tree list items

---
 .../java/accessibility/AccessibleObjectFactory.java      | 16 +++++++---------
 .../bridge/org/openoffice/java/accessibility/makefile.mk |  6 +++---
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'accessibility')

diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java
index 641d094a8e30..8392c835e16f 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.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: obr $ $Date: 2002-08-16 13:13:08 $
+ *  last change: $Author: obr $ $Date: 2002-08-19 09:36:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -169,6 +169,8 @@ public class AccessibleObjectFactory {
                         );
                     break;
                 case AccessibleRole.COMBOBOX:
+                    o = new AccessibleComboBox(xAccessibleContext);
+                    break;
                 case AccessibleRole.LIST:
                 case AccessibleRole.MENUBAR:
                 case AccessibleRole.POPUPMENU:
@@ -179,8 +181,8 @@ public class AccessibleObjectFactory {
                     break;
                 case AccessibleRole.LABEL:
                 case AccessibleRole.TABLE_CELL:
-                    if((info.States & AccessibleState.TRANSIENT) == 0) {
-                        o = new AccessibleFixedText(info.IndexInParent);
+                    if((info.States & AccessibleState.TRANSIENT) != 0) {
+                        o = new AccessibleFixedText(info.IndexInParent, xAccessibleContext);
                     } else {
                         o = new AccessibleLabel(xAccessibleContext);
                     }
@@ -241,11 +243,7 @@ public class AccessibleObjectFactory {
                     o = new AccessibleEditLine(xAccessibleContext);
                     break;
                 case AccessibleRole.TREE:
-                    if((info.States & AccessibleState.CHILDREN_TRANSIENT) == 0) {
-                        o = new AccessibleTreeList(xAccessibleContext);
-                    } else {
-                        o = new AccessibleTreeListItem(xAccessibleContext, info.IndexInParent);
-                    }
+                    o = new AccessibleTreeList(xAccessibleContext);
                     break;
                 case AccessibleRole.CANVAS:
                 case AccessibleRole.DOCUMENT:
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
index 05bdd3b32ee9..4c3910932c21 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.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: obr $ $Date: 2002-08-16 13:13:09 $
+#   last change: $Author: obr $ $Date: 2002-08-19 09:36:22 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,6 +76,7 @@ JAVADIR = $(OUT)$/misc$/java
 JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar
 JAVAFILES = \
     AccessibleButton.java \
+    AccessibleComboBox.java \
     AccessibleContainer.java \
     AccessibleDescendantManager.java \
     AccessibleEditLine.java \
@@ -99,7 +100,6 @@ JAVAFILES = \
     AccessibleStateTypeMap.java \
     AccessibleTextTable.java \
     AccessibleTreeList.java \
-    AccessibleTreeListItem.java \
     AccessibleWindow.java \
     GenericAccessibleEditableText.java \
     GenericAccessibleExtendedTable.java \
-- 
cgit v1.2.3