summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-11-02 13:34:03 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-11-02 13:34:03 +0000
commitadc5883fd472009785c89c97c9a18debb6aacd80 (patch)
tree8304b55c2a189beb2ccc3efbf06e053fdd80c883
parent4e50e0b9e1141595f3645fb3e06a4eeebc9c5828 (diff)
INTEGRATION: CWS accessbugs01 (1.5.76); FILE MERGED
2004/09/10 10:19:34 obr 1.5.76.1: #i34056# Reworked AccessibleState mapping
-rw-r--r--accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java25
1 files changed, 1 insertions, 24 deletions
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java b/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java
index 49d07b9c0f4e..77b1b2d6c987 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java
@@ -64,13 +64,8 @@ import com.sun.star.accessibility.*;
*/
public class TextComponent extends Component implements javax.accessibility.Accessible {
- boolean multiLine = false;
- boolean editable = false;
-
- protected TextComponent(XAccessible xAccessible, XAccessibleContext xAccessibleContext, XAccessibleStateSet xAccessibleStateSet) {
+ protected TextComponent(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
super(xAccessible, xAccessibleContext);
- editable = xAccessibleStateSet.contains(AccessibleStateType.EDITABLE);
- multiLine = xAccessibleStateSet.contains(AccessibleStateType.MULTI_LINE);
}
protected class AccessibleTextComponentListener extends AccessibleUNOComponentListener {
@@ -82,11 +77,9 @@ public class TextComponent extends Component implements javax.accessibility.Acce
protected void setComponentState(short state, boolean enable) {
switch (state) {
case AccessibleStateType.EDITABLE:
- editable = enable;
fireStatePropertyChange(javax.accessibility.AccessibleState.EDITABLE, enable);
break;
case AccessibleStateType.MULTI_LINE:
- multiLine = enable;
fireStatePropertyChange(javax.accessibility.AccessibleState.MULTI_LINE, enable);
break;
case AccessibleStateType.SINGLE_LINE:
@@ -116,22 +109,6 @@ public class TextComponent extends Component implements javax.accessibility.Acce
super();
}
- /** Returns an AccessibleStateSet that contains corresponding Java states to the UAA state types */
- protected javax.accessibility.AccessibleStateSet getAccessibleStateSetImpl(XAccessibleStateSet unoAS) {
- javax.accessibility.AccessibleStateSet states = super.getAccessibleStateSetImpl(unoAS);
-
- if (editable) {
- states.add(javax.accessibility.AccessibleState.EDITABLE);
- }
- if (multiLine) {
- states.add(javax.accessibility.AccessibleState.MULTI_LINE);
- } else {
- states.add(javax.accessibility.AccessibleState.SINGLE_LINE);
- }
-
- return states;
- }
-
/*
* AccessibleContext
*/