1 files changed, 32 insertions, 9 deletions
diff --git a/toolkit/test/accessibility/AccessibleImageHandler.java b/toolkit/test/accessibility/AccessibleImageHandler.java
index 260207699383..de924c00facf 100644
--- a/toolkit/test/accessibility/AccessibleImageHandler.java
+++ b/toolkit/test/accessibility/AccessibleImageHandler.java
@@ -1,25 +1,48 @@
 
 import com.sun.star.uno.UnoRuntime;
+import drafts.com.sun.star.accessibility.XAccessibleContext;
 import drafts.com.sun.star.accessibility.XAccessibleImage;
 
 
 class AccessibleImageHandler extends NodeHandler
 {
-    protected XAccessibleImage getImage(Object aObject)
+    public NodeHandler createHandler (XAccessibleContext xContext)
+    {
+        XAccessibleImage xImage =
+            (XAccessibleImage) UnoRuntime.queryInterface (
+                XAccessibleImage.class, xContext);
+        if (xImage != null)
+            return new AccessibleImageHandler (xImage);
+        else
+            return null;
+    }
+
+    public AccessibleImageHandler ()
     {
-        return (XAccessibleImage) UnoRuntime.queryInterface (
-            XAccessibleImage.class, aObject);
     }
 
-    public int getChildCount(Object aObject)
+    public AccessibleImageHandler (XAccessibleImage xImage)
     {
-        return (getImage(aObject) == null) ? 0 : 1;
+        if (xImage != null)
+            maChildList.setSize (1);
+    }
+
+    protected static XAccessibleImage getImage (AccTreeNode aNode)
+    {
+        return (XAccessibleImage) UnoRuntime.queryInterface (
+            XAccessibleImage.class, aNode.getContext());
     }
 
-    public Object getChild(Object aObject, int nIndex)
+    public AccessibleTreeNode createChild (AccessibleTreeNode aParent, int nIndex)
     {
-        XAccessibleImage xImage = getImage(aObject);
-        return (xImage == null) ? "" :
-            "Image description: " + xImage.getAccessibleImageDescription();
+        if (aParent instanceof AccTreeNode)
+        {
+            XAccessibleImage xImage = getImage ((AccTreeNode)aParent);
+            if (xImage != null)
+                return new StringNode (
+                    "Image description: " + xImage.getAccessibleImageDescription(),
+                    aParent);
+        }
+        return null;
     }
 }