INTEGRATION: CWS accessbugs01 (1.4.76); FILE MERGED

2004/09/10 10:19:33 obr 1.4.76.1: #i34056# Reworked AccessibleState mapping

3 files changed, 1 insertions, 53 deletions

diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Icon.java b/accessibility/bridge/org/openoffice/java/accessibility/Icon.java
index 44022e76ecb4..dcc6f163a144 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Icon.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Icon.java
@@ -102,19 +102,5 @@ public class Icon extends Component implements javax.accessibility.Accessible {
             return null;
         }
 
-        /**
-        * Get the state set of this object.
-        *
-        * @return an instance of AccessibleState containing the current state
-        * of the object
-        * @see AccessibleState
-        */
-
-        /*
-                        public AccessibleStateSet getAccessibleStateSet() {
-                                AccessibleStateSet states = super.getAccessibleStateSet();
-                                return states;
-                        }
-        */
     }
 }
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Label.java b/accessibility/bridge/org/openoffice/java/accessibility/Label.java
index f8d2dbb57b68..2aea23a9a152 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Label.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Label.java
@@ -108,21 +108,6 @@ public class Label extends Component implements javax.accessibility.Accessible {
             }
         }
 
-        /**
-        * Get the state set of this object.
-        *
-        * @return an instance of AccessibleState containing the current state
-        * of the object
-        * @see AccessibleState
-        */
-
-        /*
-                        public AccessibleStateSet getAccessibleStateSet() {
-                                AccessibleStateSet states = super.getAccessibleStateSet();
-                                return states;
-                        }
-        */
-
         /** Returns the relation set of this object */
         public javax.accessibility.AccessibleRelationSet getAccessibleRelationSet() {
             try {
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Paragraph.java b/accessibility/bridge/org/openoffice/java/accessibility/Paragraph.java
index 75f391b5d28a..0c62d23aec61 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Paragraph.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Paragraph.java
@@ -67,13 +67,8 @@ import com.sun.star.accessibility.*;
  */
 public class Paragraph extends Container implements javax.accessibility.Accessible {
 
-    boolean multiLine = false;
-    boolean editable = false;
-
-    protected Paragraph(XAccessible xAccessible, XAccessibleContext xAccessibleContext, XAccessibleStateSet xAccessibleStateSet) {
+    protected Paragraph(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
         super(javax.accessibility.AccessibleRole.TEXT, xAccessible, xAccessibleContext);
-        editable = xAccessibleStateSet.contains(AccessibleStateType.EDITABLE);
-        multiLine = xAccessibleStateSet.contains(AccessibleStateType.MULTI_LINE);
     }
 
     protected class AccessibleParagraphListener extends AccessibleContainerListener {
@@ -85,11 +80,9 @@ public class Paragraph extends Container implements javax.accessibility.Accessib
         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:
@@ -158,22 +151,6 @@ public class Paragraph extends Container implements javax.accessibility.Accessib
             accessibleText = AccessibleHypertextImpl.get(unoAccessibleContext);
         }
 
-        /** 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
         */