diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-24 17:14:27 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-24 17:14:27 +0000 |
commit | 50a1d6b43477442b6bd66851e27f646f2f30dda9 (patch) | |
tree | 5d7300815694ea2ab5a8ee55dab036c98a81ef25 | |
parent | 8dd206563fb0561b9b185915eb437b1bab316d40 (diff) |
INTEGRATION: CWS uaa02 (1.2.6); FILE MERGED
2003/04/11 15:35:03 mt 1.2.6.2: #108656# Moved accessibility from drafts to final
2003/04/11 11:01:03 obr 1.2.6.1: #108656# accessibility API moved from drafts to final
-rw-r--r-- | accessibility/bridge/org/openoffice/java/accessibility/Container.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Container.java b/accessibility/bridge/org/openoffice/java/accessibility/Container.java index 066264fde6e2..14881bf2fc29 100644 --- a/accessibility/bridge/org/openoffice/java/accessibility/Container.java +++ b/accessibility/bridge/org/openoffice/java/accessibility/Container.java @@ -62,7 +62,7 @@ import javax.accessibility.AccessibleRole; import javax.accessibility.AccessibleState; import com.sun.star.uno.*; -import drafts.com.sun.star.accessibility.*; +import com.sun.star.accessibility.*; public class Container extends java.awt.Container implements javax.accessibility.Accessible { @@ -306,35 +306,35 @@ public class Container extends java.awt.Container implements javax.accessibility /** Called by OpenOffice process to notify property changes */ public void notifyEvent(AccessibleEventObject event) { switch (event.EventId) { - case AccessibleEventId.ACCESSIBLE_NAME_EVENT: + case AccessibleEventId.NAME_CHANGED: // Set the accessible name for the corresponding context, which will fire a property // change event itself handleNameChangedEvent(event.NewValue); break; - case AccessibleEventId.ACCESSIBLE_DESCRIPTION_EVENT: + case AccessibleEventId.DESCRIPTION_CHANGED: // Set the accessible description for the corresponding context, which will fire a property // change event itself - so do not set propertyName ! handleDescriptionChangedEvent(event.NewValue); break; - case AccessibleEventId.ACCESSIBLE_STATE_EVENT: + case AccessibleEventId.STATE_CHANGED: // Update the internal state set and fire the appropriate PropertyChangedEvent handleStateChangedEvent(event.OldValue, event.NewValue); break; - case AccessibleEventId.ACCESSIBLE_CHILD_EVENT: + case AccessibleEventId.CHILD: if (AnyConverter.isObject(event.OldValue)) { AccessibleObjectFactory.removeChild(Container.this, event.OldValue); } else if (AnyConverter.isObject(event.NewValue)) { AccessibleObjectFactory.addChild(Container.this, event.NewValue); } break; - case AccessibleEventId.ACCESSIBLE_VISIBLE_DATA_EVENT: - case AccessibleEventId.ACCESSIBLE_BOUNDRECT_EVENT: + case AccessibleEventId.VISIBLE_DATA_CHANGED: + case AccessibleEventId.BOUNDRECT_CHANGED: firePropertyChange(AccessibleContext.ACCESSIBLE_VISIBLE_DATA_PROPERTY, null, null); break; - case AccessibleEventId.ACCESSIBLE_SELECTION_EVENT: + case AccessibleEventId.SELECTION_CHANGED: firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_SELECTION_PROPERTY, null, null); break; - case AccessibleEventId.ACCESSIBLE_ALL_CHILDREN_CHANGED_EVENT: + case AccessibleEventId.INVALIDATE_ALL_CHILDREN: handleAllChildrenChangedEvent(); break; @@ -454,7 +454,7 @@ public class Container extends java.awt.Container implements javax.accessibility dbgCheckSelectable(); } } - if (unoAS.contains(AccessibleStateType.MULTISELECTABLE)) { + if (unoAS.contains(AccessibleStateType.MULTI_SELECTABLE)) { states.add(AccessibleState.MULTISELECTABLE); } } @@ -708,7 +708,7 @@ public class Container extends java.awt.Container implements javax.accessibility public boolean contains(java.awt.Point p) { try { - return unoAccessibleComponent.contains(new com.sun.star.awt.Point(p.x, p.y)); + return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y)); } catch (com.sun.star.uno.RuntimeException e) { return false; } @@ -773,7 +773,7 @@ public class Container extends java.awt.Container implements javax.accessibility public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) { try { java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent( - unoAccessibleComponent.getAccessibleAt(new com.sun.star.awt.Point(p.x, p.y))); + unoAccessibleComponent.getAccessibleAtPoint(new com.sun.star.awt.Point(p.x, p.y))); return (javax.accessibility.Accessible) c; } catch (com.sun.star.uno.RuntimeException e) { |