INTEGRATION: CWS uaa02 (1.2.6); FILE MERGED

2003/04/11 11:01:10 obr 1.2.6.1: #108656# accessibility API moved from drafts to final

2 files changed, 6 insertions, 6 deletions

diff --git a/accessibility/bridge/org/openoffice/java/accessibility/ToolTip.java b/accessibility/bridge/org/openoffice/java/accessibility/ToolTip.java
index a47d6283ea43..ba8d95c08200 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/ToolTip.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/ToolTip.java
@@ -61,7 +61,7 @@ import javax.accessibility.AccessibleState;
 import javax.accessibility.AccessibleStateSet;
 
 import com.sun.star.uno.*;
-import drafts.com.sun.star.accessibility.*;
+import com.sun.star.accessibility.*;
 
 /**
  */
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Tree.java b/accessibility/bridge/org/openoffice/java/accessibility/Tree.java
index b53ff92d3677..c314df9d549e 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Tree.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Tree.java
@@ -62,7 +62,7 @@ import javax.accessibility.AccessibleState;
 
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.UnoRuntime;
-import drafts.com.sun.star.accessibility.*;
+import com.sun.star.accessibility.*;
 
 public class Tree extends DescendantManager implements javax.accessibility.Accessible {
 
@@ -133,10 +133,10 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
         /** Called by OpenOffice process to notify property changes */
         public void notifyEvent(AccessibleEventObject event) {
             switch (event.EventId) {
-                case AccessibleEventId.ACCESSIBLE_ACTIVE_DESCENDANT_EVENT:
+                case AccessibleEventId.ACTIVE_DESCENDANT_CHANGED:
                     setActiveDescendant(event.NewValue);
                     break;
-                case AccessibleEventId.ACCESSIBLE_CHILD_EVENT:
+                case AccessibleEventId.CHILD:
                     if (AnyConverter.isObject(event.OldValue)) {
                         remove(event.OldValue);
                     }
@@ -424,7 +424,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
                     if (unoAccessibleStateSet.contains(AccessibleStateType.SINGLE_LINE)) {
                         stateSet.add(javax.accessibility.AccessibleState.SINGLE_LINE);
                     }
-                    if (unoAccessibleStateSet.contains(AccessibleStateType.MULTILINE)) {
+                    if (unoAccessibleStateSet.contains(AccessibleStateType.MULTI_LINE)) {
                         stateSet.add(javax.accessibility.AccessibleState.MULTI_LINE);
                     }
                     if (unoAccessibleStateSet.contains(AccessibleStateType.SELECTABLE)) {
@@ -573,7 +573,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
             /** Removes the specified child of the object from the object's selection */
             public void removeAccessibleSelection(int i) {
                 try {
-                    unoAccessibleSelection.deselectSelectedAccessibleChild(i);
+                    unoAccessibleSelection.deselectAccessibleChild(i);
                 } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
                 } catch (com.sun.star.uno.RuntimeException e) {
                 }