CWS-TOOLING: integrate CWS dba32e

2009-08-10 13:16:25 +0200 fs  r274805 : #i84390# typo corrected
2009-08-10 13:04:28 +0200 fs  r274804 : #i103741# properly terminate the last token in a string with a 0 byte
2009-07-24 08:54:05 +0200 msc  r274286 : #103219# changed long name
2009-07-24 08:42:28 +0200 msc  r274285 : #i79649# changed behaviour of the wizard
2009-07-22 14:17:49 +0200 oj  r274238 : GrabFocus
2009-07-22 13:38:01 +0200 oj  r274232 : #i102934# mixed up
2009-07-22 13:37:16 +0200 oj  r274231 : #i102934# mixed up
2009-07-21 12:30:36 +0200 oj  r274176 : crash when using distinct
2009-07-21 10:03:44 +0200 oj  r274163 : set last char to 0
2009-07-21 09:31:22 +0200 oj  r274161 : mediatype corrected
2009-07-20 11:45:33 +0200 fs  r274118 : typo in formatting string
2009-07-20 11:40:39 +0200 fs  r274117 : removed unused include
2009-07-20 11:40:01 +0200 fs  r274116 : class name corrected
2009-07-16 13:41:45 +0200 oj  r274046 : i101587 wrong check for embeddeddatabase url in confguration, have to check path
2009-07-16 13:12:05 +0200 tbo  r274044 : #i103219# adjust declarion to new hid.lst
2009-07-16 12:43:48 +0200 oj  r274041 : #i102497# check also fot longvarchar
2009-07-16 12:15:41 +0200 oj  r274039 : #i103030# handle type description and exceptions as well
2009-07-16 11:14:26 +0200 fs  r274035 : let SVN ignore output paths
2009-07-16 09:23:43 +0200 fs  r274030 : TransforFormComponentProperties: no need to check for attribute equality
2009-07-10 14:16:23 +0200 oj  r273892 : CWS-TOOLING: rebase CWS dba32e to trunk@273858 (milestone: DEV300:m52)
2009-07-01 21:41:50 +0200 fs  r273614 : #i10000#
2009-07-01 15:01:10 +0200 fs  r273589 : Input required doesn't make sense at all in XML form documents
2009-07-01 12:10:31 +0200 fs  r273562 : updated
2009-07-01 11:46:12 +0200 fs  r273560 : #i103219# add about 100 missing long names
2009-07-01 10:11:41 +0200 fs  r273551 : moved from socket/port usage to pipe/name usage, which is more common nowadays
2009-07-01 09:50:03 +0200 fs  r273549 : removed obsolete (empty) folder
2009-07-01 09:47:35 +0200 fs  r273548 : copied the code for the Accessibility Workbench herein, formerly located in the old CVS repository, at gsl/awb
2009-06-30 10:07:47 +0200 fs  r273493 : merging latest changes from CWS dba32d
2009-06-29 20:46:31 +0200 fs  r273482 : #i103138# Rectangle conversions
2009-06-29 10:01:13 +0200 fs  r273453 : #i103138#
refactored the code for positioning/zooming the control
Basically, we now allow adjustControlGeometry_throw (formerly known as positionControl_throw and setControlZoom) to
take an additional ViewTransformation parameter, describing the transformation to obtain the actual
control position/size. Consequently, positionControl itself also allows for a ViewTransformation parameter.
This has become necessary since during painting, the device which we created our control for might not necessarily
have a proper MapMode set. In this case, if we would use this map mode for calculating the control's position/size,
this would lead to wrong results.
Note that this problem was introduced by the fix for #i101398#: During the fix, we postponed the control creation
to a later time (when it is really needed). At this later time, the MapMode at the device is broken, at the earlier
time where we formerly crearted the control (createPrimitive2DSequence), it is not yet broken.
Whether or not the MapMode is defined as "broken" might depend on one's point of view, however ...
I consider it broken, since:
- we need the map mode to obtain the proper zoom level, which is to be forwarded to the control
- there are scenarios where the MapMode is *not* set to MAP_PIXEL (in those scenarios, everything works
  fine), and there are scenarios where it *is* set to MAP_PIXEL (in those the bug 103138 appears).
  It somehow feels wrong that one cannot rely on the device's map mode this way, but on the other hand
  one has no possibility to obtain the current zoom by other means.
