#100000# no drafts anymore

68 files changed, 900 insertions, 699 deletions

diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java
index 9577a91e5208..a0ba1a0dbab8 100644
--- a/qadevOOo/runner/util/AccessibilityTools.java
+++ b/qadevOOo/runner/util/AccessibilityTools.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibilityTools.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change:$Date: 2003-04-25 13:18:55 $
+ *  last change:$Date: 2003-04-28 12:15:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -280,4 +280,4 @@ public class AccessibilityTools {
             (c1.getAccessibleParent(), c2.getAccessibleParent());
     }
 
-}
+}
\ No newline at end of file
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessible.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessible.java
index 5481fa0638b7..a45ad696fbb1 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessible.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessible.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XAccessible.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:07:26 $
+ *  last change:$Date: 2003-04-28 12:22:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,8 +61,8 @@
 
 package ifc.accessibility;
 
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
 import lib.MultiMethodTest;
 
 /**
@@ -76,11 +76,11 @@ import lib.MultiMethodTest;
 public class _XAccessible extends MultiMethodTest {
 
     private static final String className =
-        "drafts.com.sun.star.accessibility.XAccessible" ;
+        "com.sun.star.accessibility.XAccessible" ;
 
     public XAccessible oObj = null;
 
-    // temporary while accessibility package is in drafts.com.sun.star
+    // temporary while accessibility package is in com.sun.star
     protected String getTestedClassName() {
         return className;
     }
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java
index 3cf587816ca5..120f3262015f 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XAccessibleAction.java,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change:$Date: 2003-03-26 14:54:56 $
+ *  last change:$Date: 2003-04-28 12:22:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,14 +62,14 @@
 package ifc.accessibility;
 
 import lib.MultiMethodTest;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.accessibility.XAccessibleAction;
 
 public class _XAccessibleAction extends lib.MultiMethodTest {
 
      private static final String className =
-        "drafts.com.sun.star.accessibility.XAccessibleAction";
+        "com.sun.star.accessibility.XAccessibleAction";
 
-    // temporary while accessibility package is in drafts.com.sun.star
+    // temporary while accessibility package is in com.sun.star
     protected String getTestedClassName() {
         return className;
     }
@@ -110,7 +110,12 @@ public class _XAccessibleAction extends lib.MultiMethodTest {
         }
 
         try {
-            boolean act = oObj.doAccessibleAction(0);
+            boolean act = false;
+            for (int i = 0; i< count; i++) {
+                log.println("do Action "+ oObj.getAccessibleActionDescription(i));
+                act = oObj.doAccessibleAction(i);
+                log.println("Worked: "+act);
+            }
             log.println("Did action: "+act);
             res &= act ;
         } catch (com.sun.star.lang.IndexOutOfBoundsException ioe) {
@@ -182,8 +187,10 @@ public class _XAccessibleAction extends lib.MultiMethodTest {
         for (int i=0;i<count;i++) {
             try {
                 Object key = oObj.getAccessibleKeyBinding(i);
-                log.println("Found key: "+key.toString());
-                res &= key!=null ;
+                if (key != null ) {
+                    log.println("Found key: "+key.toString());
+                }
+                res &= true;
             } catch (com.sun.star.lang.IndexOutOfBoundsException ioe) {
                 log.println("Unexepected exception -- FAILED");
                 res &= false;
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
index b3f5c853c281..ee1154f3c4cf 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XAccessibleComponent.java,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change:$Date: 2003-03-26 14:54:56 $
+ *  last change:$Date: 2003-04-28 12:22:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,18 +65,18 @@ import com.sun.star.awt.Point;
 import com.sun.star.awt.Rectangle;
 import com.sun.star.awt.Size;
 import com.sun.star.uno.UnoRuntime;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleContext;
 import java.util.Vector;
 import lib.MultiMethodTest;
 
 /**
- * Testing <code>drafts.com.sun.star.accessibility.XAccessibleComponent</code>
+ * Testing <code>com.sun.star.accessibility.XAccessibleComponent</code>
  * interface methods :
  * <ul>
- *  <li><code> contains()</code></li>
- *  <li><code> getAccessibleAt()</code></li>
+ *  <li><code> containsPoint()</code></li>
+ *  <li><code> getAccessibleAtPoint()</code></li>
  *  <li><code> getBounds()</code></li>
  *  <li><code> getLocation()</code></li>
  *  <li><code> getLocationOnScreen()</code></li>
@@ -85,7 +85,7 @@ import lib.MultiMethodTest;
  *  <li><code> getAccessibleKeyBinding()</code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleComponent
  */
 public class _XAccessibleComponent extends MultiMethodTest {
 
@@ -95,7 +95,7 @@ public class _XAccessibleComponent extends MultiMethodTest {
     private Vector KnownBounds = new Vector() ;
 
     private static final String className =
-        "drafts.com.sun.star.accessibility.XAccessibleComponent" ;
+        "com.sun.star.accessibility.XAccessibleComponent" ;
 
     /**
      * Walkaround for current interface naming ('drafts' prefix)
@@ -119,79 +119,79 @@ public class _XAccessibleComponent extends MultiMethodTest {
      *  <li> <code> getBounds() </code> : to have size of a component.</li>
      * </ul>
      */
-    public void _contains() {
+    public void _containsPoint() {
         requiredMethod("getBounds()");
 
         boolean result = true ;
 
         int curX = 0;
-        //while (!oObj.contains(new Point(curX, bounds.Y)) && curX < bounds.Width+bounds.X) {
-        while (!oObj.contains(new Point(curX, 0)) && curX < bounds.Width) {
+        //while (!oObj.containsPoint(new Point(curX, bounds.Y)) && curX < bounds.Width+bounds.X) {
+        while (!oObj.containsPoint(new Point(curX, 0)) && curX < bounds.Width) {
             curX++;
         };
         //if ((bounds.X <= curX) && (curX < bounds.Width+bounds.X)) {
         if (curX < bounds.Width) {
-            log.println("Upper bound of box contains point ("
+            log.println("Upper bound of box containsPoint point ("
                 + curX + ",0) - OK");
         } else {
             log.println
-                ("Upper bound of box contains no component points - FAILED");
+                ("Upper bound of box containsPoint no component points - FAILED");
             result = false;
         }
 
         curX = 0;
-        //while (!oObj.contains(new Point(curX, bounds.Y+bounds.Height - 1))
-        while (!oObj.contains(new Point(curX, bounds.Height - 1))
+        //while (!oObj.containsPoint(new Point(curX, bounds.Y+bounds.Height - 1))
+        while (!oObj.containsPoint(new Point(curX, bounds.Height - 1))
                && curX < bounds.Width) {
 
-               log.println("Contains returns false for ("+curX+","+bounds.Height+")");
+               log.println("containsPoint returns false for ("+curX+","+bounds.Height+")");
             curX++;
         };
         //if ((bounds.X <= curX) && (curX < bounds.Width+bounds.X)) {
         if (curX < bounds.Width) {
-            log.println("Lower bound of box contains point ("
+            log.println("Lower bound of box containsPoint point ("
                 + curX + "," + (bounds.Height - 1) + ") - OK");
         } else {
             log.println
-                ("Lower bound of box contains no component points - FAILED");
+                ("Lower bound of box containsPoint no component points - FAILED");
             result = false;
         }
 
         int curY = 0;
-        //while (!oObj.contains(new Point(bounds.X, curY)) && curY < bounds.Height+bounds.Y) {
-        while (!oObj.contains(new Point(0, curY)) && curY < bounds.Height) {
+        //while (!oObj.containsPoint(new Point(bounds.X, curY)) && curY < bounds.Height+bounds.Y) {
+        while (!oObj.containsPoint(new Point(0, curY)) && curY < bounds.Height) {
             curY++;
         };
         //if ((bounds.Y <= curY) && (curY < bounds.Height+bounds.Y)) {
         if (curY < bounds.Height) {
-            log.println("Left bound of box contains point (0,"
+            log.println("Left bound of box containsPoint point (0,"
                 + curY + ") - OK");
         } else {
             log.println
-                ("Left bound of box contains no component points - FAILED");
+                ("Left bound of box containsPoint no component points - FAILED");
             result = false;
         }
 
         curY = 0;
-        //while (!oObj.contains(new Point(bounds.X+bounds.Width - 1, curY))
+        //while (!oObj.containsPoint(new Point(bounds.X+bounds.Width - 1, curY))
         //       && curY < bounds.Height+bounds.Y) {
-        while (!oObj.contains(new Point(bounds.Width - 1, curY)) && curY < bounds.Height) {
+        while (!oObj.containsPoint(new Point(bounds.Width - 1, curY)) && curY < bounds.Height) {
             curY++;
         };
         //if ((bounds.Y <= curY) && (curY < bounds.Height + bounds.Y)) {
         if (curY < bounds.Height) {
-            log.println("Right bound of box contains point ("
+            log.println("Right bound of box containsPoint point ("
                 + (bounds.Width - 1) + "," + curY + ") - OK");
         } else {
             log.println
-                ("Right bound of box contains no component points - FAILED");
+                ("Right bound of box containsPoint no component points - FAILED");
             result = false;
         }
 
         boolean locRes = true;
         for (int x = -1; x <= bounds.Width; x++) {
-            locRes &= !oObj.contains(new Point(x, -1));
-            locRes &= !oObj.contains(new Point(x, bounds.Height+bounds.Y));
+            locRes &= !oObj.containsPoint(new Point(x, -1));
+            locRes &= !oObj.containsPoint(new Point(x, bounds.Height+bounds.Y));
         }
         if (locRes) {
             log.println("Outer upper and lower bounds contain no component "
@@ -204,8 +204,8 @@ public class _XAccessibleComponent extends MultiMethodTest {
 
         locRes = true;
         for (int y = -1; y <= bounds.Height; y++) {
-            locRes &= !oObj.contains(new Point(-1, y));
-            locRes &= !oObj.contains(new Point(bounds.X+bounds.Width, y));
+            locRes &= !oObj.containsPoint(new Point(-1, y));
+            locRes &= !oObj.containsPoint(new Point(bounds.X+bounds.Width, y));
         }
         if (locRes) {
             log.println("Outer left and right bounds contain no component "
@@ -216,13 +216,13 @@ public class _XAccessibleComponent extends MultiMethodTest {
             result = false;
         }
 
-        tRes.tested("contains()", result) ;
+        tRes.tested("containsPoint()", result) ;
     }
 
     /**
      * Iterates through all children which implement
      * <code>XAccessibleComponent</code> (if they exist) determines their
-     * boundaries and tries to get each child by <code>getAccessibleAt</code>
+     * boundaries and tries to get each child by <code>getAccessibleAtPoint</code>
      * passing point which belongs to the child.
      * Also the point is checked which doesn't belong to child boundary
      * box. <p>
@@ -231,7 +231,7 @@ public class _XAccessibleComponent extends MultiMethodTest {
      * are returned, and in the second <code>null</code> or
      * another child is returned.
      */
-    public void _getAccessibleAt() {
+    public void _getAccessibleAtPoint() {
 
         boolean result = true ;
         XAccessibleComponent[] children = getChildrenComponents();
@@ -245,8 +245,20 @@ public class _XAccessibleComponent extends MultiMethodTest {
                     + chBnd.Width + "," + chBnd.Height + "): "
                     +  util.AccessibilityTools.accessibleToString(children[i]));
 
+                XAccessibleContext xAc = (XAccessibleContext)
+                    UnoRuntime.queryInterface(XAccessibleContext.class, children[i]) ;
+
+                boolean isShowing = xAc.getAccessibleStateSet().contains(
+                        com.sun.star.accessibility.AccessibleStateType.SHOWING);
+                log.println("\tStateType containsPoint SHOWING: "+isShowing);
+
+                if (!isShowing) {
+                    log.println("Child is invisible - OK");
+                    continue;
+                }
+
                 String pos = "(" + chBnd.X + "," + chBnd.Y + ")";
-                if (KnownBounds.contains(pos)) {
+                if (KnownBounds.contains(pos) && isShowing) {
                     log.println("Child is covered by another and can't be reached");
                     continue;
                 }
@@ -256,52 +268,74 @@ public class _XAccessibleComponent extends MultiMethodTest {
                 log.println("finding the point which lies on the component");
                 int curX = chBnd.Width;
                 int curY = chBnd.Height/2;
-                while (!children[i].contains(new Point(curX, curY))
+                while (!children[i].containsPoint(new Point(curX, curY))
                        && curX > 0 && curY > 0) {
                     curX--;
                     curY--;
                 };
 
-                if (curX==chBnd.Width) {
-                    log.println("Couldn't find a point with contains");
+                if (curX==chBnd.Width && isShowing) {
+                    log.println("Couldn't find a point with containsPoint");
                     continue;
                 }
 
                 // trying the point laying on child
-                XAccessible xAcc = oObj.getAccessibleAt
+                XAccessible xAcc = oObj.getAccessibleAtPoint
                     (new Point(chBnd.X +curX, chBnd.Y+curY));
                 if (xAcc == null) {
                     log.println("The child not found at point ("
                         + (chBnd.X +curX ) + "," + (chBnd.Y+curY) + ") - FAILED");
-                    result = false;
+                    if (!isShowing) {
+                        result = false;
+                    } else result = true;
                 } else {
                     XAccessible xAccCh = (XAccessible) UnoRuntime.queryInterface
                         (XAccessible.class, children[i]);
+                    XAccessibleContext xAccC = (XAccessibleContext) UnoRuntime.queryInterface
+                        (XAccessibleContext.class, children[i]);
                     log.println("Child found at point ("
                         + (chBnd.X +curX) + "," + (chBnd.Y+curY) + ") - OK");
-                    boolean res = util.AccessibilityTools.equals(xAccCh, xAcc);
+                    boolean res = false;
+                    int expIndex;
+                    String expName;
+                    String expDesc;
+                    if (xAccCh != null) {
+                        res = util.AccessibilityTools.equals(xAccCh, xAcc);
+                        expIndex = xAccCh.getAccessibleContext().getAccessibleIndexInParent();
+                        expName = xAccCh.getAccessibleContext().getAccessibleName();
+                        expDesc = xAccCh.getAccessibleContext().getAccessibleDescription();
+                    } else {
+                        res = xAccC.getAccessibleName().equals(
+                                xAcc.getAccessibleContext().getAccessibleName());
+                        expIndex = xAccC.getAccessibleIndexInParent();
+                        expName = xAccC.getAccessibleName();
+                        expDesc = xAccC.getAccessibleDescription();
+                    }
                     if (!res) {
-                        int expIndex = xAccCh.getAccessibleContext().getAccessibleIndexInParent();
                         int gotIndex = xAcc.getAccessibleContext().getAccessibleIndexInParent();
                         if (expIndex < gotIndex) {
                             log.println("The children found is not the same");
                             log.println("The expected child " +
-                                xAccCh.getAccessibleContext().getAccessibleName());
+                                expName);
                             log.print("is hidden behind the found Child ");
                             log.println(xAcc.getAccessibleContext().getAccessibleName()+" - OK");
                         } else {
                             log.println("The children found is not the same - FAILED");
                             log.println("Expected: "
-                                +xAccCh.getAccessibleContext().getAccessibleName());
+                                +expName);
+                            log.println("Description:  " +
+                                expDesc);
                             log.println("Found: "
                                 +xAcc.getAccessibleContext().getAccessibleName());
+                            log.println("Description:  " +
+                                xAcc.getAccessibleContext().getAccessibleDescription());
                             result = false ;
                         }
                     }
                 }
 
                 // trying the point NOT laying on child
-                xAcc = oObj.getAccessibleAt
+                xAcc = oObj.getAccessibleAtPoint
                     (new Point(chBnd.X - 1, chBnd.Y - 1));
                 if (xAcc == null) {
                     log.println("No children found at point ("
@@ -313,7 +347,7 @@ public class _XAccessibleComponent extends MultiMethodTest {
                     boolean res = util.AccessibilityTools.equals(xAccCh, xAcc);
                     if (res) {
                         log.println("The same child found outside "
-                            + "its bounds - FAILED");
+                            + "its bounds at ("+(chBnd.X - 1) +","+ (chBnd.Y - 1)+") - FAILED");
                         result = false ;
                     }
                 }
@@ -323,7 +357,7 @@ public class _XAccessibleComponent extends MultiMethodTest {
                 + "XAccessibleComponent");
         }
 
-        tRes.tested("getAccessibleAt()", result) ;
+        tRes.tested("getAccessibleAtPoint()", result) ;
     }
 
     /**
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java
index ff9a704b02a6..5dea8137f5d2 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XAccessibleContext.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-01-30 14:07:53 $
+ *  last change:$Date: 2003-04-28 12:22:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,17 +62,17 @@
 package ifc.accessibility;
 
 import com.sun.star.lang.Locale;
-import drafts.com.sun.star.accessibility.IllegalAccessibleComponentStateException;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleRelationSet;
-import drafts.com.sun.star.accessibility.XAccessibleStateSet;
-import drafts.com.sun.star.accessibility.AccessibleRelationType;
+import com.sun.star.accessibility.IllegalAccessibleComponentStateException;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleRelationSet;
+import com.sun.star.accessibility.XAccessibleStateSet;
+import com.sun.star.accessibility.AccessibleRelationType;
 import lib.MultiMethodTest;
 import util.AccessibilityTools;
 
 /**
- * Testing <code>drafts.com.sun.star.accessibility.XAccessibleContext</code>
+ * Testing <code>com.sun.star.accessibility.XAccessibleContext</code>
  * interface methods :
  * <ul>
  *  <li><code> getAccessibleChildCount()</code></li>
@@ -87,16 +87,16 @@ import util.AccessibilityTools;
  *  <li><code> getLocale()</code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleContext
  */
 public class _XAccessibleContext extends MultiMethodTest {
 
     private static final String className =
-        "drafts.com.sun.star.accessibility.XAccessibleContext" ;
+        "com.sun.star.accessibility.XAccessibleContext" ;
 
     public XAccessibleContext oObj = null;
 
-    // temporary while accessibility package is in drafts.com.sun.star
+    // temporary while accessibility package is in com.sun.star
     protected String getTestedClassName() {
         return className;
     }
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java
index 3b42c494da8d..f9197361fe0b 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XAccessibleEditableText.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:07:24 $
+ *  last change:$Date: 2003-04-28 12:22:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,7 @@
 package ifc.accessibility;
 
 import lib.MultiMethodTest;
-import drafts.com.sun.star.accessibility.XAccessibleEditableText;
+import com.sun.star.accessibility.XAccessibleEditableText;
 import com.sun.star.beans.PropertyValue;
 import util.ValueComparer;
 import util.ValueChanger;
@@ -96,11 +96,11 @@ import util.ValueChanger;
  */
 public class _XAccessibleEditableText extends MultiMethodTest {
     private static final String className =
-        "drafts.com.sun.star.accessibility.XAccessibleEditableText" ;
+        "com.sun.star.accessibility.XAccessibleEditableText" ;
 
     public XAccessibleEditableText oObj = null;
 
-    // temporary while accessibility package is in drafts.com.sun.star
+    // temporary while accessibility package is in com.sun.star
     protected String getTestedClassName() {
         return className;
     }
@@ -483,7 +483,7 @@ public class _XAccessibleEditableText extends MultiMethodTest {
         PropertyValue[] attrs = null;
 
         try {
-            attrs = oObj.getCharacterAttributes(0);
+            attrs = oObj.getCharacterAttributes(0, new String[]{""});
             log.print("setAttributes(-1," + (length - 1) + "):");
             locRes = oObj.setAttributes(-1, length - 1, attrs);
             log.println(locRes);
@@ -520,7 +520,7 @@ public class _XAccessibleEditableText extends MultiMethodTest {
                 || (!changeableAttr && !locRes);
             if (changeableAttr) {
                 log.print("checking that new attributes was set...");
-                PropertyValue[] newAttrs = oObj.getCharacterAttributes(0);
+                PropertyValue[] newAttrs = oObj.getCharacterAttributes(0, new String[]{""});
                 locRes = ValueComparer.equalValue(attrs, newAttrs);
                 log.println(locRes);
                 res &= locRes;
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
index 6ed634bcff2a..70122d4a90ae 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XAccessibleEventBroadcaster.java,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change:$Date: 2003-03-26 14:54:56 $
+ *  last change:$Date: 2003-04-28 12:22:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,11 +62,11 @@
 package ifc.accessibility;
 
 import com.sun.star.lang.EventObject;
-import drafts.com.sun.star.accessibility.AccessibleEventObject;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster;
-import drafts.com.sun.star.accessibility.XAccessibleEventListener;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleEventBroadcaster;
+import com.sun.star.accessibility.XAccessibleEventListener;
+import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.uno.UnoRuntime;
 import lib.MultiMethodTest;
 import lib.Status;
@@ -74,7 +74,7 @@ import lib.StatusException;
 
 /**
  * Testing <code>
- * drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster</code>
+ * com.sun.star.accessibility.XAccessibleEventBroadcaster</code>
  * interface methods :
  * <ul>
  *  <li><code> addEventListener()</code></li>
@@ -89,7 +89,7 @@ import lib.StatusException;
  *   some actions for generating any kind of <code>AccessibleEvent</code></li>
  * <ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
  */
 public class _XAccessibleEventBroadcaster extends MultiMethodTest {
 
@@ -98,12 +98,13 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
     }
 
     private static final String className =
-    "drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster" ;
+    "com.sun.star.accessibility.XAccessibleEventBroadcaster" ;
 
     public XAccessibleEventBroadcaster oObj = null;
     public String EventMsg = "";
+    public boolean destroy = false;
 
-    // temporary while accessibility package is in drafts.com.sun.star
+    // temporary while accessibility package is in com.sun.star
     protected String getTestedClassName() {
         return className;
     }
@@ -117,12 +118,12 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
             log.println("Listener, Event : " + ev.EventId);
             System.out.println("EventID: " + ev.EventId);
             Object old=ev.OldValue;
-            if (old instanceof drafts.com.sun.star.accessibility.XAccessible) {
+            if (old instanceof com.sun.star.accessibility.XAccessible) {
                 System.out.println("Old: "+((XAccessible)old).getAccessibleContext().getAccessibleName());
             }
 
             Object nev=ev.NewValue;
-            if (nev instanceof drafts.com.sun.star.accessibility.XAccessible) {
+            if (nev instanceof com.sun.star.accessibility.XAccessible) {
                 System.out.println("New: "+((XAccessible)nev).getAccessibleContext().getAccessibleName());
             }
             notifiedEvent = ev;
@@ -141,6 +142,10 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
             throw new StatusException(Status.failed("Relation missed."));
         }
         EventMsg = (String) tEnv.getObjRelation("EventMsg");
+        Object dp = tEnv.getObjRelation("Destroy");
+        if (dp != null) {
+            destroy=true;
+        }
     }
 
     EventProducer prod = null ;
@@ -151,14 +156,14 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
      * Has <b> OK </b> status if both listeners were called
      */
     public void _addEventListener() {
-        log.println("adding two listeners");
+        log.println("adding listener");
         oObj.addEventListener(list);
         boolean isTransient = chkTransient(tEnv.getTestObject());
         log.println("fire event");
         prod.fireEvent() ;
 
         try {
-            Thread.sleep(1500);
+            Thread.sleep(3000);
         }
         catch (InterruptedException ex) {
         }
@@ -200,7 +205,7 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
 
         list.notifiedEvent = null;
 
-        log.println("remove first listener");
+        log.println("remove listener");
         oObj.removeEventListener(list);
 
         log.println("fire event");
@@ -225,9 +230,9 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
         XAccessibleContext accCon = (XAccessibleContext)
                     UnoRuntime.queryInterface(XAccessibleContext.class,Testcase);
         if (accCon.getAccessibleStateSet().contains(
-            drafts.com.sun.star.accessibility.AccessibleStateType.TRANSIENT)){
+            com.sun.star.accessibility.AccessibleStateType.TRANSIENT)){
             if (!accCon.getAccessibleParent().getAccessibleContext().getAccessibleStateSet().contains(
-                drafts.com.sun.star.accessibility.AccessibleStateType.MANAGES_DESCENDANT)) {
+                com.sun.star.accessibility.AccessibleStateType.MANAGES_DESCENDANTS)) {
                 throw new lib.StatusException(lib.Status.failed("Parent doesn't manage descendents"));
             }
             ret=true;
@@ -239,7 +244,7 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
     * Forces environment recreation.
     */
     protected void after() {
-        disposeEnvironment();
+        if (destroy) disposeEnvironment();
     }
 
 
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java
index 52e3934ea7bd..d918bb36b77b 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XAccessibleExtendedComponent.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:07:24 $
+ *  last change:$Date: 2003-04-28 12:22:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,9 +62,9 @@
 package ifc.accessibility;
 
 import lib.MultiMethodTest;
-import drafts.com.sun.star.accessibility.XAccessibleExtendedComponent;
-import drafts.com.sun.star.accessibility.XAccessibleStateSet;
-import drafts.com.sun.star.accessibility.AccessibleStateType;
+import com.sun.star.accessibility.XAccessibleExtendedComponent;
+import com.sun.star.accessibility.XAccessibleStateSet;
+import com.sun.star.accessibility.AccessibleStateType;
 import com.sun.star.awt.XFont;
 import com.sun.star.uno.UnoRuntime;
 
@@ -83,11 +83,11 @@ import com.sun.star.uno.UnoRuntime;
  */
 public class _XAccessibleExtendedComponent extends MultiMethodTest {
     private static final String className =
-        "drafts.com.sun.star.accessibility.XAccessibleExtendedComponent" ;
+        "com.sun.star.accessibility.XAccessibleExtendedComponent" ;
 
     public XAccessibleExtendedComponent oObj = null;
 
-    // temporary while accessibility package is in drafts.com.sun.star
+    // temporary while accessibility package is in com.sun.star
     protected String getTestedClassName() {
         return className;
     }
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleImage.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleImage.java
index ab1a2b7668a8..1020446bf437 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleImage.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleImage.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XAccessibleImage.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:07:23 $
+ *  last change:$Date: 2003-04-28 12:22:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,7 @@
 package ifc.accessibility;
 
 import lib.MultiMethodTest;
-import drafts.com.sun.star.accessibility.XAccessibleImage;
+import com.sun.star.accessibility.XAccessibleImage;
 
 /**
  * Testing <code>com.sun.star.accessibility.XAccessibleImage</code>
@@ -76,11 +76,11 @@ import drafts.com.sun.star.accessibility.XAccessibleImage;
  */
 public class _XAccessibleImage extends MultiMethodTest {
     private static final String className =
-        "drafts.com.sun.star.accessibility.XAccessibleImage";
+        "com.sun.star.accessibility.XAccessibleImage";
 
     public XAccessibleImage oObj = null;
 
-    // temporary while accessibility package is in drafts.com.sun.star
+    // temporary while accessibility package is in com.sun.star
     protected String getTestedClassName() {
         return className;
     }
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
index 63594610c8dd..8b24143ff447 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XAccessibleSelection.java,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change:$Date: 2003-03-26 14:54:56 $
+ *  last change:$Date: 2003-04-28 12:22:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,12 +62,12 @@
 package ifc.accessibility;
 
 import lib.MultiMethodTest;
-import drafts.com.sun.star.accessibility.XAccessibleSelection;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleSelection;
+import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.uno.UnoRuntime;
 import lib.Status;
 import lib.StatusException;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 
 /**
  * Testing <code>com.sun.star.accessibility.XAccessibleSelection</code>
@@ -79,7 +79,7 @@ import drafts.com.sun.star.accessibility.XAccessible;
  *  <li><code>selectAllAccessible()</code></li>
  *  <li><code>getSelectedAccessibleChildCount()</code></li>
  *  <li><code>getSelectedAccessibleChild()</code></li>
- *  <li><code>deselectSelectedAccessibleChild()</code></li>
+ *  <li><code>deselectAccessibleChild()</code></li>
  * </ul> <p>
  *
  * This test needs the following object relations :
@@ -95,9 +95,9 @@ import drafts.com.sun.star.accessibility.XAccessible;
  */
 public class _XAccessibleSelection extends MultiMethodTest {
     private static final String className =
-        "drafts.com.sun.star.accessibility.XAccessibleSelection";
+        "com.sun.star.accessibility.XAccessibleSelection";
 
-    // temporary while accessibility package is in drafts.com.sun.star
+    // temporary while accessibility package is in com.sun.star
     protected String getTestedClassName() {
         return className;
     }
@@ -111,7 +111,7 @@ public class _XAccessibleSelection extends MultiMethodTest {
     /**
      * Retrieves the interface <code>XAccessibleContext</code>
      * and object relation.
-     * @see drafts.com.sun.star.accessibility.XAccessibleContext
+     * @see com.sun.star.accessibility.XAccessibleContext
      * @see ifc.accessibility.XAccessibleContext
      */
     protected void before() {
@@ -161,10 +161,23 @@ public class _XAccessibleSelection extends MultiMethodTest {
             res &= true;
         }
 
-        if (childCount > 0) {
+        log.println("ChildCount: "+childCount);
+        int usedChilds = childCount;
+
+        if (childCount > 500) {
+            log.println("Restricting to 500");
+            usedChilds = 500;
+        }
+
+        if (usedChilds > 0) {
             try {
-                log.println("Select child with index " + (childCount-1));
-                oObj.selectAccessibleChild(childCount - 1);
+                for (int i=0;i<usedChilds;i++) {
+                    log.println("Trying to select child with index " + (i));
+                    if (isSelectable(tEnv.getTestObject(),i)) {
+                        oObj.selectAccessibleChild(i);
+                        log.println("OK");
+                    } else log.println("Child isn't selectable");
+                }
                 res &= true;
             } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
                 log.println("Unexpected exception");
@@ -209,9 +222,14 @@ public class _XAccessibleSelection extends MultiMethodTest {
             res &= true;
         }
 
-        if (childCount > 0) {
+        int SelectableChildCount = chkSelectable(tEnv.getTestObject());
+
+        log.println("SelectableChildCount: "+SelectableChildCount);
+
+        if (SelectableChildCount > 0) {
             try {
-                log.print("isAccessibleChildSelected(" + (childCount-1)+ ")? ");
+                oObj.selectAllAccessible();
+                log.println("isAccessibleChildSelected(" + (childCount-1)+ ")? ");
                 isSelected = oObj.isAccessibleChildSelected(childCount - 1);
                 log.println(isSelected);
                 res &= isSelected;
@@ -276,7 +294,9 @@ public class _XAccessibleSelection extends MultiMethodTest {
         boolean res = true;
         boolean isSelected = true;
 
-        if (childCount > 0 && multiSelection) {
+        int SelectableChildCount = chkSelectable(tEnv.getTestObject());
+
+        if (SelectableChildCount > 0 && multiSelection) {
             try {
                 log.print("isAccessibleChildSelected(1)? ");
                 isSelected = oObj.isAccessibleChildSelected(1);
@@ -364,7 +384,9 @@ public class _XAccessibleSelection extends MultiMethodTest {
             res &= true;
         }
 
-        if (childCount > 0) {
+        int SelectableChildCount = chkSelectable(tEnv.getTestObject());
+
+        if (SelectableChildCount > 0) {
             try {
                 log.println("selectAccessibleChild(" + (childCount-1) + ")");
                 oObj.selectAccessibleChild(childCount - 1);
@@ -388,7 +410,7 @@ public class _XAccessibleSelection extends MultiMethodTest {
      * with correct index and if number of selected child was
      * decreased after the correct call.
      */
-    public void _deselectSelectedAccessibleChild() {
+    public void _deselectAccessibleChild() {
         executeMethod("getSelectedAccessibleChild()");
 
         boolean res = true;
@@ -396,8 +418,8 @@ public class _XAccessibleSelection extends MultiMethodTest {
         log.println("getSelectedAccessibleChildCount():" + selCount);
 
         try {
-            log.println("deselectSelectedAccessibleChild(-1)");
-            oObj.deselectSelectedAccessibleChild(-1);
+            log.println("deselectAccessibleChild(-1)");
+            oObj.deselectAccessibleChild(-1);
             log.println("Exception was expected");
             res = false;
         } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
@@ -406,8 +428,8 @@ public class _XAccessibleSelection extends MultiMethodTest {
         }
 
         try {
-            log.println("deselectSelectedAccessibleChild(" +(childCount+1) + ")");
-            oObj.deselectSelectedAccessibleChild(childCount + 1);
+            log.println("deselectAccessibleChild(" +(childCount+1) + ")");
+            oObj.deselectAccessibleChild(childCount + 1);
             log.println("Exception was expected");
             res = false;
         } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
@@ -421,8 +443,8 @@ public class _XAccessibleSelection extends MultiMethodTest {
 
         if (childCount > 0 && selCount > 0) {
             try {
-                log.println("deselectSelectedAccessibleChild(" +(selCount-1) + ")");
-                oObj.deselectSelectedAccessibleChild(selCount-1);
+                log.println("deselectAccessibleChild(" +(selCount-1) + ")");
+                oObj.deselectAccessibleChild(selCount-1);
                 int newSelCount = oObj.getSelectedAccessibleChildCount();
                 log.println("getSelectedAccessibleChildCount():" + newSelCount);
                 res &= (selCount > newSelCount);
@@ -433,7 +455,7 @@ public class _XAccessibleSelection extends MultiMethodTest {
             }
         }
 
-        tRes.tested("deselectSelectedAccessibleChild()", res);
+        tRes.tested("deselectAccessibleChild()", res);
     }
 
     protected static int chkSelectable(Object Testcase) {
@@ -445,7 +467,7 @@ public class _XAccessibleSelection extends MultiMethodTest {
         for (int i=0;i<cc;i++) {
             try {
                 if (accCon.getAccessibleChild(i).getAccessibleContext().getAccessibleStateSet().contains(
-                    drafts.com.sun.star.accessibility.AccessibleStateType.SELECTABLE)){
+                    com.sun.star.accessibility.AccessibleStateType.SELECTABLE)){
                     ret = ret + 1;
                 }
             } catch (com.sun.star.lang.IndexOutOfBoundsException iab) {}
@@ -453,6 +475,21 @@ public class _XAccessibleSelection extends MultiMethodTest {
         return ret;
     }
 
+    protected static boolean isSelectable(Object Testcase, int index) {
+        XAccessibleContext accCon = (XAccessibleContext)
+                    UnoRuntime.queryInterface(XAccessibleContext.class,Testcase);
+        boolean res = false;
+        try {
+            if (accCon.getAccessibleChild(index).getAccessibleContext().getAccessibleStateSet().contains(
+                com.sun.star.accessibility.AccessibleStateType.SELECTABLE)){
+                res=true;
+            }
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            System.out.println("Exception while checking for selectability");
+        }
+        return res;
+    }
+
     private void shortWait() {
         try {
             Thread.sleep(500);
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java
index 7d7c645fe33c..3d398431aea7 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XAccessibleTable.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:07:22 $
+ *  last change:$Date: 2003-04-28 12:22:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,10 +62,10 @@
 package ifc.accessibility;
 
 import lib.MultiMethodTest;
-import drafts.com.sun.star.accessibility.XAccessibleTable;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleSelection;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleTable;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleSelection;
+import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.uno.UnoRuntime;
 
 /**
@@ -96,9 +96,9 @@ import com.sun.star.uno.UnoRuntime;
  */
 public class _XAccessibleTable extends MultiMethodTest {
     private static final String className =
-        "drafts.com.sun.star.accessibility.XAccessibleTable";
+        "com.sun.star.accessibility.XAccessibleTable";
 
-    // temporary while accessibility package is in drafts.com.sun.star
+    // temporary while accessibility package is in com.sun.star
     protected String getTestedClassName() {
         return className;
     }
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
index a83a77bd1254..22553d1fa359 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XAccessibleText.java,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change:$Date: 2003-03-31 14:26:41 $
+ *  last change:$Date: 2003-04-28 12:22:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,8 +61,8 @@
 
 package ifc.accessibility;
 
-import drafts.com.sun.star.accessibility.XAccessibleText;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleText;
+import com.sun.star.accessibility.XAccessibleComponent;
 import lib.MultiMethodTest;
 import lib.StatusException;
 import lib.Status;
@@ -70,7 +70,7 @@ import com.sun.star.beans.PropertyValue;
 import com.sun.star.awt.Rectangle;
 import com.sun.star.awt.Point;
 import com.sun.star.uno.UnoRuntime;
-import drafts.com.sun.star.accessibility.AccessibleTextType;
+import com.sun.star.accessibility.AccessibleTextType;
 
 /**
  * Testing <code>com.sun.star.accessibility.XAccessibleText</code>
@@ -108,18 +108,19 @@ import drafts.com.sun.star.accessibility.AccessibleTextType;
 public class _XAccessibleText extends MultiMethodTest {
 
     private static final String className =
-        "drafts.com.sun.star.accessibility.XAccessibleText" ;
+        "com.sun.star.accessibility.XAccessibleText" ;
 
     public XAccessibleText oObj = null;
     protected com.sun.star.awt.Rectangle bounds = null;
 
-    // temporary while accessibility package is in drafts.com.sun.star
+    // temporary while accessibility package is in com.sun.star
     protected String getTestedClassName() {
         return className;
     }
 
     String text = null;
     String editOnly = null;
+    String LimitedBounds = null;
 
     /**
      * Retrieves a string representation of the component's text.
@@ -147,6 +148,7 @@ public class _XAccessibleText extends MultiMethodTest {
         }
 
         editOnly = (String)tEnv.getObjRelation("EditOnly");
+        LimitedBounds = (String)tEnv.getObjRelation("LimitedBounds");
 
         if (component == null) {
             component = (XAccessibleComponent)
@@ -312,10 +314,11 @@ public class _XAccessibleText extends MultiMethodTest {
     public void _getCharacterAttributes() {
         requiredMethod("getCharacterCount()");
         boolean res = true;
+        String[] attr = new String[] {""};
 
         try {
             log.println("getCharacterAttributes(-1)");
-            oObj.getCharacterAttributes(-1);
+            oObj.getCharacterAttributes(-1,attr);
             log.println("Exception was expected");
             res &= false;
         } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
@@ -325,7 +328,7 @@ public class _XAccessibleText extends MultiMethodTest {
 
         try {
             log.println("getCharacterAttributes(chCount)");
-            oObj.getCharacterAttributes(chCount);
+            oObj.getCharacterAttributes(chCount,attr);
             log.println("Exception was expected");
             res &= false;
         } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
@@ -335,7 +338,7 @@ public class _XAccessibleText extends MultiMethodTest {
 
         try {
             log.println("getCharacterAttributes(chCount-1)");
-            PropertyValue[] props = oObj.getCharacterAttributes(chCount - 1);
+            PropertyValue[] props = oObj.getCharacterAttributes(chCount - 1,attr);
             res &= props != null;
         } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
             log.println("Unexpected exception");
@@ -363,6 +366,14 @@ public class _XAccessibleText extends MultiMethodTest {
         requiredMethod("getCharacterCount()");
         boolean res = true;
 
+        int lastIndex = chCount;
+
+        if (LimitedBounds != null) {
+            lastIndex = chCount - 1;
+            log.println(LimitedBounds);
+        }
+
+
         try {
             log.println("getCharacterBounds(-1)");
             oObj.getCharacterBounds(-1);
@@ -374,8 +385,8 @@ public class _XAccessibleText extends MultiMethodTest {
         }
 
         try {
-            log.println("getCharacterBounds(chCount)");
-            oObj.getCharacterBounds(chCount);
+            log.println("getCharacterBounds("+(lastIndex+1)+")");
+            oObj.getCharacterBounds(lastIndex+1);
             log.println("Exception was expected");
             res &= false;
         } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
@@ -384,7 +395,7 @@ public class _XAccessibleText extends MultiMethodTest {
         }
 
         try {
-            for ( int i = 0; i < chCount ; i++ ) {
+            for ( int i = 0; i < lastIndex+1 ; i++ ) {
                 log.println("getCharacterBounds("+i+")");
                 chBounds = oObj.getCharacterBounds(i);
                 boolean localres = true;
@@ -456,6 +467,8 @@ public class _XAccessibleText extends MultiMethodTest {
                 text = oObj.getTextAtIndex(i,(short)1);
             } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
 
+            } catch(com.sun.star.lang.IllegalArgumentException e) {
+
             }
             int x = aRect.X+aRect.Width/2;
             int y = aRect.Y+aRect.Height/2;
@@ -804,6 +817,9 @@ public class _XAccessibleText extends MultiMethodTest {
         } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
             log.println("Expected exception");
             res &= true;
+        } catch(com.sun.star.lang.IllegalArgumentException e) {
+            log.println("UnExpected exception");
+            res &= false;
         }
 
         try {
@@ -816,6 +832,9 @@ public class _XAccessibleText extends MultiMethodTest {
         } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
             log.println("Expected exception");
             res &= true;
+        } catch(com.sun.star.lang.IllegalArgumentException e) {
+            log.println("UnExpected exception");
+            res &= false;
         }
 
         try {
@@ -836,6 +855,10 @@ public class _XAccessibleText extends MultiMethodTest {
             log.println("Unexpected exception");
             e.printStackTrace(log);
             res &= false;
+        } catch(com.sun.star.lang.IllegalArgumentException e) {
+            log.println("Unexpected exception");
+            e.printStackTrace(log);
+            res &= false;
         }
 
         tRes.tested("getTextAtIndex()", res);
@@ -865,6 +888,9 @@ public class _XAccessibleText extends MultiMethodTest {
         } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
             log.println("Expected exception");
             res &= true;
+        } catch(com.sun.star.lang.IllegalArgumentException e) {
+            log.println("UnExpected exception");
+            res &= false;
         }
 
         try {
@@ -877,6 +903,9 @@ public class _XAccessibleText extends MultiMethodTest {
         } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
             log.println("Expected exception");
             res &= true;
+        } catch(com.sun.star.lang.IllegalArgumentException e) {
+            log.println("UnExpected exception");
+            res &= true;
         }
 
         try {
@@ -913,8 +942,13 @@ public class _XAccessibleText extends MultiMethodTest {
             log.println("Unexpected exception");
             e.printStackTrace(log);
             res &= false;
+        } catch(com.sun.star.lang.IllegalArgumentException e) {
+            log.println("Unexpected exception");
+            e.printStackTrace(log);
+            res &= false;
         }
 
+
         tRes.tested("getTextBeforeIndex()", res);
     }
 
@@ -942,6 +976,9 @@ public class _XAccessibleText extends MultiMethodTest {
         } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
             log.println("Expected exception");
             res &= true;
+        } catch(com.sun.star.lang.IllegalArgumentException e) {
+            log.println("UnExpected exception");
+            res &= true;
         }
 
         try {
@@ -954,6 +991,9 @@ public class _XAccessibleText extends MultiMethodTest {
         } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
             log.println("Expected exception");
             res &= true;
+        } catch(com.sun.star.lang.IllegalArgumentException e) {
+            log.println("UnExpected exception");
+            res &= true;
         }
 
         try {
@@ -990,6 +1030,10 @@ public class _XAccessibleText extends MultiMethodTest {
             log.println("Unexpected exception");
             e.printStackTrace(log);
             res &= false;
+        } catch(com.sun.star.lang.IllegalArgumentException e) {
+            log.println("Unexpected exception");
+            e.printStackTrace(log);
+            res &= false;
         }
 
         tRes.tested("getTextBehindIndex()", res);
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java
index de2aad841771..31398f310527 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XAccessibleValue.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:07:21 $
+ *  last change:$Date: 2003-04-28 12:22:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,13 +62,13 @@
 package ifc.accessibility;
 
 
-import drafts.com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.accessibility.XAccessibleValue;
 import lib.MultiMethodTest;
 import lib.Status;
 import lib.StatusException;
 
 /**
- * Testing <code>drafts.com.sun.star.accessibility.XAccessibleValue</code>
+ * Testing <code>com.sun.star.accessibility.XAccessibleValue</code>
  * interface methods :
  * <ul>
  *  <li><code> getCurrentValue()</code></li>
@@ -83,7 +83,7 @@ import lib.StatusException;
  *  (of type <code>XAccessibleValue</code>) <b> optional </b>:
  *   another component from the group(e.g. radio button group)</li>
  *  </ul><p>
- * @see drafts.com.sun.star.accessibility.XAccessibleValue
+ * @see com.sun.star.accessibility.XAccessibleValue
  */
 public class _XAccessibleValue extends MultiMethodTest {
 
@@ -96,7 +96,7 @@ public class _XAccessibleValue extends MultiMethodTest {
     XAccessibleValue anotherFromGroup = null;
 
     private static final String className =
-        "drafts.com.sun.star.accessibility.XAccessibleValue" ;
+        "com.sun.star.accessibility.XAccessibleValue" ;
 
     /**
      * Walkaround for current interface naming ('drafts' prefix)
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java
index a3d22be4ceeb..fa9eacca0b07 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ConnectionLineAccessibility.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-02-26 12:30:29 $
+ *  last change:$Date: 2003-04-28 12:24:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,15 +82,15 @@ import com.sun.star.sdb.XQueryDefinitionsSupplier;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.ui.dialogs.XExecutableDialog;
 import com.sun.star.lang.XComponent;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.awt.XExtendedToolkit;
 import util.AccessibilityTools;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleSelection;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleSelection;
+import com.sun.star.accessibility.XAccessibleComponent;
 
 /**
 * Object implements the following interfaces :
@@ -101,9 +101,9 @@ import drafts.com.sun.star.accessibility.XAccessibleComponent;
 *   <li><code>drafts::com::sun::star::accessibility::XAccessibleEventBroadcaster
 *   </code></li>
 * </ul><p>
-* @see drafts.com.sun.star.accessibility.XAccessible
-* @see drafts.com.sun.star.accessibility.XAccessibleContext
-* @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+* @see com.sun.star.accessibility.XAccessible
+* @see com.sun.star.accessibility.XAccessibleContext
+* @see com.sun.star.accessibility.XAccessibleEventBroadcaster
 * @see ifc.accessibility._XAccessible
 * @see ifc.accessibility._XAccessibleContext
 * @see ifc.accessibility._XAccessibleEventBroadcaster
@@ -342,12 +342,12 @@ public class ConnectionLineAccessibility extends TestCase {
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
         XAccessibleContext accContextCancel = at.getAccessibleObjectForRole
-            (xRoot, AccessibleRole.PUSHBUTTON, "Cancel");
+            (xRoot, AccessibleRole.PUSH_BUTTON, "Cancel");
         actionCancel = (XAccessibleAction)UnoRuntime.queryInterface
             (XAccessibleAction.class, accContextCancel);
 
         XAccessibleContext accContextTabList = at.getAccessibleObjectForRole(
-            xRoot, AccessibleRole.PAGETABLIST);
+            xRoot, AccessibleRole.PAGE_TAB_LIST);
         XAccessibleSelection tabListSelection = (XAccessibleSelection)
             UnoRuntime.queryInterface(XAccessibleSelection.class,
             accContextTabList);
@@ -364,7 +364,7 @@ public class ConnectionLineAccessibility extends TestCase {
         shortWait();
 
         XAccessibleContext acEditQuery = at.getAccessibleObjectForRole(
-            xRoot, AccessibleRole.PUSHBUTTON, "Edit Query");
+            xRoot, AccessibleRole.PUSH_BUTTON, "Edit Query");
         XAccessibleAction actionEditQuery = (XAccessibleAction)
             UnoRuntime.queryInterface(XAccessibleAction.class, acEditQuery);
 
diff --git a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java
index 73d6526ce8a3..c74a6679ef52 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: JoinViewAccessibility.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-02-26 15:25:11 $
+ *  last change:$Date: 2003-04-28 12:24:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,15 +82,15 @@ import com.sun.star.sdb.XQueryDefinitionsSupplier;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.ui.dialogs.XExecutableDialog;
 import com.sun.star.lang.XComponent;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.awt.XExtendedToolkit;
 import util.AccessibilityTools;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleSelection;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleSelection;
+import com.sun.star.accessibility.XAccessibleComponent;
 
 /**
 * Object implements the following interfaces :
@@ -101,9 +101,9 @@ import drafts.com.sun.star.accessibility.XAccessibleComponent;
 *   <li><code>drafts::com::sun::star::accessibility::XAccessibleEventBroadcaster
 *   </code></li>
 * </ul><p>
-* @see drafts.com.sun.star.accessibility.XAccessible
-* @see drafts.com.sun.star.accessibility.XAccessibleContext
-* @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+* @see com.sun.star.accessibility.XAccessible
+* @see com.sun.star.accessibility.XAccessibleContext
+* @see com.sun.star.accessibility.XAccessibleEventBroadcaster
 * @see ifc.accessibility._XAccessible
 * @see ifc.accessibility._XAccessibleContext
 * @see ifc.accessibility._XAccessibleEventBroadcaster
@@ -320,12 +320,12 @@ public class JoinViewAccessibility extends TestCase {
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
         XAccessibleContext accContextCancel = at.getAccessibleObjectForRole
-            (xRoot, AccessibleRole.PUSHBUTTON, "Cancel");
+            (xRoot, AccessibleRole.PUSH_BUTTON, "Cancel");
         actionCancel = (XAccessibleAction)UnoRuntime.queryInterface
             (XAccessibleAction.class, accContextCancel);
 
         XAccessibleContext accContextTabList = at.getAccessibleObjectForRole(
-            xRoot, AccessibleRole.PAGETABLIST);
+            xRoot, AccessibleRole.PAGE_TAB_LIST);
         XAccessibleSelection tabListSelection = (XAccessibleSelection)
             UnoRuntime.queryInterface(XAccessibleSelection.class,
             accContextTabList);
@@ -342,7 +342,7 @@ public class JoinViewAccessibility extends TestCase {
         shortWait();
 
         XAccessibleContext acEditQuery = at.getAccessibleObjectForRole(
-            xRoot, AccessibleRole.PUSHBUTTON, "Edit Query");
+            xRoot, AccessibleRole.PUSH_BUTTON, "Edit Query");
         XAccessibleAction actionEditQuery = (XAccessibleAction)
             UnoRuntime.queryInterface(XAccessibleAction.class, acEditQuery);
 
@@ -368,7 +368,7 @@ public class JoinViewAccessibility extends TestCase {
 //        at.printAccessibleTree(log, xRoot);
 
         oObj = at.getAccessibleObjectForRole(
-            xRoot, AccessibleRole.VIEWPORT);
+            xRoot, AccessibleRole.VIEW_PORT);
 
         log.println("ImplementationName " + util.utils.getImplName(oObj));
 
diff --git a/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java b/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java
index 38ef80b9e2df..d27cc3c075f3 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SbaXGridControl.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change:$Date: 2003-02-27 12:49:07 $
+ *  last change:$Date: 2003-04-28 12:24:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,11 +64,11 @@ package mod._dbaccess;
 import java.io.PrintWriter;
 import java.util.Comparator;
 
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.awt.XExtendedToolkit;
 import util.AccessibilityTools;
 
 import com.sun.star.awt.Point;
@@ -212,7 +212,7 @@ public class SbaXGridControl extends TestCase {
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
         XInterface button = at.getAccessibleObjectForRole
-            (xRoot, AccessibleRole.PUSHBUTTON);
+            (xRoot, AccessibleRole.PUSH_BUTTON);
 
         XAccessibleAction action = (XAccessibleAction)
                     UnoRuntime.queryInterface(XAccessibleAction.class, button);
diff --git a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java
index 3e87b2c6c11b..aeb48a9b96a6 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableWindowAccessibility.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-02-27 13:09:16 $
+ *  last change:$Date: 2003-04-28 12:24:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,15 +82,15 @@ import com.sun.star.sdb.XQueryDefinitionsSupplier;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.ui.dialogs.XExecutableDialog;
 import com.sun.star.lang.XComponent;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.awt.XExtendedToolkit;
 import util.AccessibilityTools;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleSelection;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleSelection;
+import com.sun.star.accessibility.XAccessibleComponent;
 
 /**
 * Object implements the following interfaces :
@@ -101,9 +101,9 @@ import drafts.com.sun.star.accessibility.XAccessibleComponent;
 *   <li><code>drafts::com::sun::star::accessibility::XAccessibleEventBroadcaster
 *   </code></li>
 * </ul><p>
-* @see drafts.com.sun.star.accessibility.XAccessible
-* @see drafts.com.sun.star.accessibility.XAccessibleContext
-* @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+* @see com.sun.star.accessibility.XAccessible
+* @see com.sun.star.accessibility.XAccessibleContext
+* @see com.sun.star.accessibility.XAccessibleEventBroadcaster
 * @see ifc.accessibility._XAccessible
 * @see ifc.accessibility._XAccessibleContext
 * @see ifc.accessibility._XAccessibleEventBroadcaster
@@ -341,12 +341,12 @@ public class TableWindowAccessibility extends TestCase {
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
         XAccessibleContext accContextCancel = at.getAccessibleObjectForRole
-            (xRoot, AccessibleRole.PUSHBUTTON, "Cancel");
+            (xRoot, AccessibleRole.PUSH_BUTTON, "Cancel");
         actionCancel = (XAccessibleAction)UnoRuntime.queryInterface
             (XAccessibleAction.class, accContextCancel);
 
         XAccessibleContext accContextTabList = at.getAccessibleObjectForRole(
-            xRoot, AccessibleRole.PAGETABLIST);
+            xRoot, AccessibleRole.PAGE_TAB_LIST);
         XAccessibleSelection tabListSelection = (XAccessibleSelection)
             UnoRuntime.queryInterface(XAccessibleSelection.class,
             accContextTabList);
@@ -363,7 +363,7 @@ public class TableWindowAccessibility extends TestCase {
         shortWait();
 
         XAccessibleContext acEditQuery = at.getAccessibleObjectForRole(
-            xRoot, AccessibleRole.PUSHBUTTON, "Edit Query");
+            xRoot, AccessibleRole.PUSH_BUTTON, "Edit Query");
         XAccessibleAction actionEditQuery = (XAccessibleAction)
             UnoRuntime.queryInterface(XAccessibleAction.class, acEditQuery);
 
@@ -386,10 +386,10 @@ public class TableWindowAccessibility extends TestCase {
 
         xRoot = at.getAccessibleObject(xWindow);
 
-//        at.printAccessibleTree(log, xRoot);
+        //at.printAccessibleTree(log, xRoot);
 
         oObj = at.getAccessibleObjectForRole(
-            xRoot, AccessibleRole.PANEL);
+            xRoot, AccessibleRole.PANEL,"","TableWindowAccessibility");
 
 /*        for(int i = 0; i < savedObj.length; i++) {
             try {
@@ -401,6 +401,8 @@ public class TableWindowAccessibility extends TestCase {
 
         log.println("ImplementationName " + util.utils.getImplName(oObj));
 
+        //util.dbg.printInterfaces(oObj);
+
         log.println( "    creating a new environment for object" );
         TestEnvironment tEnv = new TestEnvironment( oObj );
 
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
index 5ae00f43854e..63416a2cfdc0 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScAccessibleCell.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: sw $
+ *  last change: $Author: vg $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,8 +72,8 @@ import com.sun.star.sheet.XSpreadsheets;
 import com.sun.star.table.XCell;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
@@ -100,11 +100,11 @@ import com.sun.star.beans.XPropertySet;
  *  <li> <code>drafts::com::sun::star::accessibility::XAccessibleContext</code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleSelection
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleTable
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleSelection
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleTable
+ * @see com.sun.star.accessibility.XAccessibleContext
  * @see ifc.n.star.accessibility._XAccessibleSelection
  * @see ifc.n.star.accessibility._XAccessibleEventBroadcaster
  * @see ifc.n.star.accessibility._XAccessibleComponent
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
index cfd646db512c..4357d50c4d19 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScAccessibleCsvCell.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Date: 2003-02-13 14:52:09 $
+ *  last change: $Date: 2003-04-28 12:24:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,12 +73,12 @@ import com.sun.star.sheet.XSpreadsheets;
 import com.sun.star.table.XCell;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.awt.XExtendedToolkit;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
@@ -133,7 +133,7 @@ public class ScAccessibleCsvCell extends TestCase {
 
         //at.printAccessibleTree(log,xRoot);
         oObj = at.getAccessibleObjectForRole
-            (xRoot, AccessibleRole.PUSHBUTTON, "Cancel");
+            (xRoot, AccessibleRole.PUSH_BUTTON, "Cancel");
 
         accAction = (XAccessibleAction) UnoRuntime.queryInterface(XAccessibleAction.class, oObj);
 
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
index ee7a005bee00..bd97ae5e1d8c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScAccessibleCsvGrid.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: sw $
+ *  last change: $Author: vg $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,11 +72,11 @@ import com.sun.star.sheet.XSpreadsheets;
 import com.sun.star.table.XCell;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.awt.XExtendedToolkit;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
@@ -134,7 +134,7 @@ public class ScAccessibleCsvGrid extends TestCase {
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
         oObj = at.getAccessibleObjectForRole
-            (xRoot, AccessibleRole.PUSHBUTTON, "Cancel");
+            (xRoot, AccessibleRole.PUSH_BUTTON, "Cancel");
 
         accAction = (XAccessibleAction) UnoRuntime.queryInterface(XAccessibleAction.class, oObj);
 
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
index b5b65ec1f292..650a65a9bf1d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScAccessibleCsvRuler.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: sw $
+ *  last change: $Author: vg $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,12 +72,12 @@ import com.sun.star.sheet.XSpreadsheets;
 import com.sun.star.table.XCell;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.awt.XExtendedToolkit;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
@@ -135,12 +135,12 @@ public class ScAccessibleCsvRuler extends TestCase {
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
         oObj = at.getAccessibleObjectForRole
-            (xRoot, AccessibleRole.PUSHBUTTON, "Cancel");
+            (xRoot, AccessibleRole.PUSH_BUTTON, "Cancel");
 
         accAction = (XAccessibleAction) UnoRuntime.queryInterface(XAccessibleAction.class, oObj);
 
         XAccessibleContext acc = at.getAccessibleObjectForRole
-            (xRoot, AccessibleRole.RADIOBUTTON);
+            (xRoot, AccessibleRole.RADIO_BUTTON);
 
         System.out.println("Click on: "+acc.getAccessibleName());
 
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
index 7531bd2b3b30..906ca686a9c2 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScAccessibleDocument.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: sw $
+ *  last change: $Author: vg $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,8 +70,9 @@ import com.sun.star.lang.XComponent;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.awt.Rectangle;
 import java.io.PrintWriter;
 import lib.Status;
 import lib.StatusException;
@@ -95,10 +96,10 @@ import util.utils;
  *  <li> <code>drafts::com::sun::star::accessibility::XAccessibleSelection</code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see drafts.com.sun.star.accessibility.XAccessibleSelection
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleSelection
  * @see ifc.accessibility._XAccessibleComponent
  * @see ifc.accessibility.XAccessibleEventBroadcaster
  * @see ifc.accessibility.XAccessibleSelection
@@ -136,7 +137,7 @@ public class ScAccessibleDocument extends TestCase {
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
         oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT, "");
-        //at.printAccessibleTree(log, xRoot);
+        at.printAccessibleTree(log, xRoot);
         log.println("ImplementationName " + utils.getImplName(oObj));
 
         TestEnvironment tEnv = new TestEnvironment(oObj);
@@ -145,7 +146,8 @@ public class ScAccessibleDocument extends TestCase {
         tEnv.addObjRelation("EventProducer",
             new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() {
                 public void fireEvent() {
-                    xDocWin.setFocus();
+                    Rectangle rect = xDocWin.getPosSize();
+                    xDocWin.setPosSize(rect.X,rect.Y,rect.Height,rect.Width-10,com.sun.star.awt.PosSize.POSSIZE);
                 }
             });
 
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
index 016509b901c3..569f961ffd66 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScAccessibleDocumentPagePreview.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: sw $
+ *  last change: $Author: vg $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,10 +78,10 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
 import com.sun.star.util.XURLTransformer;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleAction;
 import java.io.PrintWriter;
 import lib.Status;
 import lib.StatusException;
@@ -104,8 +104,8 @@ import com.sun.star.uno.AnyConverter;
  *  <li> <code>drafts::com::sun::star::accessibility::XAccessibleContext</code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleContext
  * @see ifc.n.star.accessibility._XAccessibleComponent
  * @see ifc.n.star.accessibility._XAccessibleContext
  */
@@ -204,17 +204,14 @@ public class ScAccessibleDocumentPagePreview extends TestCase {
 
         XWindow xWindow = at.getCurrentWindow(Param.getMSF(), aModel);
         XAccessible xRoot = at.getAccessibleObject(xWindow);
-
-        XAccessibleContext mainWin = at.getAccessibleObjectForRole(xRoot,AccessibleRole.LAYEREDPANE);
+        //at.printAccessibleTree(log,xRoot);
+        XAccessibleContext mainWin = at.getAccessibleObjectForRole(xRoot,AccessibleRole.TOOL_BAR,"Page View");
         //Jump to last page and back to first to verify that #
         try {
-            XAccessible PageViewObjectBar = mainWin.getAccessibleChild(2);
-            XAccessible FirstPage =
-                PageViewObjectBar.getAccessibleContext().getAccessibleChild(2);
+            XAccessible FirstPage = mainWin.getAccessibleChild(2);
             log.println("Getting: "+
                             FirstPage.getAccessibleContext().getAccessibleName());
-            XAccessible LastPage =
-                PageViewObjectBar.getAccessibleContext().getAccessibleChild(3);
+            XAccessible LastPage = mainWin.getAccessibleChild(3);
             log.println("Getting "+
                             LastPage.getAccessibleContext().getAccessibleName());
             XAccessibleAction pressLast = (XAccessibleAction)
@@ -248,8 +245,8 @@ public class ScAccessibleDocumentPagePreview extends TestCase {
             new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() {
                 public void fireEvent() {
                     Rectangle rec = win.getPosSize();
-                    win.setPosSize(rec.X,rec.Y,rec.Height-1,rec.Width-1, (short) 15);
-                    win.setPosSize(rec.X,rec.Y,rec.Height,rec.Width, (short) 15);
+                    win.setPosSize(rec.X,rec.Y,rec.Height-10,rec.Width, com.sun.star.awt.PosSize.POSSIZE);
+                    win.setPosSize(rec.X,rec.Y,rec.Height,rec.Width,com.sun.star.awt.PosSize.POSSIZE );
                 }
             });
 
@@ -291,6 +288,9 @@ public class ScAccessibleDocumentPagePreview extends TestCase {
             log.println("loading document "+url);
             xSpreadsheetDoc = (XSpreadsheetDocument)UnoRuntime.queryInterface(
                             XSpreadsheetDocument.class,SOF.loadDocument(url));
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException ex) {}
         } catch (com.sun.star.uno.Exception e) {
             e.printStackTrace( log );
             throw new StatusException( "Couldn't create document ", e );
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
index 57d2a7ede770..687b53074ded 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScAccessiblePageHeader.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: sw $
+ *  last change: $Author: vg $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,8 +76,8 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
 import com.sun.star.util.XURLTransformer;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
 import java.io.PrintWriter;
 import lib.Status;
 import lib.StatusException;
@@ -111,8 +111,8 @@ import com.sun.star.uno.AnyConverter;
  *  <li> <code>drafts::com::sun::star::accessibility::XAccessibleContext</code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleContext
  * @see ifc.n.star.accessibility._XAccessibleComponent
  * @see ifc.n.star.accessibility._XAccessibleContext
  */
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
index e9fa14b921a8..35ac574eab4d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScAccessiblePageHeaderArea.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Date: 2003-01-31 13:38:48 $
+ *  last change: $Date: 2003-04-28 12:25:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,11 +76,11 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
 import com.sun.star.util.XURLTransformer;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleComponent;
 import java.io.PrintWriter;
 import lib.Status;
 import lib.StatusException;
@@ -103,7 +103,7 @@ import com.sun.star.text.XText;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.AnyConverter;
 
-import drafts.com.sun.star.accessibility.XAccessibleStateSet;
+import com.sun.star.accessibility.XAccessibleStateSet;
 
 /**
  * Test for object which is represented by accessible component of
@@ -115,8 +115,8 @@ import drafts.com.sun.star.accessibility.XAccessibleStateSet;
  *  <li> <code>drafts::com::sun::star::accessibility::XAccessibleContext</code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleContext
  * @see ifc.n.star.accessibility._XAccessibleComponent
  * @see ifc.n.star.accessibility._XAccessibleContext
  */
@@ -242,12 +242,11 @@ public class ScAccessiblePageHeaderArea extends TestCase {
         XAccessible zoomIn = null;
         try {
             XAccessibleContext mainWin =
-                at.getAccessibleObjectForRole(xRoot,AccessibleRole.LAYEREDPANE);
+                at.getAccessibleObjectForRole(xRoot,AccessibleRole.TOOL_BAR,"Page");
 
-            XAccessible PageViewObjectBar = mainWin.getAccessibleChild(2);
+            System.out.println("TOOLBAR: "+mainWin.getAccessibleName());
 
-            zoomIn =
-                PageViewObjectBar.getAccessibleContext().getAccessibleChild(5);
+            zoomIn = mainWin.getAccessibleChild(5);
             log.println("Getting "+
                             zoomIn.getAccessibleContext().getAccessibleName());
         } catch (com.sun.star.lang.IndexOutOfBoundsException ibe) {}
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
index 1072cfb15397..11b2a6e65a7d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScAccessiblePreviewCell.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-01-31 13:41:55 $
+ *  last change:$Date: 2003-04-28 12:25:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,8 +81,8 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.util.XURLTransformer;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
 import com.sun.star.sheet.XSpreadsheets;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.sheet.XSpreadsheet;
@@ -104,11 +104,11 @@ import com.sun.star.uno.Type;
  *  <li><code>drafts::com::sun::star::accessibility::XAccessibleEventBroadcaster
  *  </code></li>
  * </ul>
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
- * @see drafts.com.sun.star.accessibility.XAccessibleSelection
- * @see drafts.com.sun.star.accessibility.XAccessibleValue
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleSelection
+ * @see com.sun.star.accessibility.XAccessibleValue
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
  * @see ifc.accessibility._XAccessibleEventBroadcaster
  * @see ifc.accessibility._XAccessibleComponent
  * @see ifc.accessibility._XAccessibleContext
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
index 5644a71bb989..02a5993c8058 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScAccessiblePreviewHeaderCell.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-01-31 13:47:14 $
+ *  last change:$Date: 2003-04-28 12:25:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,9 +81,9 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.util.XURLTransformer;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.AccessibleRole;
 import com.sun.star.style.XStyleFamiliesSupplier;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.beans.XPropertySet;
@@ -113,11 +113,11 @@ import com.sun.star.uno.Type;
  *  <li><code>drafts::com::sun::star::accessibility::XAccessibleEventBroadcaster
  *  </code></li>
  * </ul>
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
- * @see drafts.com.sun.star.accessibility.XAccessibleSelection
- * @see drafts.com.sun.star.accessibility.XAccessibleValue
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleSelection
+ * @see com.sun.star.accessibility.XAccessibleValue
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
  * @see ifc.accessibility._XAccessibleEventBroadcaster
  * @see ifc.accessibility._XAccessibleComponent
  * @see ifc.accessibility._XAccessibleContext
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
index 4201538c8820..b9b402a2c478 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScAccessiblePreviewTable.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change:$Date: 2003-02-28 13:07:37 $
+ *  last change:$Date: 2003-04-28 12:25:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,10 +81,10 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.util.XURLTransformer;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleAction;
 import com.sun.star.sheet.XSpreadsheets;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.sheet.XSpreadsheet;
@@ -107,11 +107,11 @@ import com.sun.star.uno.Type;
  *  <li><code>drafts::com::sun::star::accessibility::XAccessibleEventBroadcaster
  *  </code></li>
  * </ul>
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
- * @see drafts.com.sun.star.accessibility.XAccessibleSelection
- * @see drafts.com.sun.star.accessibility.XAccessibleTable
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleSelection
+ * @see com.sun.star.accessibility.XAccessibleTable
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
  * @see ifc.accessibility._XAccessibleEventBroadcaster
  * @see ifc.accessibility._XAccessibleComponent
  * @see ifc.accessibility._XAccessibleContext
@@ -225,12 +225,9 @@ public class ScAccessiblePreviewTable extends TestCase {
         XAccessible zoomIn = null;
         try {
             XAccessibleContext mainWin =
-                at.getAccessibleObjectForRole(xRoot,AccessibleRole.LAYEREDPANE);
+                at.getAccessibleObjectForRole(xRoot,AccessibleRole.TOOL_BAR, "Page");
 
-            XAccessible PageViewObjectBar = mainWin.getAccessibleChild(2);
-
-            zoomIn =
-                PageViewObjectBar.getAccessibleContext().getAccessibleChild(5);
+            zoomIn = mainWin.getAccessibleChild(5);
             log.println("Getting "+
                             zoomIn.getAccessibleContext().getAccessibleName());
         } catch (com.sun.star.lang.IndexOutOfBoundsException ibe) {}
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
index 40d7d676f2e1..47e42c3f8821 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScAccessibleSpreadsheet.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-01-31 13:54:01 $
+ *  last change:$Date: 2003-04-28 12:25:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,8 +75,8 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.frame.XModel;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
 import com.sun.star.sheet.XSpreadsheet;
@@ -98,10 +98,10 @@ import com.sun.star.uno.Type;
  *  <li><code>drafts::com::sun::star::accessibility::XAccessibleTable</code>
  *  </li>
  * </ul>
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
- * @see drafts.com.sun.star.accessibility.XAccessibleSelection
- * @see drafts.com.sun.star.accessibility.XAccessibleTable
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleSelection
+ * @see com.sun.star.accessibility.XAccessibleTable
  * @see ifc.accessibility._XAccessibleComponent
  * @see ifc.accessibility._XAccessibleContext
  * @see ifc.accessibility._XAccessibleSelection
diff --git a/qadevOOo/tests/java/mod/_sch/AccArea.java b/qadevOOo/tests/java/mod/_sch/AccArea.java
index dab319c240b8..8b6c14034f70 100644
--- a/qadevOOo/tests/java/mod/_sch/AccArea.java
+++ b/qadevOOo/tests/java/mod/_sch/AccArea.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccArea.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Date: 2003-01-27 18:17:21 $
+ *  last change: $Date: 2003-04-28 12:29:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,15 +69,15 @@ import util.SOfficeFactory;
 import lib.StatusException;
 import com.sun.star.frame.XController;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleValue;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 import util.utils;
 import util.SOfficeFactory;
 import com.sun.star.chart.XChartDocument;
diff --git a/qadevOOo/tests/java/mod/_sch/AccAxis.java b/qadevOOo/tests/java/mod/_sch/AccAxis.java
index e8386f2ee8a3..79c81677e2ea 100644
--- a/qadevOOo/tests/java/mod/_sch/AccAxis.java
+++ b/qadevOOo/tests/java/mod/_sch/AccAxis.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccAxis.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Date: 2003-01-27 18:17:21 $
+ *  last change: $Date: 2003-04-28 12:29:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,15 +69,15 @@ import util.SOfficeFactory;
 import lib.StatusException;
 import com.sun.star.frame.XController;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleValue;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 import util.utils;
 import util.SOfficeFactory;
 import com.sun.star.chart.XChartDocument;
diff --git a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java
index d9991d75a44f..8c4222e8b7bf 100644
--- a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java
+++ b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccDataPoint.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Date: 2003-01-27 18:17:20 $
+ *  last change: $Date: 2003-04-28 12:29:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,15 +69,15 @@ import util.SOfficeFactory;
 import lib.StatusException;
 import com.sun.star.frame.XController;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleValue;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 import util.utils;
 import util.SOfficeFactory;
 import com.sun.star.chart.XChartDocument;
diff --git a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java
index a9976ddb6da7..679b650a4a20 100644
--- a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java
+++ b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccDataSeries.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Date: 2003-01-27 18:17:20 $
+ *  last change: $Date: 2003-04-28 12:29:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,15 +69,15 @@ import util.SOfficeFactory;
 import lib.StatusException;
 import com.sun.star.frame.XController;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleValue;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 import util.utils;
 import util.SOfficeFactory;
 import com.sun.star.chart.XChartDocument;
diff --git a/qadevOOo/tests/java/mod/_sch/AccDiagram.java b/qadevOOo/tests/java/mod/_sch/AccDiagram.java
index 99a2f3fefe9d..80a910937564 100644
--- a/qadevOOo/tests/java/mod/_sch/AccDiagram.java
+++ b/qadevOOo/tests/java/mod/_sch/AccDiagram.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccDiagram.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Date: 2003-01-27 18:17:20 $
+ *  last change: $Date: 2003-04-28 12:29:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,15 +69,15 @@ import util.SOfficeFactory;
 import lib.StatusException;
 import com.sun.star.frame.XController;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleValue;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 import util.utils;
 import util.SOfficeFactory;
 import com.sun.star.chart.XChartDocument;
diff --git a/qadevOOo/tests/java/mod/_sch/AccFloor.java b/qadevOOo/tests/java/mod/_sch/AccFloor.java
index bd03fb45db3c..24038b8d3319 100644
--- a/qadevOOo/tests/java/mod/_sch/AccFloor.java
+++ b/qadevOOo/tests/java/mod/_sch/AccFloor.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccFloor.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Date: 2003-01-27 18:17:19 $
+ *  last change: $Date: 2003-04-28 12:29:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,15 +69,15 @@ import util.SOfficeFactory;
 import lib.StatusException;
 import com.sun.star.frame.XController;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleValue;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 import util.utils;
 import util.SOfficeFactory;
 import com.sun.star.chart.XChartDocument;
diff --git a/qadevOOo/tests/java/mod/_sch/AccGrid.java b/qadevOOo/tests/java/mod/_sch/AccGrid.java
index 7ca12b1f9893..987fa39038a1 100644
--- a/qadevOOo/tests/java/mod/_sch/AccGrid.java
+++ b/qadevOOo/tests/java/mod/_sch/AccGrid.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccGrid.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Date: 2003-01-27 18:17:19 $
+ *  last change: $Date: 2003-04-28 12:29:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,15 +69,15 @@ import util.SOfficeFactory;
 import lib.StatusException;
 import com.sun.star.frame.XController;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleValue;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 import util.utils;
 import util.SOfficeFactory;
 import com.sun.star.chart.XChartDocument;
diff --git a/qadevOOo/tests/java/mod/_sch/AccLegend.java b/qadevOOo/tests/java/mod/_sch/AccLegend.java
index c73e1bd6fce4..8f7d79dd7857 100644
--- a/qadevOOo/tests/java/mod/_sch/AccLegend.java
+++ b/qadevOOo/tests/java/mod/_sch/AccLegend.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccLegend.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Date: 2003-01-27 18:17:19 $
+ *  last change: $Date: 2003-04-28 12:29:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,15 +69,15 @@ import util.SOfficeFactory;
 import lib.StatusException;
 import com.sun.star.frame.XController;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleValue;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 import util.utils;
 import util.SOfficeFactory;
 import com.sun.star.chart.XChartDocument;
diff --git a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java
index 4cfb614aa53f..04e855901cc3 100644
--- a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java
+++ b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccLegendEntry.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Date: 2003-01-27 18:17:18 $
+ *  last change: $Date: 2003-04-28 12:29:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,15 +69,15 @@ import util.SOfficeFactory;
 import lib.StatusException;
 import com.sun.star.frame.XController;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleValue;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 import util.utils;
 import util.SOfficeFactory;
 import com.sun.star.chart.XChartDocument;
diff --git a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java
index 3c4f3cb0083c..511c60bd30de 100644
--- a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java
+++ b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccStatisticsObject.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Date: 2003-01-27 18:17:18 $
+ *  last change: $Date: 2003-04-28 12:29:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,15 +69,15 @@ import util.SOfficeFactory;
 import lib.StatusException;
 import com.sun.star.frame.XController;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleValue;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 import util.utils;
 import util.SOfficeFactory;
 import com.sun.star.chart.XChartDocument;
diff --git a/qadevOOo/tests/java/mod/_sch/AccTitle.java b/qadevOOo/tests/java/mod/_sch/AccTitle.java
index db0257860392..f1076d11eeb1 100644
--- a/qadevOOo/tests/java/mod/_sch/AccTitle.java
+++ b/qadevOOo/tests/java/mod/_sch/AccTitle.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccTitle.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Date: 2003-01-27 18:17:18 $
+ *  last change: $Date: 2003-04-28 12:29:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,15 +69,15 @@ import util.SOfficeFactory;
 import lib.StatusException;
 import com.sun.star.frame.XController;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleValue;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 import util.utils;
 import util.SOfficeFactory;
 import com.sun.star.chart.XChartDocument;
diff --git a/qadevOOo/tests/java/mod/_sch/AccWall.java b/qadevOOo/tests/java/mod/_sch/AccWall.java
index e81ae398a118..0130e828b7ab 100644
--- a/qadevOOo/tests/java/mod/_sch/AccWall.java
+++ b/qadevOOo/tests/java/mod/_sch/AccWall.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccWall.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Date: 2003-01-27 18:17:17 $
+ *  last change: $Date: 2003-04-28 12:29:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,15 +69,15 @@ import util.SOfficeFactory;
 import lib.StatusException;
 import com.sun.star.frame.XController;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleValue;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 import util.utils;
 import util.SOfficeFactory;
 import com.sun.star.chart.XChartDocument;
diff --git a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java
index a18b77214278..99623a5776de 100644
--- a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java
+++ b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleDocumentView.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Date: 2003-01-27 18:17:17 $
+ *  last change: $Date: 2003-04-28 12:30:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,13 +69,13 @@ import util.SOfficeFactory;
 import lib.StatusException;
 import com.sun.star.frame.XController;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleValue;
 import com.sun.star.frame.XModel;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 import util.utils;
 import util.SOfficeFactory;
 import com.sun.star.chart.XChartDocument;
diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java
index 4cc40de80355..ccb67a673427 100644
--- a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java
+++ b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleDrawDocumentView.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-02-05 13:25:37 $
+ *  last change:$Date: 2003-04-28 12:30:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,6 +61,7 @@
 
 package mod._sd;
 
+import com.sun.star.accessibility.AccessibleRole;
 import com.sun.star.awt.XWindow;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.drawing.XDrawPage;
@@ -72,7 +73,7 @@ import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessible;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
@@ -145,13 +146,12 @@ public class AccessibleDrawDocumentView extends TestCase {
         XWindow xWindow = at.getCurrentWindow (Param.getMSF(),aModel);
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
-        //Role 100 for documents, see
-        //drafts.com.sun.star.accessibility.AccessibleRole
-        at.getAccessibleObjectForRole(xRoot, (short) 100);
+        //com.sun.star.accessibility.AccessibleRole
+        at.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT);
 
         oObj = at.SearchedContext;
 
-        System.out.println("ImplementationName "+utils.getImplName(oObj));
+        log.println("ImplementationName "+utils.getImplName(oObj));
 
         //at.printAccessibleTree(log, xRoot);
 
diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
index 65b51a703877..2cfb00e4ad7b 100644
--- a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
+++ b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleOutlineView.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:17:32 $
+ *  last change:$Date: 2003-04-28 12:30:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,8 +73,8 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
 import com.sun.star.util.XURLTransformer;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java
index 87946e2a32db..028087ced707 100644
--- a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java
+++ b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleSlideView.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-02-12 15:09:20 $
+ *  last change:$Date: 2003-04-28 12:30:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,8 +70,8 @@ import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
@@ -129,7 +129,8 @@ public class AccessibleSlideView extends TestCase {
 
         TestEnvironment tEnv = new TestEnvironment(oObj);
 
-        util.dbg.printInterfaces(oObj);
+        //util.dbg.printInterfaces(oObj);
+        log.println("Implementationname: "+util.utils.getImplName(oObj));
 
         final XDrawPages DrawPages = oDPn;
 
diff --git a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
index 5eb529f32c9a..ba96044918a4 100644
--- a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
+++ b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SmEditAccessible.java,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change:$Date: 2003-03-26 14:55:00 $
+ *  last change:$Date: 2003-04-28 12:31:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,11 +75,11 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.frame.XController;
 import util.AccessibilityTools;
 import com.sun.star.awt.XWindow;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
 import util.utils;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleContext;
 
 /**
  * Object implements the following interfaces :
@@ -91,11 +91,11 @@ import drafts.com.sun.star.accessibility.XAccessibleContext;
  *  <li> <code>drafts::com::sun::star::accessibility::XAccessibleText</code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessible
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see drafts.com.sun.star.accessibility.XAccessibleText
+ * @see com.sun.star.accessibility.XAccessible
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleText
  * @see ifc.accessibility._XAccessible
  * @see ifc.accessibility._XAccessibleComponent
  * @see ifc.accessibility._XAccessibleContext
@@ -109,9 +109,7 @@ public class SmEditAccessible extends TestCase {
      * Creates a <code>StarMath</code> document and obtains an accessibility
      * component with the role <code>AccessibleRole.PANEL</code>.
      */
-    public synchronized TestEnvironment createTestEnvironment
-            ( TestParameters Param, PrintWriter log )
-            throws StatusException {
+    protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) {
 
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() );
         try {
@@ -160,11 +158,14 @@ public class SmEditAccessible extends TestCase {
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
         oObj = at.getAccessibleObjectForRole
-            (xRoot, AccessibleRole.PANEL, "Commands");
+            (xRoot, AccessibleRole.PANEL, "", "SmEditAccessible");
 
         log.println("ImplementationName " + utils.getImplName(oObj));
-
+        //at.printAccessibleTree(log,xRoot);
         TestEnvironment tEnv = new TestEnvironment(oObj);
+
+        tEnv.addObjRelation("Destroy", new Boolean(true));
+
         final XAccessibleContext con = (XAccessibleContext) UnoRuntime.queryInterface(XAccessibleContext.class, oObj);
         tEnv.addObjRelation("EventProducer",
             new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer(){
diff --git a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java
index 0d2026430486..7af492f9af2b 100644
--- a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java
+++ b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SmGraphicAccessible.java,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change:$Date: 2003-03-31 09:48:34 $
+ *  last change:$Date: 2003-04-28 12:31:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,8 +70,8 @@ import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
 import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
@@ -92,11 +92,11 @@ import util.utils;
  *  <li> <code>drafts::com::sun::star::accessibility::XAccessibleText</code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessible
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see drafts.com.sun.star.accessibility.XAccessibleText
+ * @see com.sun.star.accessibility.XAccessible
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleText
  * @see ifc.accessibility._XAccessible
  * @see ifc.accessibility._XAccessibleComponent
  * @see ifc.accessibility._XAccessibleContext
@@ -166,7 +166,10 @@ public class SmGraphicAccessible extends TestCase {
         TestEnvironment tEnv = new TestEnvironment(oObj);
 
         tEnv.addObjRelation("EditOnly",
-                    "This method isn't supported in this component");
+                    "This method isn't supported in this dialog");
+
+        tEnv.addObjRelation("LimitedBounds",
+                    "only delivers senseful values for getCharacterBounds(0,length-1)");
 
         tEnv.addObjRelation("EventProducer",
             new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer(){
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
index a0f3e64fa6cc..1c7bef3d1e8d 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleBrowseBox.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:18:00 $
+ *  last change:$Date: 2003-04-28 12:17:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,12 +89,12 @@ import util.FormTools;
 import util.SOfficeFactory;
 import util.WriterTools;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.Rectangle;
 
 public class AccessibleBrowseBox extends TestCase {
@@ -233,7 +233,7 @@ public class AccessibleBrowseBox extends TestCase {
         //at.printAccessibleTree(log,xRoot);
 
         oObj = at.getAccessibleObjectForRole
-            (xRoot, AccessibleRole.PANEL);
+            (xRoot, AccessibleRole.PANEL, "", "AccessibleBrowseBox");
 
         log.println("ImplementationName: "+util.utils.getImplName(oObj));
 
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java
index f491ae0b0c5d..793c5f9bc089 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleBrowseBoxHeaderBar.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:17:59 $
+ *  last change:$Date: 2003-04-28 12:17:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,9 +75,9 @@ import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.awt.XExtendedToolkit;
 import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
@@ -97,8 +97,8 @@ import util.SOfficeFactory;
  *  </code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleContext
  * @see ifc.accessibility._XAccessibleEventBroadcaster
  * @see ifc.accessibility._XAccessibleContext
  */
@@ -144,9 +144,9 @@ public class AccessibleBrowseBoxHeaderBar extends TestCase {
      * @param log writer to log information while testing
      *
      * @see com.sun.star.awt.Toolkit
-     * @see drafts.com.sun.star.accessibility.AccessibleRole
+     * @see com.sun.star.accessibility.AccessibleRole
      * @see ifc.accessibility._XAccessibleEventBroadcaster
-     * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+     * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
     protected TestEnvironment createTestEnvironment(
         TestParameters tParam, PrintWriter log) {
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java
index 83ce28c73ed3..4231bb94097f 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleBrowseBoxHeaderCell.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:17:59 $
+ *  last change:$Date: 2003-04-28 12:17:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,9 +75,9 @@ import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.awt.XExtendedToolkit;
 import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
@@ -97,8 +97,8 @@ import util.SOfficeFactory;
  *  </code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleContext
  * @see ifc.accessibility._XAccessibleEventBroadcaster
  * @see ifc.accessibility._XAccessibleContext
  */
@@ -147,9 +147,9 @@ public class AccessibleBrowseBoxHeaderCell extends TestCase {
      * @param log writer to log information while testing
      *
      * @see com.sun.star.awt.Toolkit
-     * @see drafts.com.sun.star.accessibility.AccessibleRole
+     * @see com.sun.star.accessibility.AccessibleRole
      * @see ifc.accessibility._XAccessibleEventBroadcaster
-     * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+     * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
     protected TestEnvironment createTestEnvironment(
         TestParameters tParam, PrintWriter log) {
@@ -244,7 +244,7 @@ public class AccessibleBrowseBoxHeaderCell extends TestCase {
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
         oObj = at.getAccessibleObjectForRole(xRoot,
-            AccessibleRole.COLUMNHEADER, "Identifier");
+            AccessibleRole.COLUMN_HEADER, "Identifier");
 
         log.println("ImplementationName: "+ util.utils.getImplName(oObj));
 
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java
index 522b3efd7ea3..d52d1e7e134d 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleBrowseBoxTable.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:17:59 $
+ *  last change:$Date: 2003-04-28 12:17:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,10 +58,8 @@
  *
  *
  ************************************************************************/
-
 package mod._svtools;
 
-import java.io.PrintWriter;
 import com.sun.star.awt.XWindow;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.frame.XController;
@@ -75,17 +73,23 @@ import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.awt.XExtendedToolkit;
+
+import java.io.PrintWriter;
+
 import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
+
 import util.AccessibilityTools;
 import util.DesktopTools;
 import util.SOfficeFactory;
 
+
 /**
  * Test for object that implements the following interfaces :
  * <ul>
@@ -97,13 +101,12 @@ import util.SOfficeFactory;
  *  </code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleContext
  * @see ifc.accessibility._XAccessibleEventBroadcaster
  * @see ifc.accessibility._XAccessibleContext
  */
 public class AccessibleBrowseBoxTable extends TestCase {
-
     XDesktop the_Desk;
     XTextDocument xTextDoc;
 
@@ -111,16 +114,16 @@ public class AccessibleBrowseBoxTable extends TestCase {
      * Creates the Desktop service (<code>com.sun.star.frame.Desktop</code>).
      */
     protected void initialize(TestParameters Param, PrintWriter log) {
-        the_Desk = (XDesktop) UnoRuntime.queryInterface(
-                    XDesktop.class, DesktopTools.createDesktop(Param.getMSF()));
+        the_Desk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class,
+                                                        DesktopTools.createDesktop(
+                                                                Param.getMSF()));
     }
 
     /**
      * Disposes the document, if exists, created in
      * <code>createTestEnvironment</code> method.
      */
-    protected void cleanup( TestParameters Param, PrintWriter log) {
-
+    protected void cleanup(TestParameters Param, PrintWriter log) {
         log.println("disposing xTextDoc");
 
         if (xTextDoc != null) {
@@ -147,45 +150,49 @@ public class AccessibleBrowseBoxTable extends TestCase {
      * @param log writer to log information while testing
      *
      * @see com.sun.star.awt.Toolkit
-     * @see drafts.com.sun.star.accessibility.AccessibleRole
+     * @see com.sun.star.accessibility.AccessibleRole
      * @see ifc.accessibility._XAccessibleEventBroadcaster
-     * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+     * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
-    protected TestEnvironment createTestEnvironment(
-        TestParameters tParam, PrintWriter log) {
-
-        log.println( "creating a test environment" );
+    protected TestEnvironment createTestEnvironment(TestParameters tParam,
+                                                    PrintWriter log) {
+        log.println("creating a test environment");
 
-        if (xTextDoc != null) xTextDoc.dispose();
+        if (xTextDoc != null) {
+            xTextDoc.dispose();
+        }
 
         // get a soffice factory object
-        SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
+        SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF());
 
         try {
-            log.println( "creating a text document" );
+            log.println("creating a text document");
             xTextDoc = SOF.createTextDoc(null);
-        } catch ( com.sun.star.uno.Exception e ) {
+        } catch (com.sun.star.uno.Exception e) {
             // Some exception occures.FAILED
-            e.printStackTrace( log );
-            throw new StatusException( "Couldn't create document", e );
+            e.printStackTrace(log);
+            throw new StatusException("Couldn't create document", e);
         }
 
         shortWait();
 
-        XModel aModel1 = (XModel)
-                    UnoRuntime.queryInterface(XModel.class, xTextDoc);
+        XModel aModel1 = (XModel) UnoRuntime.queryInterface(XModel.class,
+                                                            xTextDoc);
 
         XController secondController = aModel1.getCurrentController();
 
-        XDispatchProvider aProv = (XDispatchProvider)UnoRuntime.
-            queryInterface(XDispatchProvider.class, secondController);
+        XDispatchProvider aProv = (XDispatchProvider) UnoRuntime.queryInterface(
+                                          XDispatchProvider.class,
+                                          secondController);
 
         XDispatch getting = null;
 
-        log.println( "opening DatasourceBrowser" );
+        log.println("opening DatasourceBrowser");
+
         URL the_url = new URL();
         the_url.Complete = ".component:DB/DataSourceBrowser";
         getting = aProv.queryDispatch(the_url, "_beamer", 12);
+
         PropertyValue[] noArgs = new PropertyValue[0];
         getting.dispatch(the_url, noArgs);
 
@@ -201,39 +208,65 @@ public class AccessibleBrowseBoxTable extends TestCase {
 
         the_frame2.setName("DatasourceBrowser");
 
+        final XInitialization xInit = (XInitialization) UnoRuntime.queryInterface(
+                                              XInitialization.class,
+                                              the_frame2.getController());
+
+        Object[] params = new Object[3];
+        PropertyValue param1 = new PropertyValue();
+        param1.Name = "DataSourceName";
+        param1.Value = "Bibliography";
+        params[0] = param1;
+
+        PropertyValue param2 = new PropertyValue();
+        param2.Name = "CommandType";
+        param2.Value = new Integer(com.sun.star.sdb.CommandType.TABLE);
+        params[1] = param2;
+
+        PropertyValue param3 = new PropertyValue();
+        param3.Name = "Command";
+        param3.Value = "biblio";
+        params[2] = param3;
+
+        final Object[] initArgs = params;
+
         XInterface oObj = null;
 
         try {
-            oObj = (XInterface) tParam.getMSF().createInstance
-                ("com.sun.star.awt.Toolkit") ;
+            oObj = (XInterface) tParam.getMSF()
+                                      .createInstance("com.sun.star.awt.Toolkit");
         } catch (com.sun.star.uno.Exception e) {
             log.println("Couldn't get toolkit");
             e.printStackTrace(log);
-            throw new StatusException("Couldn't get toolkit", e );
+            throw new StatusException("Couldn't get toolkit", e);
         }
 
-        XExtendedToolkit tk = (XExtendedToolkit)
-            UnoRuntime.queryInterface(XExtendedToolkit.class, oObj);
+        XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface(
+                                      XExtendedToolkit.class, oObj);
 
         AccessibilityTools at = new AccessibilityTools();
 
-        XWindow xWindow = (XWindow)
-            UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow());
+        XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class,
+                                                              tk.getActiveTopWindow());
 
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
-        oObj = at.getAccessibleObjectForRole(xRoot,
-            AccessibleRole.TABLE, "Table");
+        oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE,
+                                             "Table");
 
-        log.println("ImplementationName: "+ util.utils.getImplName(oObj));
+        log.println("ImplementationName: " + util.utils.getImplName(oObj));
 
         TestEnvironment tEnv = new TestEnvironment(oObj);
 
         tEnv.addObjRelation("EventProducer",
-            new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer(){
-                public void fireEvent() {
+                            new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() {
+            public void fireEvent() {
+                try {
+                    xInit.initialize(initArgs);
+                } catch (Exception e) {
                 }
-            });
+            }
+        });
 
         return tEnv;
     }
@@ -244,10 +277,9 @@ public class AccessibleBrowseBoxTable extends TestCase {
     */
     private void shortWait() {
         try {
-            Thread.currentThread().sleep(500) ;
+            Thread.currentThread().sleep(500);
         } catch (InterruptedException e) {
-            System.out.println("While waiting :" + e) ;
+            System.out.println("While waiting :" + e);
         }
     }
-
 }
\ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java
index feccfe525750..16c5847f9749 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleBrowseBoxTableCell.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:17:58 $
+ *  last change:$Date: 2003-04-28 12:17:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,12 +89,12 @@ import util.FormTools;
 import util.SOfficeFactory;
 import util.WriterTools;
 import util.AccessibilityTools;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.Rectangle;
 
 /**
@@ -108,8 +108,8 @@ import com.sun.star.awt.Rectangle;
  *  </code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleContext
  * @see ifc.accessibility._XAccessibleEventBroadcaster
  * @see ifc.accessibility._XAccessibleContext
  */
@@ -157,9 +157,9 @@ public class AccessibleBrowseBoxTableCell extends TestCase {
      * @param log writer to log information while testing
      *
      * @see com.sun.star.awt.Toolkit
-     * @see drafts.com.sun.star.accessibility.AccessibleRole
+     * @see com.sun.star.accessibility.AccessibleRole
      * @see ifc.accessibility._XAccessibleEventBroadcaster
-     * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+     * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
     protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) {
 
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java
index c2e706064af3..c5f554e63c59 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleIconChoiceCtrl.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:17:58 $
+ *  last change:$Date: 2003-04-28 12:17:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,9 +75,9 @@ import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.awt.XExtendedToolkit;
 import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
@@ -86,9 +86,9 @@ import util.AccessibilityTools;
 import util.DesktopTools;
 import util.SOfficeFactory;
 import com.sun.star.util.XURLTransformer;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
-import drafts.com.sun.star.accessibility.XAccessibleSelection;
+import com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleSelection;
 
 /**
  * Test for object that implements the following interfaces :
@@ -104,10 +104,10 @@ import drafts.com.sun.star.accessibility.XAccessibleSelection;
  *  drafts::com::sun::star::accessibility::XAccessibleSelection</code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleSelection
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleSelection
  * @see ifc.accessibility._XAccessibleEventBroadcaster
  * @see ifc.accessibility._XAccessibleContext
  * @see ifc.accessibility._XAccessibleComponent
@@ -169,9 +169,9 @@ public class AccessibleIconChoiceCtrl extends TestCase {
      * @param log writer to log information while testing
      *
      * @see com.sun.star.awt.Toolkit
-     * @see drafts.com.sun.star.accessibility.AccessibleRole
+     * @see com.sun.star.accessibility.AccessibleRole
      * @see ifc.accessibility._XAccessibleEventBroadcaster
-     * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+     * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
     protected TestEnvironment createTestEnvironment(
         TestParameters tParam, PrintWriter log) {
@@ -252,7 +252,7 @@ public class AccessibleIconChoiceCtrl extends TestCase {
             AccessibleRole.TREE);
 
         XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot,
-            AccessibleRole.PUSHBUTTON, "Close");
+            AccessibleRole.PUSH_BUTTON, "Close");
 
         accCloseButton = (XAccessibleAction)
             UnoRuntime.queryInterface(XAccessibleAction.class, closeButton);
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java
index 377265dd65bd..1b32298077a8 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleIconChoiceCtrlEntry.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:17:57 $
+ *  last change:$Date: 2003-04-28 12:17:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,9 +75,9 @@ import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.awt.XExtendedToolkit;
 import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
@@ -86,8 +86,8 @@ import util.AccessibilityTools;
 import util.DesktopTools;
 import util.SOfficeFactory;
 import com.sun.star.util.XURLTransformer;
-import drafts.com.sun.star.accessibility.XAccessibleAction;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleAction;
+import com.sun.star.accessibility.XAccessibleContext;
 
 /**
  * Test for object that implements the following interfaces :
@@ -103,10 +103,10 @@ import drafts.com.sun.star.accessibility.XAccessibleContext;
  *  drafts::com::sun::star::accessibility::XAccessibleText</code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleText
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleText
  * @see ifc.accessibility._XAccessibleEventBroadcaster
  * @see ifc.accessibility._XAccessibleContext
  * @see ifc.accessibility._XAccessibleComponent
@@ -173,9 +173,9 @@ public class AccessibleIconChoiceCtrlEntry extends TestCase {
      * @param log writer to log information while testing
      *
      * @see com.sun.star.awt.Toolkit
-     * @see drafts.com.sun.star.accessibility.AccessibleRole
+     * @see com.sun.star.accessibility.AccessibleRole
      * @see ifc.accessibility._XAccessibleEventBroadcaster
-     * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+     * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
     protected TestEnvironment createTestEnvironment(
         TestParameters tParam, PrintWriter log) {
@@ -256,7 +256,7 @@ public class AccessibleIconChoiceCtrlEntry extends TestCase {
             AccessibleRole.LABEL, "Internet");
 
         XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot,
-            AccessibleRole.PUSHBUTTON, "Close");
+            AccessibleRole.PUSH_BUTTON, "Close");
 
         accCloseButton = (XAccessibleAction)
             UnoRuntime.queryInterface(XAccessibleAction.class, closeButton);
@@ -278,6 +278,9 @@ public class AccessibleIconChoiceCtrlEntry extends TestCase {
         tEnv.addObjRelation("EditOnly",
                     "This method isn't supported in this dialog");
 
+        tEnv.addObjRelation("LimitedBounds",
+                    "only delivers senseful values for getCharacterBounds(0,length-1)");
+
         return tEnv;
     }
 
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java
index 241f246236bf..a21f15a763a9 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleTabBar.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:17:57 $
+ *  last change:$Date: 2003-04-28 12:17:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,9 +69,9 @@ import com.sun.star.lang.XComponent;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.awt.XExtendedToolkit;
 import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
@@ -79,8 +79,8 @@ import lib.TestParameters;
 import util.AccessibilityTools;
 import util.DesktopTools;
 import util.SOfficeFactory;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleContext;
 
 
 public class AccessibleTabBar extends TestCase {
@@ -114,9 +114,9 @@ public class AccessibleTabBar extends TestCase {
      * @param log writer to log information while testing
      *
      * @see com.sun.star.awt.Toolkit
-     * @see drafts.com.sun.star.accessibility.AccessibleRole
+     * @see com.sun.star.accessibility.AccessibleRole
      * @see ifc.accessibility._XAccessibleEventBroadcaster
-     * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+     * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
     protected TestEnvironment createTestEnvironment(TestParameters tParam,
         PrintWriter log) {
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java
index 3ac194e27628..9b179ee9c48f 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleTabBarPage.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:17:56 $
+ *  last change:$Date: 2003-04-28 12:17:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,9 +69,9 @@ import com.sun.star.lang.XComponent;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.awt.XExtendedToolkit;
 import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
@@ -79,8 +79,8 @@ import lib.TestParameters;
 import util.AccessibilityTools;
 import util.DesktopTools;
 import util.SOfficeFactory;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
-import drafts.com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleContext;
 
 /**
  * Test for object that implements the following interfaces :
@@ -96,10 +96,10 @@ import drafts.com.sun.star.accessibility.XAccessibleContext;
  *  </code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleExtendedComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleExtendedComponent
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleComponent
  * @see ifc.accessibility._XAccessibleComponent
  * @see ifc.accessibility._XAccessibleExtendedComponent
  * @see ifc.accessibility._XAccessibleEventBroadcaster
@@ -136,9 +136,9 @@ public class AccessibleTabBarPage extends TestCase {
      * @param log writer to log information while testing
      *
      * @see com.sun.star.awt.Toolkit
-     * @see drafts.com.sun.star.accessibility.AccessibleRole
+     * @see com.sun.star.accessibility.AccessibleRole
      * @see ifc.accessibility._XAccessibleEventBroadcaster
-     * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+     * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
     protected TestEnvironment createTestEnvironment(TestParameters tParam,
         PrintWriter log) {
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java
index 28d5223e93fe..9053658630e9 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleTabBarPageList.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:17:56 $
+ *  last change:$Date: 2003-04-28 12:17:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,9 +68,9 @@ import com.sun.star.lang.XComponent;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.awt.XExtendedToolkit;
 import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
@@ -94,11 +94,11 @@ import util.SOfficeFactory;
  *  </code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleSelection
- * @see drafts.com.sun.star.accessibility.XAccessibleExtendedComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleSelection
+ * @see com.sun.star.accessibility.XAccessibleExtendedComponent
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleComponent
  * @see ifc.accessibility._XAccessibleSelection
  * @see ifc.accessibility._XAccessibleComponent
  * @see ifc.accessibility._XAccessibleExtendedComponent
@@ -136,9 +136,9 @@ public class AccessibleTabBarPageList extends TestCase {
      * @param log writer to log information while testing
      *
      * @see com.sun.star.awt.Toolkit
-     * @see drafts.com.sun.star.accessibility.AccessibleRole
+     * @see com.sun.star.accessibility.AccessibleRole
      * @see ifc.accessibility._XAccessibleEventBroadcaster
-     * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+     * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
     protected TestEnvironment createTestEnvironment(TestParameters tParam,
         PrintWriter log) {
@@ -187,7 +187,7 @@ public class AccessibleTabBarPageList extends TestCase {
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
         oObj = at.getAccessibleObjectForRole(xRoot,
-            AccessibleRole.PAGETABLIST);
+            AccessibleRole.PAGE_TAB_LIST);
 
         log.println("ImplementationName: " + util.utils.getImplName(oObj));
 
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java
index 0e3b825f5df7..347bcc633f80 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleTreeListBox.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:17:55 $
+ *  last change:$Date: 2003-04-28 12:17:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,10 +75,10 @@ import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.awt.XExtendedToolkit;
 import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
@@ -101,10 +101,10 @@ import com.sun.star.lang.XInitialization;
  *  </code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleSelection
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleSelection
  * @see ifc.accessibility._XAccessibleEventBroadcaster
  * @see ifc.accessibility._XAccessibleContext
  * @see ifc.accessibility._XAccessibleComponent
@@ -156,9 +156,9 @@ public class AccessibleTreeListBox extends TestCase {
      * @param log writer to log information while testing
      *
      * @see com.sun.star.awt.Toolkit
-     * @see drafts.com.sun.star.accessibility.AccessibleRole
+     * @see com.sun.star.accessibility.AccessibleRole
      * @see ifc.accessibility._XAccessibleEventBroadcaster
-     * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
+     * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
      */
     protected TestEnvironment createTestEnvironment(
         TestParameters tParam, PrintWriter log) {
@@ -240,10 +240,41 @@ public class AccessibleTreeListBox extends TestCase {
         final XAccessibleComponent fXComp = (XAccessibleComponent)
             UnoRuntime.queryInterface(XAccessibleComponent.class, oObj);
 
+        final XInitialization xInit = (XInitialization)
+                UnoRuntime.queryInterface(
+                        XInitialization.class, the_frame2.getController());
+
+        Object[] params = new Object[3];
+        PropertyValue param1 = new PropertyValue();
+        param1.Name = "DataSourceName";
+        param1.Value = "Bibliography";
+        params[0] = param1;
+        PropertyValue param2 = new PropertyValue();
+        param2.Name = "CommandType";
+        param2.Value = new Integer(com.sun.star.sdb.CommandType.TABLE);
+        params[1] = param2;
+        PropertyValue param3 = new PropertyValue();
+        param3.Name = "Command";
+        param3.Value = "biblio";
+        params[2] = param3;
+
+        final Object[] fParams = params;
+
+//        tEnv.addObjRelation("EventProducer",
+//            new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer(){
+//                public void fireEvent() {
+//                    fXComp.grabFocus();
+//                }
+//            });
+
         tEnv.addObjRelation("EventProducer",
             new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer(){
                 public void fireEvent() {
-                    fXComp.grabFocus();
+                    try {
+                        xInit.initialize(fParams);
+                    } catch(com.sun.star.uno.Exception e) {
+                        e.printStackTrace();
+                    }
                 }
             });
 
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java
index f7f70b1487af..fd7759a9fd16 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleTreeListBoxEntry.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-03-31 13:05:45 $
+ *  last change:$Date: 2003-04-28 12:17:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,10 +75,10 @@ import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.awt.XExtendedToolkit;
 import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
@@ -105,12 +105,12 @@ import com.sun.star.lang.XInitialization;
  *  </code></li>
  * </ul> <p>
  *
- * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
- * @see drafts.com.sun.star.accessibility.XAccessibleContext
- * @see drafts.com.sun.star.accessibility.XAccessibleComponent
- * @see drafts.com.sun.star.accessibility.XAccessibleSelection
- * @see drafts.com.sun.star.accessibility.XAccessibleAction
- * @see drafts.com.sun.star.accessibility.XAccessibleText
+ * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+ * @see com.sun.star.accessibility.XAccessibleContext
+ * @see com.sun.star.accessibility.XAccessibleComponent
+ * @see com.sun.star.accessibility.XAccessibleSelection
+ * @see com.sun.star.accessibility.XAccessibleAction
+ * @see com.sun.star.accessibility.XAccessibleText
  * @see ifc.accessibility._XAccessibleEventBroadcaster
  * @see ifc.accessibility._XAccessibleContext
  * @see ifc.accessibility._XAccessibleComponent
@@ -168,13 +168,13 @@ public class AccessibleTreeListBoxEntry extends TestCase {
      * @param log writer to log information while testing
      *
      * @see com.sun.star.awt.Toolkit
-     * @see drafts.com.sun.star.accessibility.AccessibleRole
+     * @see com.sun.star.accessibility.AccessibleRole
      * @see ifc.accessibility._XAccessibleEventBroadcaster
      * @see ifc.accessibility._XAccessibleSelection
      * @see ifc.accessibility._XAccessibleText
-     * @see drafts.com.sun.star.accessibility.XAccessibleEventBroadcaster
-     * @see drafts.com.sun.star.accessibility.XAccessibleSelection
-     * @see drafts.com.sun.star.accessibility.XAccessibleText
+     * @see com.sun.star.accessibility.XAccessibleEventBroadcaster
+     * @see com.sun.star.accessibility.XAccessibleSelection
+     * @see com.sun.star.accessibility.XAccessibleText
      */
     protected TestEnvironment createTestEnvironment(
         TestParameters tParam, PrintWriter log) {
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java
index eb6f1d8f01bf..2b76c39aaf7e 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleControlShape.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-02-28 14:31:09 $
+ *  last change:$Date: 2003-04-28 12:16:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,8 +68,8 @@ import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
@@ -127,6 +127,8 @@ public class AccessibleControlShape extends TestCase {
 
         at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE);
 
+        at.printAccessibleTree(log,xRoot);
+
         oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE,
             "Button");
 
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java
index 994f1415b8c9..edadecf4309d 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleGraphicShape.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:18:13 $
+ *  last change:$Date: 2003-04-28 12:16:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,8 +68,8 @@ import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java
index 5a63378c9ba0..d333d6af036d 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleOLEShape.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:18:13 $
+ *  last change:$Date: 2003-04-28 12:16:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,8 +69,8 @@ import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java
index 67ccb06f5418..8f1d65969429 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessiblePageShape.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:18:12 $
+ *  last change:$Date: 2003-04-28 12:16:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,8 +68,8 @@ import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java
index 039abaf07eb9..bb481290fa89 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessiblePresentationGraphicShape.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:18:12 $
+ *  last change:$Date: 2003-04-28 12:16:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,8 +69,8 @@ import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java
index b50f8fb39d8c..3f199a3aca3b 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessiblePresentationOLEShape.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:18:12 $
+ *  last change:$Date: 2003-04-28 12:16:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,8 +69,8 @@ import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java
index 33b195dddb81..0965825a533c 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessiblePresentationShape.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:18:11 $
+ *  last change:$Date: 2003-04-28 12:16:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,8 +70,8 @@ import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java
index dc4cca073ef1..2fc1ee3e8f43 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AccessibleShape.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:18:11 $
+ *  last change:$Date: 2003-04-28 12:16:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,8 +68,8 @@ import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
@@ -130,6 +130,7 @@ public class AccessibleShape extends TestCase {
         XWindow xWindow = at.getCurrentWindow (tParam.getMSF(),aModel);
         XAccessible xRoot = at.getAccessibleObject(xWindow);
 
+        //at.printAccessibleTree(log,xRoot);
 
         oObj = at.getAccessibleObjectForRole
             (xRoot, AccessibleRole.SHAPE, "Rectangle");
diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java
index 065b0fb64370..0eb7b2e75bab 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SvxGraphCtrlAccessibleContext.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Date: 2003-01-27 18:18:10 $
+ *  last change: $Date: 2003-04-28 12:16:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,10 +77,10 @@ import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
 import com.sun.star.util.XURLTransformer;
 import com.sun.star.view.XSelectionSupplier;
-import drafts.com.sun.star.accessibility.AccessibleRole;
-import drafts.com.sun.star.accessibility.XAccessible;
-import drafts.com.sun.star.accessibility.XAccessibleComponent;
-import drafts.com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.awt.XExtendedToolkit;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;