Note that one issue (still to be submitted) is left: In the page pane of a Draw/Impress document, controls
have a wrong text size. This is because in this pane, the above-mentioned "broken" map mode is used,
which means the controls have a zoom of "1:1" set, which is wrong here.
2009-06-29 09:52:13 +0200 fs  r273452 : during #i103138#: belongsToDevice is unused nowadays
2009-06-24 12:40:06 +0200 fs  r273329 : #i102888# #i102899#
2009-06-24 12:10:29 +0200 oj  r273327 : #i103030# some code changes
2009-06-24 09:44:14 +0200 oj  r273311 : #i103030# some code changes
2009-06-24 09:24:42 +0200 oj  r273309 : #i103030# add log
2009-06-24 09:03:29 +0200 fs  r273308 : if a col's table name is schema.table, properly quote all parts
2009-06-24 08:56:06 +0200 oj  r273307 : #i102691# changed string
2009-06-23 13:31:43 +0200 oj  r273280 : #i102479# fix date, time and datetime
2009-06-23 12:51:28 +0200 oj  r273277 : #i103020# clear old expression when updating to avoid dead pointers in treelist userdata
2009-06-23 12:17:16 +0200 oj  r273275 : #i103030# add LogBridge
2009-06-23 11:53:10 +0200 oj  r273272 : shawdowed var resolved
2009-06-23 11:48:49 +0200 oj  r273270 : #i103030# add :log to uno env if var UNO_ENV_LOG is set
2009-06-23 11:47:47 +0200 oj  r273269 : #i103030# add LogBridge
2009-06-23 11:47:11 +0200 oj  r273268 : #i103030# add LogBridge
2009-06-23 08:05:08 +0200 oj  r273253 : #i102934# add key for collapsing
2009-06-22 13:21:33 +0200 fs  r273225 : merging latest changes from CWS dba32d
2009-06-22 13:15:22 +0200 fs  r273221 : why restrict to 12 entries?
2009-06-22 08:12:21 +0200 oj  r273196 : #i102655# choosen > chosen typo fixed
2009-06-22 08:08:04 +0200 oj  r273195 : #i102657# typo fix
2009-06-22 08:06:28 +0200 oj  r273194 : #i102934# expanding and collasping of section
2009-06-22 08:05:52 +0200 oj  r273193 : #i102930# set focus in treelistbox
2009-06-22 08:04:56 +0200 oj  r273192 : #i102929# enable tabstop
2009-06-19 13:18:26 +0200 oj  r273157 : remove unused param
2009-06-19 10:07:05 +0200 oj  r273149 : CWS-TOOLING: rebase CWS dba32e to trunk@272827 (milestone: DEV300:m50)
2009-06-19 07:32:40 +0200 oj  r273146 : merge from dba32d to dba32e
2009-06-19 07:22:56 +0200 oj  r273145 : merge from dba32d to dba32e
2009-06-19 07:22:33 +0200 oj  r273144 : merge from dba32d to dba32e
2009-06-18 14:09:34 +0200 fs  r273116 : merging the latest changes from CWS dba32d (up to revision 273108) herein, which effectively is a rebase to DEV300.m50
2009-06-18 08:50:35 +0200 oj  r273098 : #i102894# fix for new line in text
2009-06-18 08:28:48 +0200 oj  r273097 : #i102892# check any
2009-06-18 08:21:34 +0200 oj  r273096 : check if error is valid
2009-06-16 13:49:28 +0200 fs  r273019 : why make a drop down control by default? The form control factory in SVX does this better those days ...
2009-06-10 09:53:20 +0200 oj  r272797 : add lic text
2009-06-10 09:48:55 +0200 oj  r272796 : test added for i101618
2009-06-09 14:57:39 +0200 oj  r272771 : #i101618# access database document only when script container is needed
2009-06-09 12:42:25 +0200 oj  r272765 : #i102497# check type property
2009-06-09 12:32:49 +0200 oj  r272764 : adjust test cases
2009-06-09 12:31:58 +0200 oj  r272763 : adjust test cases
2009-06-09 12:31:22 +0200 oj  r272762 : adjust test cases
2009-06-09 11:35:42 +0200 oj  r272761 : check if error is valid
2009-06-09 11:29:42 +0200 oj  r272760 : #i102497# longvarchar was missing
2009-06-08 14:52:49 +0200 fs  r272733 : #i102564# when setting a new field, also set m_nFieldType
2009-06-08 13:51:20 +0200 oj  r272730 : add tests
2009-06-05 14:38:01 +0200 oj  r272686 : add dep
2009-06-05 14:35:00 +0200 oj  r272684 : add new tests
2009-06-05 13:41:18 +0200 oj  r272681 : code clean ups
2009-06-05 12:40:51 +0200 oj  r272678 : code cleanup
2009-06-05 12:02:57 +0200 oj  r272677 : code cleanup
2009-06-05 10:42:38 +0200 oj  r272670 : #i49320# impl export of single rows and as RTF and HTML
2009-06-03 14:30:37 +0200 oj  r272576 : #i79649# check if file matches filter wildcard
2009-06-03 13:41:57 +0200 oj  r272560 : #i102470# impl not b like 'c'

10 files changed, 1513 insertions, 0 deletions

diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityModel.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityModel.java
new file mode 100644
index 000000000000..6bdb5976f843
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityModel.java
@@ -0,0 +1,188 @@
+/*************************************************************************
+ *
+ *  $RCSfile: AccessibilityModel.java,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: obr $ $Date: 2003/09/19 09:21:39 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.tree;
+
+import javax.swing.SwingUtilities;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.MutableTreeNode;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.awt.XTopWindow;
+import com.sun.star.awt.XTopWindowListener;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleEventBroadcaster;
+import com.sun.star.accessibility.XAccessibleEventListener;
+
+/**
+ *
+ */
+public abstract class AccessibilityModel extends javax.swing.tree.DefaultTreeModel {
+
+    protected java.util.Hashtable nodeList;
+    protected static DefaultMutableTreeNode disconnectedRootNode =
+        new DefaultMutableTreeNode("<not connected>");
+
+    /** Creates a new instance of AccessibilityModel */
+    public AccessibilityModel() {
+        super(disconnectedRootNode, false);
+        nodeList = new java.util.Hashtable();
+    }
+
+    /* Convenience method that creates a new Toolkit node from xToolkit
+     * and sets as the new root object of the tree.
+     */
+    public synchronized void setRoot(XExtendedToolkit xToolkit) {
+        if (xToolkit != null) {
+            try {
+                // remove old root node as topwindow listener
+                if (getRoot() instanceof ToolkitNode) {
+                    ToolkitNode tn = (ToolkitNode) getRoot();
+                    if (tn.xToolkit != null) {
+                        tn.xToolkit.removeTopWindowListener(tn);
+                    }
+                }
+                nodeList.clear();
+                setRoot(new ToolkitNode(xToolkit, this));
+                xToolkit.addTopWindowListener((ToolkitNode) getRoot());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                // FIXME: error message !
+            }
+        }
+    }
+
+    /* Appends the new child to parent's child list */
+    public void addNodeInto(MutableTreeNode newChild, MutableTreeNode parent) {
+        int index = parent.getChildCount();
+        if (newChild != null && newChild.getParent() == parent) {
+            index -= 1;
+        }
+        insertNodeInto(newChild, parent, index);
+    }
+
+    /** Adds listener to the listener chain of node */
+    public static void addEventListener(TreeNode node, XAccessibleEventListener listener) {
+        if (node instanceof AccessibilityNode) {
+            ((AccessibilityNode) node).addEventListener(listener);
+        }
+    }
+
+    /** Removes listener from the listener chain of node */
+    public static void removeEventListener(TreeNode node, XAccessibleEventListener listener) {
+        if (node instanceof AccessibilityNode) {
+            ((AccessibilityNode) node).removeEventListener(listener);
+        }
+    }
+
+    protected abstract AccessibilityNode createWindowNode(XAccessible xAccessible,
+            XAccessibleContext xAccessibleContext);
+    protected abstract AccessibilityNode createNode(XAccessible xAccessible);
+
+    /** Adds xAccessible,node to the internal hashtable */
+    public AccessibilityNode putNode(XAccessible xAccessible, AccessibilityNode node) {
+        if (xAccessible != null) {
+            String oid = UnoRuntime.generateOid(xAccessible);
+            java.lang.ref.WeakReference ref = (java.lang.ref.WeakReference)
+                nodeList.put(oid, new java.lang.ref.WeakReference(node));
+            if (ref != null) {
+                return (AccessibilityNode) ref.get();
+            }
+        }
+        return null;
+    }
+
+    /** Returns the AccessibilityNode for xAccessible */
+    public AccessibilityNode findNode(XAccessible xAccessible) {
+        if (xAccessible != null) {
+            String oid = UnoRuntime.generateOid(xAccessible);
+            java.lang.ref.WeakReference ref =
+                (java.lang.ref.WeakReference) nodeList.get(oid);
+            if (ref != null) {
+                return (AccessibilityNode) ref.get();
+            }
+        }
+        return null;
+    }
+
+    /** Removes the AccessibilityNode for xAccessible from the internal hashtable */
+    public AccessibilityNode removeNode(XAccessible xAccessible) {
+        if (xAccessible != null) {
+            String oid = UnoRuntime.generateOid(xAccessible);
+            java.lang.ref.WeakReference ref =
+                (java.lang.ref.WeakReference) nodeList.remove(oid);
+            if (ref != null) {
+                return (AccessibilityNode) ref.get();
+            }
+        }
+        return null;
+    }
+
+    public AccessibilityNode removeNode(Object o) {
+        if (o instanceof XAccessible) {
+            return removeNode((XAccessible) o);
+        }
+        return null;
+    }
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java
new file mode 100644
index 000000000000..36c5d71b240e
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java
@@ -0,0 +1,200 @@
+/*************************************************************************
+ *
+ *  $RCSfile: AccessibilityNode.java,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: obr $ $Date: 2003/09/19 09:21:39 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.tree;
+
+import org.openoffice.accessibility.misc.AccessibleEventMulticaster;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.SwingUtilities;
+
+import com.sun.star.accessibility.AccessibleEventId;
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleEventBroadcaster;
+import com.sun.star.accessibility.XAccessibleEventListener;
+
+import com.sun.star.uno.UnoRuntime;
+
+class AccessibilityNode extends DefaultMutableTreeNode implements XAccessible,
+        XAccessibleEventListener, XAccessibleEventBroadcaster {
+
+    protected AccessibilityModel treeModel;
+    protected XAccessibleContext unoAccessibleContext;
+
+    private XAccessibleEventListener listener;
+
+    public AccessibilityNode(AccessibilityModel treeModel) {
+        this.treeModel = treeModel;
+    }
+
+    protected void finalize() throws java.lang.Throwable {
+        if (userObject != null) {
+            treeModel.removeNode(userObject);
+        }
+    }
+
+    /** Sets the XAccessibleContext object of this node */
+    public void setAccessibleContext(XAccessibleContext xAccessibleContext) {
+        unoAccessibleContext = xAccessibleContext;
+    }
+
+    /** Returns the XAccessibleContext object of this node */
+    public XAccessibleContext getAccessibleContext() {
+        return unoAccessibleContext;
+    }
+
+    /** Attaches or Detaches the itself as listener to unoAccessibleContext */
+    protected void setAttached(boolean attach) {
+        XAccessibleContext xAccessibleContext = unoAccessibleContext;
+        if (xAccessibleContext != null) {
+            try {
+                XAccessibleEventBroadcaster xAccessibleEventBroadcaster =
+                    (XAccessibleEventBroadcaster) UnoRuntime.queryInterface(
+                        XAccessibleEventBroadcaster.class, xAccessibleContext);
+                if (xAccessibleEventBroadcaster != null) {
+                    if (attach) {
+                        xAccessibleEventBroadcaster.addEventListener(this);
+                    } else {
+                        xAccessibleEventBroadcaster.removeEventListener(this);
+                    }
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+                // FIXME: error message !
+            }
+        }
+    }
+
+    public void disposing(com.sun.star.lang.EventObject eventObject) {
+        XAccessibleEventListener listener = this.listener;
+        if (listener != null) {
+            listener.disposing(eventObject);
+        }
+
+        treeModel.removeNode(userObject);
+        userObject = null;
+        unoAccessibleContext = null;
+        // FIXME: mark the object as being disposed in the tree view !
+    }
+
+    protected void handleChildRemoved(XAccessible xAccessible) {
+        final AccessibilityNode node = treeModel.findNode(xAccessible);
+        if (node != null) {
+            SwingUtilities.invokeLater(new java.lang.Runnable() {
+                public void run() {
+                    treeModel.removeNodeFromParent(node);
+                }
+            });
+        }
+    }
+
+    protected void handleChildAdded(XAccessible xAccessible) {
+        final AccessibilityNode parent = this;
+        final AccessibilityNode node = treeModel.createNode(xAccessible);
+        if (node != null) {
+            SwingUtilities.invokeLater(new java.lang.Runnable() {
+                public void run() {
+                    try {
+                        XAccessibleContext xAC = node.getAccessibleContext();
+                        if (xAC != null) {
+                            treeModel.insertNodeInto(node, parent,
+                                xAC.getAccessibleIndexInParent());
+                        }
+                    } catch (com.sun.star.uno.RuntimeException e) {
+                        // FIXME: output
+                    }
+                }
+            });
+        }
+    }
+
+    public void notifyEvent(AccessibleEventObject accessibleEventObject) {
+        if (accessibleEventObject.EventId == AccessibleEventId.CHILD) {
+            XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(
+                XAccessible.class, accessibleEventObject.OldValue);
+            if (xAccessible != null) {
+                handleChildRemoved(xAccessible);
+            }
+
+            xAccessible = (XAccessible) UnoRuntime.queryInterface(
+                XAccessible.class, accessibleEventObject.NewValue);
+            if (xAccessible != null) {
+                handleChildAdded(xAccessible);
+            }
+        }
+
+        XAccessibleEventListener listener = this.listener;
+        if (listener != null) {
+            listener.notifyEvent(accessibleEventObject);
+        }
+    }
+
+    public synchronized void addEventListener(com.sun.star.accessibility.XAccessibleEventListener xAccessibleEventListener) {
+         listener = AccessibleEventMulticaster.add(listener, xAccessibleEventListener);
+    }
+
+    public synchronized void removeEventListener(com.sun.star.accessibility.XAccessibleEventListener xAccessibleEventListener) {
+        listener = AccessibleEventMulticaster.remove(listener, xAccessibleEventListener);
+    }
+}
+
+
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTree.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTree.java
new file mode 100644
index 000000000000..f7e71d21574e
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTree.java
@@ -0,0 +1,123 @@
+/*************************************************************************
+ *
+ *  $RCSfile: AccessibilityTree.java,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: obr $ $Date: 2003/09/19 09:21:39 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.tree;
+
+import org.openoffice.accessibility.misc.NameProvider;
+
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+import com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+
+/**
+ *
+ */
+public class AccessibilityTree extends javax.swing.JTree {
+
+    /** Creates a new instance of AccessibilityTree */
+    public AccessibilityTree(javax.swing.tree.TreeModel model) {
+        super(model);
+        // always show handles to indicate expandable / collapsable
+        showsRootHandles = true;
+    }
+
+    public void setToolkit(XExtendedToolkit xToolkit) {
+        AccessibilityModel model = (AccessibilityModel) getModel();
+        if (model != null) {
+            // hide the root node when connected
+            setRootVisible(xToolkit == null);
+            // update the root node
+            model.setRoot(xToolkit);
+            model.reload();
+        }
+    }
+
+     public String convertValueToText(Object value, boolean selected,
+            boolean expanded, boolean leaf, int row, boolean hasFocus) {
+
+        if (value instanceof DefaultMutableTreeNode) {
+            DefaultMutableTreeNode node = (DefaultMutableTreeNode) value;
+
+            Object userObject = node.getUserObject();
+            if (userObject != null && userObject instanceof XAccessible) {
+                XAccessible xAccessible = (XAccessible) userObject;
+                try {
+                    XAccessibleContext xAC = xAccessible.getAccessibleContext();
+                    if (xAC != null) {
+                        String name = xAC.getAccessibleName();
+                        if (name.length() == 0) {
+                            name = new String ("<no name>");
+                        }
+                        value = name + " / " + NameProvider.getRoleName(xAC.getAccessibleRole());
+                    }
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    value = "???";
+                }
+            }
+        }
+
+        return super.convertValueToText(value, selected, expanded, leaf, row, hasFocus);
+     }
+
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTreeModel.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTreeModel.java
new file mode 100644
index 000000000000..acecd0100a2e
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTreeModel.java
@@ -0,0 +1,251 @@
+/*************************************************************************
+ *
+ *  $RCSfile: AccessibilityTreeModel.java,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: af $ $Date: 2003/06/13 16:30:28 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc.,y October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.tree;
+
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.lang.DisposedException;
+import com.sun.star.lang.IndexOutOfBoundsException;
+
+import org.openoffice.accessibility.misc.OfficeConnection;
+import org.openoffice.accessibility.awb.event.EventQueue;
+
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeNode;
+
+
+public class AccessibilityTreeModel
+    extends DefaultTreeModel
+{
+    public AccessibilityTreeModel ()
+    {
+        super (null);
+        setAsksAllowsChildren (false);
+
+        SetRootNode();
+    }
+
+
+
+    /** Release all resources.
+    */
+    synchronized public void Dispose ()
+    {
+        Clear ();
+    }
+
+
+
+    /** Calls to this method are dispatched to the given node but are
+        observed for exceptions.
+    */
+    synchronized public boolean isLeaf (Object aObject)
+    {
+        boolean bIsLeaf = true;
+
+        if (aObject != null)
+        {
+            AccessibilityNode aNode = (AccessibilityNode)aObject;
+            try
+            {
+                bIsLeaf = aNode.isLeaf();
+            }
+            catch (DisposedException aException)
+            {
+                System.out.println ("node is disposed. removing it");
+                /*                TreeNode aParent = aNode.GetParent();
+                int nIndexInParent = aParent.getIndex (aNode);
+                aNode.removeFromParent ();
+                System.out.println ("" + aParent + " # " + aNode + " # "+ nIndexInParent);
+                nodesWereRemoved (
+                    aParent, new int[]{nIndexInParent}, new
+                    Object[]{aNode});
+                */
+            }
+            catch (Exception aException)
+            {
+                System.err.println ("caught exception in AccessibilityTreeModel.isLeaf():"
+                    + aException);
+                aException.printStackTrace (System.err);
+            }
+        }
+
+        return bIsLeaf;
+    }
+
+
+
+
+    synchronized public int getChildCount (Object aObject)
+    {
+        AccessibilityNode aNode = (AccessibilityNode)aObject;
+        return aNode.getChildCount();
+    }
+
+
+
+
+    /** Return the requested child of aParent.  If that child is not yet
+        known to the parent then try to create it.
+    */
+    synchronized public Object getChild (Object aParent, final int nIndex)
+    {
+        AccessibilityNode aChild = null;
+
+        final AccessibilityNode aParentNode = (AccessibilityNode)aParent;
+
+        // Try to get an existing child from the super class object.
+        aChild = aParentNode.GetChildNoCreate (nIndex);
+
+        // When the requested child does not yet exist and this node is not a
+        // special node then create a new node.
+        if (aChild == null)
+        {
+            aChild = aParentNode.CreateChild (nIndex);
+            aParentNode.SetChild ((AccessibilityNode)aChild, nIndex);
+            /*            EventQueue.Instance().AddEvent (new Runnable() { public void run() {
+                AccessibilityTreeModel.this.nodeWasInserted (
+                    aParentNode, nIndex);
+            }});
+            */        }
+
+        return aChild;
+    }
+
+
+    synchronized public void nodeWasInserted (AccessibilityNode aParent, int nIndex)
+    {
+        nodesWereInserted (aParent, new int[]{nIndex});
+        nodeStructureChanged (aParent);
+
+    }
+
+
+
+
+    /** Clear the tree so that afterwards it has only the root node.
+    */
+    public void Clear ()
+    {
+        AccessibilityNode aRoot = (AccessibilityNode)getRoot();
+        aRoot.RemoveAllChildren();
+        SetRootNode();
+        nodeStructureChanged (aRoot);
+    }
+
+
+
+
+    private void SetRootNode ()
+    {
+        OfficeConnection aConnection = OfficeConnection.Instance();
+        AccessibilityNode aRoot;
+        if (aConnection!=null && aConnection.IsValid())
+            aRoot = new AccessibilityNode ("<connected>");
+        else
+            aRoot = new AccessibilityNode ("<not connected>");
+        setRoot (aRoot);
+    }
+
+
+
+
+    /** Add a new child to the root node.
+    */
+    public synchronized void AddTopLevelNode (AccessibilityNode aNode)
+    {
+        if (aNode != null)
+        {
+            if ( ! OfficeConnection.Instance().IsValid())
+            {
+                setRoot (null);
+            }
+
+            AccessibilityNode aRoot = (AccessibilityNode)getRoot();
+            if (aRoot == null)
+            {
+                aRoot = new AccessibilityNode ("<connected>");
+                setRoot (aRoot);
+            }
+
+            aNode.SetParent (aRoot);
+            aRoot.Append (aNode);
+            nodesWereInserted (aRoot, new int[]{aRoot.getIndex (aNode)});
+        }
+    }
+
+
+
+
+    /** Remove a node that is a direct child of the root.
+    */
+    public synchronized void RemoveTopLevelNode (AccessibilityNode aNode)
+    {
+        AccessibilityNode aRoot = (AccessibilityNode)getRoot();
+        if (aRoot != null)
+        {
+            int nIndex = aRoot.getIndex (aNode);
+            aRoot.Remove (aNode);
+            nodesWereRemoved (aRoot, new int[]{nIndex}, new Object[]{aNode});
+        }
+    }
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityModel.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityModel.java
new file mode 100644
index 000000000000..0f5626852238
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityModel.java
@@ -0,0 +1,157 @@
+/*************************************************************************
+ *
+ *  $RCSfile: DynamicAccessibilityModel.java,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: obr $ $Date: 2003/09/19 09:21:39 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.tree;
+
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.MutableTreeNode;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.event.TreeExpansionListener;
+import javax.swing.event.TreeWillExpandListener;
+
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+
+/**
+ *
+ */
+public class DynamicAccessibilityModel extends AccessibilityModel implements TreeExpansionListener, TreeWillExpandListener {
+
+    /* Creates a AccessibilityNode object for a window */
+    protected AccessibilityNode createWindowNode(XAccessible xAccessible,
+            XAccessibleContext xAccessibleContext) {
+        if (xAccessible != null) {
+            // Some objects inherit XAccessible, but should not appear in
+            // the hierarchy as toplevels (like sub-menus), so they don't
+            // return an accessible context.
+            if (xAccessibleContext != null) {
+                AccessibilityNode node = new AccessibilityNode(this);
+                node.setUserObject(xAccessible);
+                node.setAccessibleContext(xAccessibleContext);
+                putNode(xAccessible, node);
+                return node;
+            }
+        }
+        return null;
+    }
+
+    /* Creates a DynamicAccessibilityNode object */
+    protected AccessibilityNode createNode(XAccessible xAccessible) {
+        if (xAccessible != null) {
+            try {
+                // Some objects inherit XAccessible, but should not appear in
+                // the hierarchy as toplevels (like sub-menus), so they don't
+                // return an accessible context.
+                XAccessibleContext xAccessibleContext = xAccessible.getAccessibleContext();
+                if (xAccessibleContext != null) {
+                    AccessibilityNode node = new DynamicAccessibilityNode(this);
+                    node.setUserObject(xAccessible);
+                    node.setAccessibleContext(xAccessibleContext);
+                    putNode(xAccessible, node);
+                    return node;
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+        }
+        return null;
+    }
+
+    public void treeCollapsed(javax.swing.event.TreeExpansionEvent treeExpansionEvent) {
+        TreeNode node = (TreeNode) treeExpansionEvent.getPath().getLastPathComponent();
+        if (node instanceof DynamicAccessibilityNode) {
+            DynamicAccessibilityNode dynode = (DynamicAccessibilityNode) node;
+            dynode.clear();
+        }
+    }
+
+    public void treeExpanded(javax.swing.event.TreeExpansionEvent treeExpansionEvent) {
+        TreeNode node = (TreeNode) treeExpansionEvent.getPath().getLastPathComponent();
+        if (node instanceof AccessibilityNode) {
+            // Calling oneway methods from an UNO thread may cause
+            // deadlocks, so adding the listeners here.
+            for (java.util.Enumeration e = node.children(); e.hasMoreElements(); ) {
+                ((AccessibilityNode) e.nextElement()).setAttached(true);
+            }
+        }
+    }
+
+    public void treeWillCollapse(javax.swing.event.TreeExpansionEvent treeExpansionEvent)
+            throws javax.swing.tree.ExpandVetoException {
+        TreeNode node = (TreeNode) treeExpansionEvent.getPath().getLastPathComponent();
+        if (node instanceof AccessibilityNode) {
+            // Calling oneway methods from an UNO thread may cause
+            // deadlocks, so adding the listeners here.
+            for (java.util.Enumeration e = node.children(); e.hasMoreElements(); ) {
+                ((AccessibilityNode) e.nextElement()).setAttached(false);
+            }
+        }
+    }
+
+    public void treeWillExpand(javax.swing.event.TreeExpansionEvent treeExpansionEvent)
+            throws javax.swing.tree.ExpandVetoException {
+        TreeNode node = (TreeNode) treeExpansionEvent.getPath().getLastPathComponent();
+        if (node instanceof DynamicAccessibilityNode) {
+            DynamicAccessibilityNode dynode = (DynamicAccessibilityNode) node;
+            dynode.populate();
+        }
+    }
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityNode.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityNode.java
new file mode 100644
index 000000000000..ff6f5ddd45ea
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityNode.java
@@ -0,0 +1,126 @@
+/*************************************************************************
+ *
+ *  $RCSfile: DynamicAccessibilityNode.java,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: obr $ $Date: 2003/09/19 09:21:40 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.tree;
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+
+/*
+ * This class is dynamic in the way that it does not contain any children
+ * until the node is going to be expanded. It also releases all children
+ * as soon as the node is collapsed again.
+ */
+class DynamicAccessibilityNode extends AccessibilityNode {
+
+    public DynamicAccessibilityNode(AccessibilityModel treeModel) {
+        super(treeModel);
+    }
+
+    // Populates the child list. Called by AccessibilityMode.treeWillExpand().
+    protected void populate() {
+        try {
+            XAccessibleContext xAC = getAccessibleContext();
+            if (xAC != null) {
+                int n = xAC.getAccessibleChildCount();
+                for (int i=0; i<n; i++) {
+                    XAccessible xAccessible = xAC.getAccessibleChild(i);
+                    AccessibilityNode node = treeModel.findNode(xAccessible);
+                    if (node == null) {
+                        node = treeModel.createNode(xAccessible);
+                    }
+                    if (node != null) {
+                        // NOTE: do not send any tree notifications here !
+                        add(node);
+                    }
+                }
+            }
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            // This should never happen since we previously checked the child
+            // count.
+            // FIXME: error message
+        } catch (com.sun.star.uno.RuntimeException e) {
+            // FIXME: error message
+        }
+    }
+
+    // Clears the child list. Called by AccessibilityModel.treeCollapsed().
+    protected void clear() {
+        removeAllChildren();
+    }
+
+    /* This is called whenever the node is painted, no matter if collapsed
+     * or expanded. Making this a "life" value seems to be appropriate.
+     */
+    public boolean isLeaf() {
+        try {
+            XAccessibleContext xAC = getAccessibleContext();
+            if (xAC != null) {
+                return xAC.getAccessibleChildCount() == 0;
+            }
+            return true;
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return true;
+        }
+    }
+
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile b/accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile
new file mode 100644
index 000000000000..8166c0b91312
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile
@@ -0,0 +1,71 @@
+#*************************************************************************
+#
+#   $RCSfile: Makefile,v $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
+all : package
+
+ROOT=../../../../..
+PACKAGE = org.openoffice.accessibility.awb.tree
+SUBDIRS =
+include makefile.common
+
+include $(ROOT)/makefile.in
+
+
+package : $(CLASS_FILES)
+
+
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.java
new file mode 100644
index 000000000000..30a6f578f06e
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.java
@@ -0,0 +1,249 @@
+/*************************************************************************
+ *
+ *  $RCSfile: ToolkitNode.java,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: obr $ $Date: 2003/09/19 09:21:41 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.tree;
+
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+
+import com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.awt.XTopWindow;
+
+import com.sun.star.uno.UnoRuntime;
+
+import javax.swing.SwingUtilities;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+/**
+ *
+ */
+public class ToolkitNode extends DefaultMutableTreeNode
+        implements com.sun.star.awt.XTopWindowListener {
+
+    protected XExtendedToolkit xToolkit;
+
+    private AccessibilityModel treeModel;
+
+    /** Creates a new instance of TopWindowListener */
+    public ToolkitNode(XExtendedToolkit xToolkit, AccessibilityModel treeModel) {
+        super("<connected>");
+        this.xToolkit = xToolkit;
+        this.treeModel = treeModel;
+
+        // Initially fill the child list
+        try {
+            for (int i=0,j=xToolkit.getTopWindowCount(); i<j; i++) {
+                XTopWindow xTopWindow = xToolkit.getTopWindow(i);
+                if (xTopWindow != null) {
+                    AccessibilityNode an = getTopWindowNode(xTopWindow);
+                    if (an != null) {
+                        add(an);
+                        // Calling oneway methods from an UNO thread may cause
+                        // deadlocks, so adding the listeners here.
+                        an.setAttached(true);
+                    }
+                }
+            }
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            // This should never happen since we properly check the count
+            // before - anyway returning what we got so far.
+        }
+    }
+
+    /** Returns an AccessibilityNode if xAccessible has a valid toplevel */
+    private AccessibilityNode getTopWindowNode(XAccessible xAccessible) {
+        XAccessibleContext xAC = xAccessible.getAccessibleContext();
+        if (xAC != null) {
+            short role = xAC.getAccessibleRole();
+            if ((role == AccessibleRole.FRAME) || (role == AccessibleRole.DIALOG) || (role == AccessibleRole.WINDOW)) {
+                return treeModel.createWindowNode(xAccessible, xAC);
+            }
+        }
+        return null;
+    }
+
+    /** Returns an AccessibilityNode if xAccessible has a valid toplevel */
+    private AccessibilityNode getTopWindowNode(XAccessible xAccessible, XAccessibleContext xAC) {
+        if (xAC != null) {
+            short role = xAC.getAccessibleRole();
+            if ((role == AccessibleRole.FRAME) || (role == AccessibleRole.DIALOG) || (role == AccessibleRole.WINDOW)) {
+                AccessibilityNode parent = treeModel.createWindowNode(xAccessible, xAC);
+                if (parent != null) {
+                    try {
+                        int n = xAC.getAccessibleChildCount();
+                        for (int i=0; i<n; i++) {
+                            AccessibilityNode child = treeModel.createNode(xAC.getAccessibleChild(i));
+                            if (child != null) {
+                                parent.add(child);
+                            }
+                        }
+                    } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+
+                    }
+                }
+                return parent;
+            }
+        }
+        return null;
+    }
+
+    /** Returns the XAccessible interface corresponding to the toplevel window */
+    private AccessibilityNode getTopWindowNode(XTopWindow w) {
+        XAccessible xAccessible = (XAccessible)
+            UnoRuntime.queryInterface(XAccessible.class, w);
+        if (xAccessible != null) {
+            // XTopWindows usually have an accessible parent, which is the
+            // native container window ..
+            XAccessibleContext xAC = xAccessible.getAccessibleContext();
+            if (xAC != null) {
+                XAccessible xParent = xAC.getAccessibleParent();
+                if (xParent != null) {
+                    AccessibilityNode parent = getTopWindowNode(xParent);
+                    AccessibilityNode child = treeModel.createNode(xAccessible);
+                    if (parent != null && child != null) {
+                        parent.add(child);
+                    }
+                    return parent;
+                } else {
+                    return getTopWindowNode(xAccessible, xAC);
+                }
+            }
+        }
+        return null;
+    }
+
+    public void disposing(com.sun.star.lang.EventObject eventObject) {
+        // FIXME : message
+        // prevent setRoot from removing this as event listener
+        xToolkit = null;
+        treeModel.setRoot(treeModel.disconnectedRootNode);
+    }
+
+    public void windowActivated(com.sun.star.lang.EventObject eventObject) {
+    }
+
+    public void windowClosed(com.sun.star.lang.EventObject eventObject) {
+        XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(
+            XAccessible.class, eventObject.Source);
+        if (xAccessible != null) {
+            AccessibilityNode node = treeModel.findNode(xAccessible);
+
+            // The object implementing XTopWindow is often not the toplevel
+            // accessible object.
+            if (node != null && node.getParent() != this) {
+                node = (AccessibilityNode) node.getParent();
+            }
+
+            if (node != null) {
+                final AccessibilityNode an = node;
+                Runnable removeRun = new Runnable() {
+                    public void run() {
+                        try {
+                            treeModel.removeNodeFromParent(an);
+                            // Calling oneway methods from an UNO thread may cause
+                            // deadlocks, so removing the listeners here.
+                            an.setAttached(false);
+                        } catch (IllegalArgumentException e) {
+                            // for some toplevel we get more than one event -
+                            // ignoring
+                        }
+                    }
+                };
+                SwingUtilities.invokeLater(removeRun);
+            }
+        }
+    }
+
+    public void windowClosing(com.sun.star.lang.EventObject eventObject) {
+    }
+
+    public void windowDeactivated(com.sun.star.lang.EventObject eventObject) {
+    }
+
+    public void windowMinimized(com.sun.star.lang.EventObject eventObject) {
+    }
+
+    public void windowNormalized(com.sun.star.lang.EventObject eventObject) {
+    }
+
+    public void windowOpened(com.sun.star.lang.EventObject eventObject) {
+        final XTopWindow xTopWindow = (XTopWindow) UnoRuntime.queryInterface(
+            XTopWindow.class, eventObject.Source);
+        if (xTopWindow != null) {
+            final ToolkitNode tn = this;
+            Runnable addNodeRun = new Runnable() {
+                public void run() {
+                    // Note: UNO does not allow to make synchronous callbacks
+                    // to oneway calls, so we have to fetch the node here.
+                    AccessibilityNode an = getTopWindowNode(xTopWindow);
+                    if (an != null) {
+                        treeModel.addNodeInto(an, tn);
+                        // Calling oneway methods from an UNO thread may cause
+                        // deadlocks, so adding the listeners here.
+                        an.setAttached(true);
+                    }
+                }
+            };
+            SwingUtilities.invokeLater(addNodeRun);
+        }
+    }
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common
new file mode 100644
index 000000000000..7a0813b099db
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common
@@ -0,0 +1,66 @@
+#*************************************************************************
+#
+#   $RCSfile: makefile.common,v $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
+JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar 
+JAVAFILES = 						\
+	AccessibilityModel.java \
+	AccessibilityNode.java \
+	AccessibilityTree.java \
+	DynamicAccessibilityModel.java \
+	DynamicAccessibilityNode.java \
+	ToolkitNode.java
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.mk b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.mk
new file mode 100644
index 000000000000..7867cf1cc672
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.mk
@@ -0,0 +1,82 @@
+#*************************************************************************
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
+PRJNAME	= awb
+PRJ		= ..$/..$/..$/..$/..$/..
+TARGET	= java_tree
+PACKAGE	= org$/openoffice$/accessibility$/awb$/tree
+
+USE_JAVAVER:=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+.IF "$(JAVAVER:s/.//)" >= "140" 
+
+.INCLUDE : makefile.common
+
+JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+
+.INCLUDE :  target.mk
+