Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

29 files changed, 4913 insertions, 0 deletions

diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx
new file mode 100644
index 000000000..ba00e00d6
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -0,0 +1,284 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+
+#pragma once
+
+#include <extended/AccessibleBrowseBoxBase.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/weakref.hxx>
+#include <vcl/accessibletableprovider.hxx>
+#include <mutex>
+
+namespace accessibility {
+
+    class AccessibleBrowseBoxHeaderBar;
+    class AccessibleBrowseBoxTable;
+
+
+/** This class represents the complete accessible BrowseBox object. */
+class AccessibleBrowseBox : public AccessibleBrowseBoxBase
+{
+    friend class AccessibleBrowseBoxAccess;
+
+protected:
+    AccessibleBrowseBox(
+        const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
+        const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator,
+        ::vcl::IAccessibleTableProvider& _rBrowseBox
+    );
+
+    virtual ~AccessibleBrowseBox() override;
+
+    /** sets the XAccessible which created the context
+
+        To be called only once, and only if in the ctor NULL was passed.
+    */
+    void    setCreator(
+        const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator
+    );
+
+    /** Cleans up members. */
+    using AccessibleBrowseBoxBase::disposing;
+    virtual void SAL_CALL disposing() override;
+
+protected:
+    // XAccessibleContext
+
+    /** @return  The count of visible children. */
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+
+    /** @return  The XAccessible interface of the specified child. */
+    virtual css::uno::Reference<
+        css::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild( sal_Int32 nChildIndex ) override;
+
+    // XAccessibleComponent
+
+    /** @return
+            The accessible child rendered under the given point.
+    */
+    virtual css::uno::Reference<
+        css::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
+
+    /** Grabs the focus to the BrowseBox. */
+    virtual void SAL_CALL grabFocus() override;
+
+    // XServiceInfo
+
+    /** @return
+            The name of this class.
+    */
+    virtual OUString SAL_CALL getImplementationName() override;
+
+public:
+    // helper functions
+    /** commitHeaderBarEvent commit the event at all listeners of the column/row header bar
+        @param nEventId
+            the event id
+        @param rNewValue
+            the new value
+        @param rOldValue
+            the old value
+        @param _bColumnHeaderBar
+            true if a column based header bar, false if a row based header bar
+    */
+    void commitHeaderBarEvent(sal_Int16 nEventId,
+            const css::uno::Any& rNewValue,
+            const css::uno::Any& rOldValue, bool _bColumnHeaderBar);
+
+    // helper functions
+    /** commitTableEvent commit the event at all listeners of the table
+        @param nEventId
+            the event id
+        @param rNewValue
+            the new value
+        @param rOldValue
+            the old value
+    */
+    void commitTableEvent(sal_Int16 nEventId,
+            const css::uno::Any& rNewValue,
+            const css::uno::Any& rOldValue);
+
+    /** returns the accessible object for the row or the column header bar
+    */
+    css::uno::Reference<
+        css::accessibility::XAccessible >
+        getHeaderBar( AccessibleBrowseBoxObjType _eObjType )
+        {
+            return implGetHeaderBar(_eObjType);
+        }
+
+    /** returns the accessible object for the table representation
+    */
+    css::uno::Reference<
+        css::accessibility::XAccessible >
+        getTable( )
+        {
+            return implGetTable();
+        }
+
+protected:
+    // internal virtual methods
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual tools::Rectangle implGetBoundingBox() override;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
+
+    // internal helper methods
+
+    /** This method creates (once) and returns the accessible data table child.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the data table. */
+    css::uno::Reference<
+        css::accessibility::XAccessible > implGetTable();
+
+    /** This method creates (once) and returns the specified header bar.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the header bar. */
+    css::uno::Reference<
+        css::accessibility::XAccessible >
+        implGetHeaderBar( AccessibleBrowseBoxObjType eObjType );
+
+    /** This method returns one of the children that are always present:
+        Data table, row and column header bar or corner control.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the specified child. */
+    css::uno::Reference<
+        css::accessibility::XAccessible >
+    implGetFixedChild( sal_Int32 nChildIndex );
+
+    /** This method creates and returns an accessible table.
+        @return  An AccessibleBrowseBoxTable. */
+    virtual rtl::Reference<AccessibleBrowseBoxTable> createAccessibleTable();
+
+private:
+    /// the css::accessibility::XAccessible which created the AccessibleBrowseBox
+    css::uno::WeakReference< css::accessibility::XAccessible >  m_aCreator;
+
+    /** The data table child. */
+    rtl::Reference<AccessibleBrowseBoxTable>                    mxTable;
+
+    /** The header bar for rows ("handle column"). */
+    rtl::Reference<AccessibleBrowseBoxHeaderBar>                mxRowHeaderBar;
+
+    /** The header bar for columns (first row of the table). */
+    rtl::Reference<AccessibleBrowseBoxHeaderBar>                mxColumnHeaderBar;
+};
+
+
+/** the XAccessible which creates/returns an AccessibleBrowseBox
+
+    The instance holds its XAccessibleContext with a hard reference, while
+    the context holds this instance weak.
+*/
+class AccessibleBrowseBoxAccess final :
+    public cppu::WeakImplHelper<css::accessibility::XAccessible>,
+    public ::vcl::IAccessibleBrowseBox
+{
+private:
+    std::mutex                          m_aMutex;
+    css::uno::Reference< css::accessibility::XAccessible >
+                                        m_xParent;
+    ::vcl::IAccessibleTableProvider&    m_rBrowseBox;
+
+    rtl::Reference<AccessibleBrowseBox> m_xContext;
+
+public:
+    AccessibleBrowseBoxAccess(
+        css::uno::Reference< css::accessibility::XAccessible > _xParent,
+        ::vcl::IAccessibleTableProvider& _rBrowseBox
+    );
+
+    /// returns the AccessibleContext belonging to this Accessible
+    AccessibleBrowseBox*            getContext() { return m_xContext.get(); }
+
+private:
+    virtual ~AccessibleBrowseBoxAccess() override;
+
+    // XAccessible
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext >
+        SAL_CALL getAccessibleContext() override;
+
+    // IAccessibleBrowseBox
+    virtual css::uno::Reference< css::accessibility::XAccessible >
+        getMyself() override
+    {
+        return this;
+    }
+    void dispose() override;
+    virtual bool isAlive() const override
+    {
+        return m_xContext.is() && m_xContext->isAlive();
+    }
+    virtual css::uno::Reference< css::accessibility::XAccessible >
+        getHeaderBar( AccessibleBrowseBoxObjType _eObjType ) override
+    {
+        css::uno::Reference< css::accessibility::XAccessible > xAccessible;
+        AccessibleBrowseBox* pContext( getContext() );
+        if ( pContext )
+            xAccessible = pContext->getHeaderBar( _eObjType );
+        return xAccessible;
+    }
+    virtual css::uno::Reference< css::accessibility::XAccessible >
+        getTable() override
+    {
+        css::uno::Reference< css::accessibility::XAccessible > xAccessible;
+        AccessibleBrowseBox* pContext( getContext() );
+        if ( pContext )
+            xAccessible = pContext->getTable();
+        return xAccessible;
+    }
+    virtual void commitHeaderBarEvent( sal_Int16 nEventId, const css::uno::Any& rNewValue,
+        const css::uno::Any& rOldValue, bool _bColumnHeaderBar ) override
+    {
+        AccessibleBrowseBox* pContext( getContext() );
+        if ( pContext )
+            pContext->commitHeaderBarEvent( nEventId, rNewValue, rOldValue, _bColumnHeaderBar );
+    }
+    virtual void commitTableEvent( sal_Int16 nEventId,
+        const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ) override
+    {
+        AccessibleBrowseBox* pContext( getContext() );
+        if ( pContext )
+            pContext->commitTableEvent( nEventId, rNewValue, rOldValue );
+    }
+    virtual void commitEvent( sal_Int16 nEventId,
+        const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ) override
+    {
+        AccessibleBrowseBox* pContext( getContext() );
+        if ( pContext )
+            pContext->commitEvent( nEventId, rNewValue, rOldValue );
+    }
+
+private:
+    AccessibleBrowseBoxAccess( const AccessibleBrowseBoxAccess& ) = delete;
+    AccessibleBrowseBoxAccess& operator=( const AccessibleBrowseBoxAccess& ) = delete;
+};
+
+
+} // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
new file mode 100644
index 000000000..7e9ada30a
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -0,0 +1,408 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+
+#pragma once
+
+#include <sal/config.h>
+
+#include <vcl/AccessibleBrowseBoxObjType.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/gen.hxx>
+#include <vcl/svapp.hxx>
+#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/basemutex.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/awt/XFocusListener.hpp>
+#include <comphelper/accessibleeventnotifier.hxx>
+#include <comphelper/uno3.hxx>
+
+
+namespace vcl { class Window; }
+
+namespace utl {
+    class AccessibleStateSetHelper;
+}
+
+namespace vcl {
+    class IAccessibleTableProvider;
+}
+
+namespace accessibility {
+
+typedef ::cppu::WeakAggComponentImplHelper5<
+            css::accessibility::XAccessibleContext,
+            css::accessibility::XAccessibleComponent,
+            css::accessibility::XAccessibleEventBroadcaster,
+            css::awt::XFocusListener,
+            css::lang::XServiceInfo >
+        AccessibleBrowseBoxImplHelper;
+
+/** The BrowseBox accessible objects inherit from this base class. It
+    implements basic functionality for various Accessibility interfaces and
+    the event broadcaster and contains the osl::Mutex. */
+class AccessibleBrowseBoxBase :
+    public ::cppu::BaseMutex,
+    public AccessibleBrowseBoxImplHelper
+{
+public:
+    /** Constructor sets specified name and description. If the constant of a
+        text is BBTEXT_NONE, the derived class has to set the text via
+        implSetName() (in Ctor) or later via
+        setAccessibleName() and setAccessibleDescription() (these methods
+        notify the listeners about the change).
+
+        @param rxParent         XAccessible interface of the parent object.
+        @param rBrowseBox       The BrowseBox control.
+        @param _xFocusWindow    The window that gets all the focus events.
+        @param eObjType         Object type */
+    AccessibleBrowseBoxBase(
+        css::uno::Reference< css::accessibility::XAccessible > xParent,
+        ::vcl::IAccessibleTableProvider& rBrowseBox,
+        css::uno::Reference< css::awt::XWindow >  _xFocusWindow,
+        AccessibleBrowseBoxObjType eObjType );
+
+    /** Constructor sets specified name and description.
+        @param rxParent         XAccessible interface of the parent object.
+        @param rBrowseBox       The BrowseBox control.
+        @param _xFocusWindow    The window that gets all the focus events.
+        @param eObjType         Object type
+        @param rName            The name of this object.
+        @param rDescription     The description text of this object. */
+    AccessibleBrowseBoxBase(
+        css::uno::Reference< css::accessibility::XAccessible > xParent,
+        ::vcl::IAccessibleTableProvider& rBrowseBox,
+        css::uno::Reference< css::awt::XWindow >  _xFocusWindow,
+        AccessibleBrowseBoxObjType eObjType,
+        OUString  rName,
+        OUString  rDescription );
+
+protected:
+    virtual ~AccessibleBrowseBoxBase() override;
+
+    /** Commits DeFunc event to listeners and cleans up members. */
+    virtual void SAL_CALL disposing() override;
+
+public:
+    // XAccessibleContext
+
+    /** @return  A reference to the parent accessible object. */
+    virtual css::uno::Reference<css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override;
+
+    /** @return  The index of this object among the parent's children. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+
+    /** @return
+            The description of this object.
+    */
+    virtual OUString SAL_CALL getAccessibleDescription() override;
+
+    /** @return
+            The name of this object.
+    */
+    virtual OUString SAL_CALL getAccessibleName() override;
+
+    /** @return
+            The relation set (the BrowseBox does not have one).
+    */
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override;
+
+    /** @return  The set of current states. */
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() override;
+
+    /** @return  The parent's locale. */
+    virtual css::lang::Locale SAL_CALL getLocale() override;
+
+    /** @return
+            The role of this object. Panel, ROWHEADER, COLUMNHEADER, TABLE, TABLE_CELL are supported.
+    */
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
+
+    /*  Derived classes have to implement:
+        -   getAccessibleChildCount,
+        -   getAccessibleChild,
+        -   getAccessibleRole.
+        Derived classes may overwrite getAccessibleIndexInParent to increase
+        performance. */
+
+    // XAccessibleComponent
+
+    /** @return
+        TRUE, if the point lies within the bounding box of this object. */
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) override;
+
+    /** @return  The bounding box of this object. */
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
+
+    /** @return
+        The upper left corner of the bounding box relative to the parent. */
+    virtual css::awt::Point SAL_CALL getLocation() override;
+
+    /** @return
+        The upper left corner of the bounding box in screen coordinates. */
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
+
+    /** @return  The size of the bounding box. */
+    virtual css::awt::Size SAL_CALL getSize() override;
+
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
+
+    // XFocusListener
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+    virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) override;
+    virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) override;
+
+    /*  Derived classes have to implement:
+        -   getAccessibleAt,
+        -   grabFocus. */
+
+    /** @return
+            The accessible child rendered under the given point.
+    */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
+
+    // XAccessibleEventBroadcaster
+
+    /** Adds a new event listener */
+    virtual void SAL_CALL addAccessibleEventListener(
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) override;
+
+    /** Removes an event listener. */
+    virtual void SAL_CALL removeAccessibleEventListener(
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) override;
+
+    // XTypeProvider
+
+    /** @return  a unique implementation ID. */
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+
+    // XServiceInfo
+
+    /** @return  Whether the specified service is supported by this class. */
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+
+    /** @return  A list of all supported services. */
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+    /*  Derived classes have to implement:
+        -   getImplementationName. */
+
+    // helper methods
+
+    /** @return  The BrowseBox object type. */
+    inline AccessibleBrowseBoxObjType getType() const;
+
+    /** Changes the name of the object and notifies listeners. */
+    void setAccessibleName( const OUString& rName );
+    /** Changes the description of the object and notifies listeners. */
+    void setAccessibleDescription( const OUString& rDescription );
+
+    /** Commits an event to all listeners. */
+    void commitEvent(
+            sal_Int16 nEventId,
+            const css::uno::Any& rNewValue,
+            const css::uno::Any& rOldValue );
+    /** @return  TRUE, if the object is not disposed or disposing. */
+    bool isAlive() const;
+
+protected:
+    // internal virtual methods
+
+    /** Determines whether the BrowseBox control is really showing inside of
+        its parent accessible window. Derived classes may implement different
+        behaviour.
+        @attention  This method requires locked mutex's and a living object.
+        @return  TRUE, if the object is really showing. */
+    bool implIsShowing();
+
+    /** Derived classes return the bounding box relative to the parent window.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual tools::Rectangle implGetBoundingBox() = 0;
+    /** Derived classes return the bounding box in screen coordinates.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() = 0;
+
+    /** Creates a new AccessibleStateSetHelper and fills it with states of the
+        current object. This method calls FillStateSet at the BrowseBox which
+        fills it with more states depending on the object type. Derived classes
+        may overwrite this method and add more states.
+        @attention  This method requires locked mutex's.
+        @return  A filled AccessibleStateSetHelper. */
+    virtual rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper();
+
+    // internal helper methods
+
+    /** Changes the name of the object (flat assignment, no notify).
+        @attention  This method requires a locked mutex. */
+    inline void implSetName( const OUString& rName );
+
+    /** Locks all mutex's and calculates the bounding box relative to the
+        parent window.
+        @return  The bounding box (VCL rect.) relative to the parent object.
+        @throws css::lang::DisposedException
+    */
+    tools::Rectangle getBoundingBox();
+    /** Locks all mutex's and calculates the bounding box in screen
+        coordinates.
+        @return  The bounding box (VCL rect.) in screen coordinates.
+        @throws css::lang::DisposedException
+    */
+    tools::Rectangle getBoundingBoxOnScreen();
+
+    ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; }
+    void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; }
+
+public:
+    /** @return  The osl::Mutex member provided by the class BaseMutex. */
+    ::osl::Mutex&    getMutex( ) { return m_aMutex; }
+
+    /** @throws <type>DisposedException</type>  If the object is not alive. */
+    void ensureIsAlive() const;
+
+
+protected:
+    // members
+
+    /** The parent accessible object. */
+    css::uno::Reference< css::accessibility::XAccessible > mxParent;
+    /** The VCL BrowseBox control. */
+    ::vcl::IAccessibleTableProvider* mpBrowseBox;
+
+    /** This is the window which get all the nice focus events
+    */
+    css::uno::Reference< css::awt::XWindow > m_xFocusWindow;
+
+private:
+    /** Localized name. */
+    OUString maName;
+    /** Localized description text. */
+    OUString maDescription;
+
+    /** The type of this object (for names, descriptions, state sets, ...). */
+    AccessibleBrowseBoxObjType meObjType;
+
+    ::comphelper::AccessibleEventNotifier::TClientId    m_aClientId;
+};
+
+
+// a version of AccessibleBrowseBoxBase which implements not only the XAccessibleContext,
+// but also the XAccessible
+
+typedef ::cppu::ImplHelper1 <   css::accessibility::XAccessible
+                            >   BrowseBoxAccessibleElement_Base;
+
+class BrowseBoxAccessibleElement
+            :public AccessibleBrowseBoxBase
+            ,public BrowseBoxAccessibleElement_Base
+{
+protected:
+    /** Constructor sets specified name and description. If the constant of a
+        text is BBTEXT_NONE, the derived class has to set the text via
+        implSetName() (in Ctor) or later via
+        setAccessibleName() and setAccessibleDescription() (these methods
+        notify the listeners about the change).
+
+        @param rxParent         XAccessible interface of the parent object.
+        @param rBrowseBox       The BrowseBox control.
+        @param _xFocusWindow    The window that gets all the focus events.
+        @param eObjType         Object type
+    */
+    BrowseBoxAccessibleElement(
+        const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+        ::vcl::IAccessibleTableProvider& rBrowseBox,
+        const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
+        AccessibleBrowseBoxObjType eObjType );
+
+    /** Constructor sets specified name and description.
+
+        @param rxParent         XAccessible interface of the parent object.
+        @param rBrowseBox       The BrowseBox control.
+        @param _xFocusWindow    The window that gets all the focus events.
+        @param eObjType         Object type
+        @param rName            The name of this object.
+        @param rDescription     The description text of this object.
+    */
+    BrowseBoxAccessibleElement(
+        const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+        ::vcl::IAccessibleTableProvider& rBrowseBox,
+        const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
+        AccessibleBrowseBoxObjType eObjType,
+        const OUString& rName,
+        const OUString& rDescription );
+
+public:
+    // noncopyable
+    BrowseBoxAccessibleElement(const BrowseBoxAccessibleElement&) = delete;
+    const BrowseBoxAccessibleElement& operator=(const BrowseBoxAccessibleElement&) = delete;
+    // XInterface
+    DECLARE_XINTERFACE( )
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER( )
+
+protected:
+    virtual ~BrowseBoxAccessibleElement() override;
+
+protected:
+    // XAccessible
+
+    /** @return  The XAccessibleContext interface of this object. */
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() override;
+};
+
+
+// a helper class for protecting methods which need to lock the solar mutex in addition to the own mutex
+
+class SolarMethodGuard : public SolarMutexGuard, public osl::MutexGuard
+{
+public:
+    SolarMethodGuard( osl::Mutex& rMutex )
+        :SolarMutexGuard( )
+        ,osl::MutexGuard( rMutex )
+    {
+    }
+};
+
+// inlines
+
+inline AccessibleBrowseBoxObjType AccessibleBrowseBoxBase::getType() const
+{
+    return meObjType;
+}
+
+inline void AccessibleBrowseBoxBase::implSetName(
+        const OUString& rName )
+{
+    maName = rName;
+}
+
+} // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
new file mode 100644
index 000000000..76c703440
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+#pragma once
+
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <extended/accessiblebrowseboxcell.hxx>
+#include <cppuhelper/implbase2.hxx>
+
+namespace accessibility
+{
+
+    typedef ::cppu::ImplHelper2 <   css::accessibility::XAccessible,
+                                    css::accessibility::XAccessibleValue
+                                >   AccessibleCheckBoxCell_BASE;
+
+    class AccessibleCheckBoxCell final : public AccessibleBrowseBoxCell
+                                    ,public AccessibleCheckBoxCell_BASE
+    {
+    private:
+        TriState m_eState;
+        bool m_bIsTriState;
+
+        virtual ~AccessibleCheckBoxCell() override {}
+
+        virtual rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override;
+
+    public:
+        AccessibleCheckBoxCell(const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
+                                ::vcl::IAccessibleTableProvider& _rBrowseBox,
+                                const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
+                                sal_Int32 _nRowPos,
+                                sal_uInt16 _nColPos,
+                                const TriState& _eState,
+                                bool _bIsTriState);
+
+        // XInterface
+        DECLARE_XINTERFACE( )
+        // XTypeProvider
+        DECLARE_XTYPEPROVIDER( )
+
+        // XAccessible
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+
+
+        // XAccessibleValue
+        virtual css::uno::Any SAL_CALL getCurrentValue(  ) override;
+        virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override;
+        virtual css::uno::Any SAL_CALL getMaximumValue(  ) override;
+        virtual css::uno::Any SAL_CALL getMinimumValue(  ) override;
+        virtual css::uno::Any SAL_CALL getMinimumIncrement(  ) override;
+
+        // internal
+        void        SetChecked( bool _bChecked );
+    };
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
new file mode 100644
index 000000000..64d41cb6d
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
@@ -0,0 +1,219 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+
+#pragma once
+
+#include <extended/AccessibleBrowseBoxTableBase.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+
+
+namespace accessibility {
+
+
+typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection >
+        AccessibleBrowseBoxHeaderBarImplHelper;
+
+/** This class represents the accessible object of a header bar of a BrowseBox
+    control (row or column header bar). This object supports the
+    XAccessibleSelection interface. Selecting a child of this object selects
+    complete rows or columns of the data table. */
+class AccessibleBrowseBoxHeaderBar final :
+    public AccessibleBrowseBoxTableBase,
+    public AccessibleBrowseBoxHeaderBarImplHelper
+{
+public:
+    /** @param rxParent         Parent that holds the browsebox headerbar control
+        @param rBrowseBox       The BrowseBox control.
+        @param eObjType  One of the two allowed types AccessibleBrowseBoxObjType::RowHeaderBar or
+                         AccessibleBrowseBoxObjType::ColumnHeaderBar. */
+    AccessibleBrowseBoxHeaderBar(
+        const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+        ::vcl::IAccessibleTableProvider& rBrowseBox,
+        AccessibleBrowseBoxObjType eObjType );
+
+private:
+    virtual ~AccessibleBrowseBoxHeaderBar() override;
+
+public:
+    // XAccessibleContext
+
+    /** @return
+        The XAccessible interface of the specified child.
+    */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild( sal_Int32 nChildIndex ) override;
+
+    /** @return  The index of this object among the parent's children. */
+    virtual sal_Int32 SAL_CALL
+    getAccessibleIndexInParent() override;
+
+    // XAccessibleComponent
+
+    /** @return  The accessible child rendered under the given point. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
+
+    /** Grabs the focus to (the current cell of) the data table. */
+    virtual void SAL_CALL grabFocus() override;
+
+    // XAccessibleTable
+
+    /** @return  The description text of the specified row. */
+    virtual OUString SAL_CALL
+    getAccessibleRowDescription( sal_Int32 nRow ) override;
+
+    /** @return  The description text of the specified column. */
+    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override;
+
+    /** @return  The XAccessibleTable interface of the row header bar. */
+    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleRowHeaders() override;
+
+    /** @return  The XAccessibleTable interface of the column header bar. */
+    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleColumnHeaders() override;
+
+    /** @return  An index list of completely selected rows. */
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleRows() override;
+
+    /** @return  An index list of completely selected columns. */
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleColumns() override;
+
+    /** @return  TRUE, if the specified row is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override;
+
+    /** @return  TRUE, if the specified column is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override;
+
+    /** @return The XAccessible interface of the cell object at the specified
+                cell position. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+
+    /** @return  TRUE, if the specified cell is selected. */
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
+
+    // XAccessibleSelection
+
+    /** Selects the specified child (row or column of the table). */
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+
+    /** @return  TRUE, if the specified child (row/column) is selected. */
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+
+    /** Clears the complete selection. */
+    virtual void SAL_CALL clearAccessibleSelection() override;
+
+    /** Selects all children or first, if multiselection is not supported. */
+    virtual void SAL_CALL selectAllAccessibleChildren() override;
+
+    /** @return  The number of selected rows/columns. */
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override;
+
+    /** @return  The specified selected row/column. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+
+    /** Removes the specified row/column from the selection. */
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+
+    // XInterface
+
+    /** Queries for a new interface. */
+    css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
+
+    /** Acquires the object (calls acquire() on base class). */
+    virtual void SAL_CALL acquire() noexcept override;
+
+    /** Releases the object (calls release() on base class). */
+    virtual void SAL_CALL release() noexcept override;
+
+    // XServiceInfo
+
+    /** @return  The name of this class. */
+    virtual OUString SAL_CALL getImplementationName() override;
+
+    /** @return  a unique implementation ID. */
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+
+private:
+    // internal virtual methods
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual tools::Rectangle implGetBoundingBox() override;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The count of used rows. */
+    virtual sal_Int32 implGetRowCount() const override;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The count of used columns. */
+    virtual sal_Int32 implGetColumnCount() const override;
+
+    // internal helper methods
+
+    /** @return  TRUE, if the objects is a header bar for rows. */
+    inline bool isRowBar() const;
+    /** @return  TRUE, if the objects is a header bar for columns. */
+    inline bool isColumnBar() const;
+
+    /** Returns the specified row or column. Uses one of the parameters,
+        depending on object type.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the specified column/row. */
+    css::uno::Reference< css::accessibility::XAccessible >
+    implGetChild( sal_Int32 nRow, sal_uInt16 nColumnPos );
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The absolute child index from the index of selected children.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified index is invalid. */
+    sal_Int32 implGetChildIndexFromSelectedIndex( sal_Int32 nSelectedChildIndex );
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified row/column index (depending on type) is invalid. */
+    void ensureIsValidHeaderIndex( sal_Int32 nIndex );
+};
+
+// inlines
+
+inline bool AccessibleBrowseBoxHeaderBar::isRowBar() const
+{
+    return getType() == AccessibleBrowseBoxObjType::RowHeaderBar;
+}
+
+inline bool AccessibleBrowseBoxHeaderBar::isColumnBar() const
+{
+    return getType() == AccessibleBrowseBoxObjType::ColumnHeaderBar;
+}
+
+
+} // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
new file mode 100644
index 000000000..1a895a045
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+#pragma once
+
+#include <extended/AccessibleBrowseBoxBase.hxx>
+
+namespace accessibility
+{
+    class AccessibleBrowseBoxHeaderCell final : public BrowseBoxAccessibleElement
+    {
+        sal_Int32   m_nColumnRowId;
+    public:
+        AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnRowId,
+                                          const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+                                          ::vcl::IAccessibleTableProvider&                  _rBrowseBox,
+                                          const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
+                                          AccessibleBrowseBoxObjType  _eObjType);
+        /** @return  The count of visible children. */
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+
+        /** @return  The XAccessible interface of the specified child. */
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+            getAccessibleChild( sal_Int32 nChildIndex ) override;
+
+        /** @return  The index of this object among the parent's children. */
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+
+        /** Grabs the focus to the BrowseBox. */
+        virtual void SAL_CALL grabFocus() override;
+
+        bool isRowBarCell() const
+        {
+            return getType() == AccessibleBrowseBoxObjType::RowHeaderCell;
+        }
+
+        /** @return
+                The name of this class.
+        */
+        virtual OUString SAL_CALL getImplementationName() override;
+
+        /** Creates a new AccessibleStateSetHelper and fills it with states of the
+            current object.
+            @return
+                A filled AccessibleStateSetHelper.
+        */
+        rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override;
+
+    private:
+        virtual tools::Rectangle implGetBoundingBox() override;
+
+        virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
+    };
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
new file mode 100644
index 000000000..78c5cc4a9
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
@@ -0,0 +1,129 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+
+#pragma once
+
+#include <extended/AccessibleBrowseBoxTableBase.hxx>
+
+
+namespace accessibility {
+
+/** This class represents the accessible object of the data table of a
+    BrowseBox control. */
+class AccessibleBrowseBoxTable : public AccessibleBrowseBoxTableBase
+{
+    friend class AccessibleBrowseBox;   // to create header bars
+
+public:
+    AccessibleBrowseBoxTable(
+        const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+        ::vcl::IAccessibleTableProvider& rBrowseBox );
+
+protected:
+    virtual ~AccessibleBrowseBoxTable() override;
+
+public:
+    // XAccessibleContext
+
+    /** @return  The XAccessible interface of the specified child. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild( sal_Int32 nChildIndex ) override;
+
+    /** @return  The index of this object among the parent's children. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+
+    // XAccessibleComponent
+
+    /** @return  The accessible child rendered under the given point. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
+
+    /** Grabs the focus to (the current cell of) the data table. */
+    virtual void SAL_CALL grabFocus() override;
+
+    // XAccessibleTable
+
+    /** @return  The description text of the specified row. */
+    virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) override;
+
+    /** @return  The description text of the specified column. */
+    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override;
+
+    /** @return  The XAccessibleTable interface of the row header bar. */
+    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleRowHeaders() override;
+
+    /** @return  The XAccessibleTable interface of the column header bar. */
+    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleColumnHeaders() override;
+
+    /** @return  An index list of completely selected rows. */
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleRows() override;
+
+    /** @return  An index list of completely selected columns. */
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleColumns() override;
+
+    /** @return  TRUE, if the specified row is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override;
+
+    /** @return  TRUE, if the specified column is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override;
+
+    /** @return The XAccessible interface of the cell object at the specified
+                cell position. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+
+    /** @return  TRUE, if the specified cell is selected. */
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
+
+    // XServiceInfo
+
+    /** @return  The name of this class. */
+    virtual OUString SAL_CALL getImplementationName() override;
+
+protected:
+    // internal virtual methods
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual tools::Rectangle implGetBoundingBox() override;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
+
+    // internal helper methods
+
+    /** @attention  This method requires a locked mutex.
+        @return  The XAccessibleTable interface of the specified header bar.
+        @throws css::uno::RuntimeException
+    */
+    css::uno::Reference< css::accessibility::XAccessibleTable >
+    implGetHeaderBar( sal_Int32 nChildIndex );
+};
+
+
+} // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
new file mode 100644
index 000000000..b482ab0d8
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
@@ -0,0 +1,239 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+
+#pragma once
+
+#include <extended/AccessibleBrowseBoxBase.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/accessibility/XAccessibleTable.hpp>
+
+
+namespace accessibility {
+
+typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleTable >
+        AccessibleBrowseBoxTableImplHelper;
+
+/** The BrowseBox accessible table objects inherit from this base class. It
+    implements basic functionality for the XAccessibleTable interface.
+    BrowseBox table objects are: the data table, the column header bar and the
+    row header bar. */
+class AccessibleBrowseBoxTableBase :
+    public BrowseBoxAccessibleElement,
+    public AccessibleBrowseBoxTableImplHelper
+{
+public:
+    /** Constructor sets specified name and description. If the constant of a
+        text is BBTEXT_NONE, the derived class has to set the text via
+        implSetName() and implSetDescription() (in Ctor) or later via
+        setAccessibleName() and setAccessibleDescription() (these methods
+        notify the listeners about the change).
+        @param rxParent         XAccessible interface of the parent object.
+        @param rBrowseBox       The BrowseBox control.
+        @param eObjType         Type of BrowseBox object. */
+    AccessibleBrowseBoxTableBase(
+        const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+        ::vcl::IAccessibleTableProvider& rBrowseBox,
+        AccessibleBrowseBoxObjType eObjType );
+
+protected:
+    virtual ~AccessibleBrowseBoxTableBase() override = default;
+
+public:
+    // XAccessibleContext
+
+    /** @return  The count of visible children. */
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+
+    /** @return  The role of this object (a table). */
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
+
+    /*  Derived classes have to implement:
+        -   getAccessibleChild,
+        -   getAccessibleIndexInParent. */
+
+    // XAccessibleComponent
+
+    /*  Derived classes have to implement:
+        -   getAccessibleAt,
+        -   grabFocus. */
+
+    // XAccessibleTable
+
+    /** @return  The number of used rows in the table (0 = empty table). */
+    virtual sal_Int32 SAL_CALL getAccessibleRowCount() override;
+
+    /** @return  The number of used columns in the table (0 = empty table). */
+    virtual sal_Int32 SAL_CALL getAccessibleColumnCount() override;
+
+    /** @return  The row extent of the specified cell (always 1). */
+    virtual sal_Int32 SAL_CALL
+    getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+
+    /** @return  The column extent of the specified cell (always 1). */
+    virtual sal_Int32 SAL_CALL
+    getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+
+    /** @return  The caption cell of the table (not supported). */
+    virtual css::uno::Reference<
+        css::accessibility::XAccessible > SAL_CALL
+    getAccessibleCaption() override;
+
+    /** @return  The summary object of the table (not supported). */
+    virtual css::uno::Reference<
+        css::accessibility::XAccessible > SAL_CALL
+    getAccessibleSummary() override;
+
+    /** @return  The child index of the specified cell. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override;
+
+    /** @return  The row index of the specified child cell. */
+    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override;
+
+    /** @return  The column index of the specified child cell. */
+    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override;
+
+    /*  Derived classes have to implement:
+        -   getAccessibleRowDescription,
+        -   getAccessibleColumnDescription,
+        -   getAccessibleRowHeaders,
+        -   getAccessibleColumnHeaders,
+        -   getSelectedAccessibleRows,
+        -   getSelectedAccessibleColumns,
+        -   isAccessibleRowSelected,
+        -   isAccessibleColumnSelected,
+        -   getAccessibleCellAt,
+        -   isAccessibleSelected. */
+
+    // XInterface
+
+    /** Queries for a new interface. */
+    css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
+
+    /** Acquires the object (calls acquire() on base class). */
+    virtual void SAL_CALL acquire() noexcept override;
+
+    /** Releases the object (calls release() on base class). */
+    virtual void SAL_CALL release() noexcept override;
+
+    // XTypeProvider
+
+    /** @return  a sequence of possible types (received from base classes). */
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+
+    /** @return  a unique implementation ID. */
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+
+    // XServiceInfo
+
+    /*  Derived classes have to implement:
+        -   getImplementationName */
+
+protected:
+    // internal virtual methods
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The count of data rows without header bar. */
+    virtual sal_Int32 implGetRowCount() const;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The count of data columns without "handle column". */
+    virtual sal_Int32 implGetColumnCount() const;
+
+    // internal helper methods
+
+    /** @return  TRUE, if first BrowseBox column is the "handle column". */
+    bool implHasHandleColumn() const;
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @param nColumn
+            the position of the column in the Accessible world
+        @return
+            the position of the column in VCL the Accessible world
+    */
+    sal_uInt16 implToVCLColumnPos( sal_Int32 nColumn ) const;
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The number of cells of the table. */
+    sal_Int32 implGetChildCount() const;
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The row index of the specified cell index. */
+    sal_Int32 implGetRow( sal_Int32 nChildIndex ) const;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The column index of the specified cell index. */
+    sal_Int32 implGetColumn( sal_Int32 nChildIndex ) const;
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  TRUE, if the specified row is selected. */
+    bool implIsRowSelected( sal_Int32 nRow ) const;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  TRUE, if the specified column is selected. */
+    bool implIsColumnSelected( sal_Int32 nColumn ) const;
+
+    /** Selects/deselects a row (tries to expand selection).
+        @attention  This method requires locked mutex's and a living object.
+        @param nRow     Row to select
+        @param bSelect  TRUE = select, FALSE = deselect */
+    void implSelectRow( sal_Int32 nRow, bool bSelect );
+    /** Selects/deselects a column (tries to expand selection).
+        @attention  This method requires locked mutex's and a living object.
+        @param nColumnPos column number to select
+        @param bSelect  TRUE = select, FALSE = deselect */
+    void implSelectColumn( sal_Int32 nColumnPos, bool bSelect );
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The count of selected rows. */
+    sal_Int32 implGetSelectedRowCount() const;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The count of selected columns. */
+    sal_Int32 implGetSelectedColumnCount() const;
+
+    /** Fills a sequence with sorted indexes of completely selected rows.
+        @attention  This method requires locked mutex's and a living object.
+        @param rSeq  Out-parameter that takes the sorted row index list. */
+    void implGetSelectedRows( css::uno::Sequence< sal_Int32 >& rSeq );
+    /** Fills a sequence with sorted indexes of completely selected columns.
+        @attention  This method requires locked mutex's and a living object.
+        @param rSeq  Out-parameter that takes the sorted column index list. */
+    void implGetSelectedColumns( css::uno::Sequence< sal_Int32 >& rSeq );
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified row index is invalid. */
+    void ensureIsValidRow( sal_Int32 nRow );
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified column index is invalid. */
+    void ensureIsValidColumn( sal_Int32 nColumn );
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified cell address is invalid. */
+    void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn );
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified child index is invalid. */
+    void ensureIsValidIndex( sal_Int32 nChildIndex );
+};
+
+
+} // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
new file mode 100644
index 000000000..2b7e28c7d
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
@@ -0,0 +1,122 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+#pragma once
+
+#include <extended/accessiblebrowseboxcell.hxx>
+#include <comphelper/accessibletexthelper.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
+
+namespace accessibility
+{
+    typedef ::cppu::ImplHelper2 <   css::accessibility::XAccessibleText
+                                ,   css::accessibility::XAccessible
+                                >   AccessibleTextHelper_BASE;
+
+    // implementation of a table cell of BrowseBox
+    class AccessibleBrowseBoxTableCell final : public AccessibleBrowseBoxCell
+                                        ,public AccessibleTextHelper_BASE
+                                        ,public ::comphelper::OCommonAccessibleText
+    {
+    private:
+        sal_Int32   m_nOffset;
+
+        // OCommonAccessibleText
+        virtual OUString                        implGetText() final override;
+        virtual css::lang::Locale               implGetLocale() override;
+        virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override;
+
+    public:
+        AccessibleBrowseBoxTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
+                                    ::vcl::IAccessibleTableProvider& _rBrowseBox,
+                                    const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
+                                    sal_Int32 _nRowId,
+                                    sal_uInt16 _nColId,
+                                    sal_Int32 _nOffset );
+
+        // XInterface -------------------------------------------------------------
+
+        /** Queries for a new interface. */
+        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
+
+        /** Acquires the object (calls acquire() on base class). */
+        virtual void SAL_CALL acquire() noexcept override;
+
+        /** Releases the object (calls release() on base class). */
+        virtual void SAL_CALL release() noexcept override;
+
+        // XEventListener
+        using AccessibleBrowseBoxBase::disposing;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+
+        /** @return  The index of this object among the parent's children. */
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+
+        /** @return
+                The name of this class.
+        */
+        virtual OUString SAL_CALL getImplementationName() override;
+
+        /** @return
+                The count of visible children.
+        */
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+
+        /** @return
+                The XAccessible interface of the specified child.
+        */
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+            getAccessibleChild( sal_Int32 nChildIndex ) override;
+
+        /** Creates a new AccessibleStateSetHelper and fills it with states of the
+            current object.
+            @return
+                A filled AccessibleStateSetHelper.
+        */
+        rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override;
+
+        // XAccessible ------------------------------------------------------------
+
+        /** @return  The XAccessibleContext interface of this object. */
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL
+        getAccessibleContext() override;
+
+        // XAccessibleText
+        virtual sal_Int32 SAL_CALL getCaretPosition() override;
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+        virtual sal_Int32 SAL_CALL getCharacterCount() override;
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+        virtual OUString SAL_CALL getSelectedText() override;
+        virtual sal_Int32 SAL_CALL getSelectionStart() override;
+        virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual OUString SAL_CALL getText() final override;
+        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual sal_Bool SAL_CALL scrollSubstringTo( sal_Int32 nStartIndex, sal_Int32 nEndIndex, css::accessibility::AccessibleScrollType aScrollType) override;
+    };
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx
new file mode 100644
index 000000000..302f240ee
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleGridControl.hxx
@@ -0,0 +1,231 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <extended/AccessibleGridControlBase.hxx>
+#include <extended/AccessibleGridControlTable.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/weakref.hxx>
+#include <rtl/ref.hxx>
+#include <vcl/accessibletable.hxx>
+
+namespace accessibility {
+
+    class AccessibleGridControlHeader;
+
+
+/** This class represents the complete accessible Grid Control object. */
+class AccessibleGridControl final : public AccessibleGridControlBase
+{
+    friend class AccessibleGridControlAccess;
+
+    AccessibleGridControl(
+        const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
+        const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator,
+    ::vcl::table::IAccessibleTable& _rTable
+    );
+
+    virtual ~AccessibleGridControl() override = default;
+
+    /** Cleans up members. */
+    using AccessibleGridControlBase::disposing;
+    virtual void SAL_CALL disposing() override;
+
+    // XAccessibleContext -----------------------------------------------------
+
+    /** @return  The count of visible children. */
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+
+    /** @return  The XAccessible interface of the specified child. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild( sal_Int32 nChildIndex ) override;
+
+    /** @return  The role of this object (a table). */
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
+
+    // XAccessibleComponent ---------------------------------------------------
+
+    /** @return
+            The accessible child rendered under the given point.
+    */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
+
+    /** Grabs the focus to the Grid Control. */
+    virtual void SAL_CALL grabFocus() override;
+
+    // XServiceInfo -----------------------------------------------------------
+
+    /** @return
+            The name of this class.
+    */
+    virtual OUString SAL_CALL getImplementationName() override;
+
+public:
+    // helper functions
+
+     /** commitCellEvent commit the event at all listeners of the table
+         @param nEventId
+             the event id
+         @param rNewValue
+             the new value
+         @param rOldValue
+             the old value
+     */
+     void commitCellEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue,
+             const css::uno::Any& rOldValue);
+
+     /** commitTableEvent commit the event at all listeners of the table
+         @param nEventId
+             the event id
+         @param rNewValue
+             the new value
+         @param rOldValue
+             the old value
+     */
+     void commitTableEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue,
+             const css::uno::Any& rOldValue);
+
+private:
+    // internal virtual methods -----------------------------------------------
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual tools::Rectangle implGetBoundingBox() override;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
+
+    // internal helper methods ------------------------------------------------
+
+    /** This method creates (once) and returns the accessible data table child.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the data table. */
+    css::uno::Reference< css::accessibility::XAccessible > implGetTable();
+
+    /** This method creates (once) and returns the specified header bar.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the header bar. */
+    css::uno::Reference< css::accessibility::XAccessible >
+        implGetHeaderBar( ::vcl::table::AccessibleTableControlObjType eObjType );
+
+    /** This method returns one of the children that are always present:
+        Data table, row and column header bar or corner control.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the specified child. */
+    css::uno::Reference< css::accessibility::XAccessible >
+        implGetFixedChild( sal_Int32 nChildIndex );
+
+    /** This method creates and returns an accessible table.
+        @return  An AccessibleGridControlTable. */
+    rtl::Reference<AccessibleGridControlTable> createAccessibleTable();
+
+    /// the css::accessibility::XAccessible which created the AccessibleGridControl
+    css::uno::WeakReference< css::accessibility::XAccessible >                    m_aCreator;
+
+    /** The data table child. */
+    rtl::Reference<AccessibleGridControlTable>                m_xTable;
+
+    /** The header bar for rows. */
+    rtl::Reference<AccessibleGridControlHeader>               m_xRowHeaderBar;
+
+    /** The header bar for columns (first row of the table). */
+    rtl::Reference<AccessibleGridControlHeader>               m_xColumnHeaderBar;
+
+    /** @return  The count of visible children. */
+    inline sal_Int32 implGetAccessibleChildCount();
+};
+
+
+/** the XAccessible which creates/returns an AccessibleGridControl
+
+    <p>The instance holds its XAccessibleContext with a hard reference, while
+    the context holds this instance weak.</p>
+*/
+
+class AccessibleGridControlAccess final :
+     public ::cppu::WeakImplHelper< css::accessibility::XAccessible >
+    ,public ::vcl::table::IAccessibleTableControl
+{
+private:
+    css::uno::Reference< css::accessibility::XAccessible > m_xParent;
+    ::vcl::table::IAccessibleTable *                       m_pTable;
+    rtl::Reference<AccessibleGridControl>                  m_xContext;
+
+public:
+    AccessibleGridControlAccess(
+        css::uno::Reference< css::accessibility::XAccessible > _xParent,
+        ::vcl::table::IAccessibleTable& _rTable
+    );
+
+    /// returns the AccessibleContext belonging to this Accessible
+    AccessibleGridControl*            getContext()  { return m_xContext.get(); }
+
+private:
+    virtual ~AccessibleGridControlAccess() override;
+
+    // XAccessible
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext >
+        SAL_CALL getAccessibleContext() override;
+
+    // IAccessibleTable
+    virtual css::uno::Reference< css::accessibility::XAccessible >
+        getMyself() override
+    {
+        return this;
+    }
+    void DisposeAccessImpl() override;
+    virtual bool isAlive() const override
+    {
+        return m_xContext.is() && m_xContext->isAlive();
+    }
+    virtual void commitCellEvent( sal_Int16 nEventId,
+         const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ) override
+    {
+         AccessibleGridControl* pContext( getContext() );
+         if ( pContext )
+            pContext->commitCellEvent( nEventId, rNewValue, rOldValue );
+    }
+    virtual void commitTableEvent( sal_Int16 nEventId,
+         const css::uno::Any& rNewValue, const css::uno::Any& rOldValue ) override
+    {
+         AccessibleGridControl* pContext( getContext() );
+         if ( pContext )
+            pContext->commitTableEvent( nEventId, rNewValue, rOldValue );
+    }
+    virtual void commitEvent( sal_Int16 nEventId,
+        const css::uno::Any& rNewValue ) override
+    {
+        AccessibleGridControl* pContext( getContext() );
+        if ( pContext )
+            pContext->commitEvent( nEventId, rNewValue, css::uno::Any() );
+    }
+
+private:
+    AccessibleGridControlAccess( const AccessibleGridControlAccess& ) = delete;
+    AccessibleGridControlAccess& operator=( const AccessibleGridControlAccess& ) = delete;
+};
+
+
+} // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx
new file mode 100644
index 000000000..8523b7892
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx
@@ -0,0 +1,313 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+
+#pragma once
+
+#include <vcl/accessibletable.hxx>
+#include <rtl/ustring.hxx>
+#include <rtl/ref.hxx>
+#include <tools/gen.hxx>
+#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/basemutex.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <comphelper/accessibleeventnotifier.hxx>
+#include <comphelper/uno3.hxx>
+
+
+namespace vcl { class Window; }
+
+namespace utl {
+    class AccessibleStateSetHelper;
+}
+
+
+namespace accessibility {
+
+typedef ::cppu::WeakAggComponentImplHelper4<
+            css::accessibility::XAccessibleContext,
+            css::accessibility::XAccessibleComponent,
+            css::accessibility::XAccessibleEventBroadcaster,
+            css::lang::XServiceInfo >
+        AccessibleGridControlImplHelper;
+
+/** The GridControl accessible objects inherit from this base class. It
+    implements basic functionality for various Accessibility interfaces and
+    the event broadcaster and contains the osl::Mutex. */
+class AccessibleGridControlBase :
+    public ::cppu::BaseMutex,
+    public AccessibleGridControlImplHelper
+{
+public:
+    /** Constructor.
+        @param rxParent  XAccessible interface of the parent object.
+        @param rTable    The Table control.
+        @param eObjType  Type of accessible table control. */
+    AccessibleGridControlBase(
+        css::uno::Reference< css::accessibility::XAccessible > xParent,
+        ::vcl::table::IAccessibleTable& rTable,
+        ::vcl::table::AccessibleTableControlObjType  eObjType );
+
+protected:
+    virtual ~AccessibleGridControlBase() override;
+
+    /** Commits DeFunc event to listeners and cleans up members. */
+    virtual void SAL_CALL disposing() override;
+
+public:
+    // XAccessibleContext
+
+    /** @return  A reference to the parent accessible object. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleParent() override;
+
+    /** @return  The index of this object among the parent's children. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+
+    /** @return
+            The description of this object.
+    */
+    virtual OUString SAL_CALL getAccessibleDescription() override;
+
+    /** @return
+            The name of this object.
+    */
+    virtual OUString SAL_CALL getAccessibleName() override;
+
+    /** @return
+            The relation set (the GridControl does not have one).
+    */
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL
+        getAccessibleRelationSet() override;
+
+    /** @return  The set of current states. */
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
+        getAccessibleStateSet() override;
+
+    /** @return  The parent's locale. */
+    virtual css::lang::Locale SAL_CALL getLocale() override;
+
+    /** @return
+            The role of this object. Panel, ROWHEADER, COLUMNHEADER, TABLE, TABLE_CELL are supported.
+    */
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
+
+    /*  Derived classes have to implement:
+        -   getAccessibleChildCount,
+        -   getAccessibleChild,
+        -   getAccessibleRole.
+        Derived classes may overwrite getAccessibleIndexInParent to increase
+        performance. */
+
+    // XAccessibleComponent
+
+    /** @return
+        TRUE, if the point lies within the bounding box of this object. */
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) override;
+
+    /** @return  The bounding box of this object. */
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
+
+    /** @return
+        The upper left corner of the bounding box relative to the parent. */
+    virtual css::awt::Point SAL_CALL getLocation() override;
+
+    /** @return
+        The upper left corner of the bounding box in screen coordinates. */
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
+
+    /** @return  The size of the bounding box. */
+    virtual css::awt::Size SAL_CALL getSize() override;
+
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
+
+
+    /*  Derived classes have to implement:
+        -   getAccessibleAt,
+        -   grabFocus. */
+
+    /** @return
+            The accessible child rendered under the given point.
+    */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
+
+    // XAccessibleEventBroadcaster
+
+    /** Adds a new event listener */
+    virtual void SAL_CALL addAccessibleEventListener(
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) override;
+
+    /** Removes an event listener. */
+    virtual void SAL_CALL removeAccessibleEventListener(
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) override;
+
+    // XTypeProvider
+
+    /** @return  a unique implementation ID. */
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+
+    // XServiceInfo
+
+    /** @return  Whether the specified service is supported by this class. */
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+
+    /** @return  a list of all supported services. */
+    virtual css::uno::Sequence< OUString > SAL_CALL
+    getSupportedServiceNames() override;
+
+    /*  Derived classes have to implement:
+        -   getImplementationName. */
+
+    // helper methods
+
+    /** @return  The GridControl object type. */
+    inline ::vcl::table::AccessibleTableControlObjType getType() const;
+
+    /** Commits an event to all listeners. */
+    virtual void commitEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue,
+                             const css::uno::Any& rOldValue);
+    /** @return  TRUE, if the object is not disposed or disposing. */
+    bool isAlive() const;
+
+protected:
+    // internal virtual methods
+
+    /** Determines whether the Grid control is really showing inside of
+        its parent accessible window. Derived classes may implement different
+        behaviour.
+        @attention  This method requires locked mutex's and a living object.
+        @return  TRUE, if the object is really showing. */
+    bool implIsShowing();
+
+    /** Derived classes return the bounding box relative to the parent window.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual tools::Rectangle implGetBoundingBox() = 0;
+    ///** Derived classes return the bounding box in screen coordinates.
+    //    @attention  This method requires locked mutex's and a living object.
+    //    @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() = 0;
+
+    /** Creates a new AccessibleStateSetHelper and fills it with states of the
+        current object. This method calls FillStateSet at the GridControl which
+        fills it with more states depending on the object type. Derived classes
+        may overwrite this method and add more states.
+        @attention  This method requires locked mutex's.
+        @return  A filled AccessibleStateSetHelper. */
+    virtual rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper();
+
+    // internal helper methods
+
+    /** @throws <type>DisposedException</type>  If the object is not alive. */
+    void ensureIsAlive() const;
+
+    /** Locks all mutex's and calculates the bounding box relative to the
+        parent window.
+        @return  The bounding box (VCL rect.) relative to the parent object.
+        @throws css::lang::DisposedException
+    */
+    tools::Rectangle getBoundingBox();
+    ///** Locks all mutex's and calculates the bounding box in screen
+    //    coordinates.
+    //    @return  The bounding box (VCL rect.) in screen coordinates. */
+    /// @throws css::lang::DisposedException
+    tools::Rectangle getBoundingBoxOnScreen();
+
+    ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; }
+    void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; }
+
+protected:
+    // members
+
+    /** The parent accessible object. */
+    css::uno::Reference< css::accessibility::XAccessible > m_xParent;
+    /** The SVT Table control. */
+    ::vcl::table::IAccessibleTable& m_aTable;
+    /** The type of this object (for names, descriptions, state sets, ...). */
+    ::vcl::table::AccessibleTableControlObjType m_eObjType;
+
+private:
+    ::comphelper::AccessibleEventNotifier::TClientId    m_aClientId;
+};
+
+
+// a version of AccessibleGridControlBase which implements not only the XAccessibleContext,
+// but also the XAccessible
+
+typedef ::cppu::ImplHelper1 <   css::accessibility::XAccessible
+                            >   GridControlAccessibleElement_Base;
+
+class GridControlAccessibleElement
+            :public AccessibleGridControlBase
+            ,public GridControlAccessibleElement_Base
+{
+protected:
+    /** Constructor sets specified name and description.
+
+        @param rxParent    XAccessible interface of the parent object.
+        @param rTable      The Table control.
+        @param eObjType    Type of table control
+    */
+    GridControlAccessibleElement(
+        const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+        ::vcl::table::IAccessibleTable& rTable,
+        ::vcl::table::AccessibleTableControlObjType  eObjType );
+
+public:
+    // XInterface
+    DECLARE_XINTERFACE( )
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER( )
+
+protected:
+    virtual ~GridControlAccessibleElement() override;
+
+protected:
+    // XAccessible
+
+    /** @return  The XAccessibleContext interface of this object. */
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL
+    getAccessibleContext() override;
+
+private:
+    GridControlAccessibleElement( const GridControlAccessibleElement& ) = delete;
+    GridControlAccessibleElement& operator=( const GridControlAccessibleElement& ) = delete;
+};
+
+// inlines
+
+inline ::vcl::table::AccessibleTableControlObjType AccessibleGridControlBase::getType() const
+{
+    return m_eObjType;
+}
+
+
+} // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
new file mode 100644
index 000000000..63cef92ce
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
@@ -0,0 +1,155 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+
+#pragma once
+
+#include <extended/AccessibleGridControlTableBase.hxx>
+
+namespace accessibility {
+
+/** This class represents the accessible object of a header bar of a Grid Control
+   (row or column header bar). This object supports the
+    XAccessibleSelection interface. Selecting a child of this object selects
+    complete rows or columns of the data table. */
+class AccessibleGridControlHeader final : public AccessibleGridControlTableBase
+{
+public:
+    /**  @param rxParent  accessible parent control
+         @param rTable    accessible table
+         @param eObjType  One of the two allowed types TCTYPE_ROWHEADERBAR or
+                         TCTYPE_COLUMNHEADERBAR. */
+    AccessibleGridControlHeader(
+        const css::uno::Reference<
+            css::accessibility::XAccessible >& rxParent,
+            ::vcl::table::IAccessibleTable& rTable,
+            ::vcl::table::AccessibleTableControlObjType  eObjType );
+
+private:
+    virtual ~AccessibleGridControlHeader() override = default;
+
+public:
+    // XAccessibleContext
+
+    /** @return
+        The XAccessible interface of the specified child.
+    */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild( sal_Int32 nChildIndex ) override;
+
+    /** @return  The index of this object among the parent's children. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+
+    // XAccessibleComponent
+
+    /** @return  The accessible child rendered under the given point. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
+
+    /** Grabs the focus to (the current cell of) the data table. */
+    virtual void SAL_CALL grabFocus() override;
+
+    // XAccessibleTable
+
+    /** @return  The description text of the specified row. */
+    virtual OUString SAL_CALL
+    getAccessibleRowDescription( sal_Int32 nRow ) override;
+
+    /** @return  The description text of the specified column. */
+    virtual OUString SAL_CALL
+    getAccessibleColumnDescription( sal_Int32 nColumn ) override;
+
+    /** @return  The XAccessibleTable interface of the row header bar. */
+    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleRowHeaders() override;
+
+    /** @return  The XAccessibleTable interface of the column header bar. */
+    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleColumnHeaders() override;
+
+    /** @return  An index list of completely selected rows. */
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleRows() override;
+
+    /** @return  An index list of completely selected columns. */
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleColumns() override;
+
+    /** @return  TRUE, if the specified row is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override;
+
+    /** @return  TRUE, if the specified column is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override;
+
+    /** @return The XAccessible interface of the cell object at the specified
+                cell position. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+
+    /** @return  TRUE, if the specified cell is selected. */
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
+
+    // XServiceInfo
+
+    /** @return  The name of this class. */
+    virtual OUString SAL_CALL getImplementationName() override;
+
+    /** @return  a unique implementation ID. */
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+
+private:
+    /** Returns the specified row or column. Uses one of the parameters,
+        depending on object type.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the specified column/row. */
+    css::uno::Reference< css::accessibility::XAccessible >
+    implGetChild( sal_Int32 nRow, sal_uInt32 nColumnPos );
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual tools::Rectangle implGetBoundingBox() override;
+   /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
+
+    // internal helper methods
+
+    /** @return  TRUE, if the objects is a header bar for rows. */
+    inline bool isRowBar() const;
+    /** @return  TRUE, if the objects is a header bar for columns. */
+    inline bool isColumnBar() const;
+};
+
+// inlines
+
+inline bool AccessibleGridControlHeader::isRowBar() const
+{
+    return getType() == ::vcl::table::TCTYPE_ROWHEADERBAR;
+}
+
+inline bool AccessibleGridControlHeader::isColumnBar() const
+{
+    return getType() == ::vcl::table::TCTYPE_COLUMNHEADERBAR;
+}
+
+
+} // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
new file mode 100644
index 000000000..c9a0fde32
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
@@ -0,0 +1,82 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+#pragma once
+
+#include <extended/AccessibleGridControlTableCell.hxx>
+
+namespace accessibility
+{
+    class AccessibleGridControlHeaderCell final : public AccessibleGridControlCell, public css::accessibility::XAccessible
+    {
+        sal_Int32   m_nColumnRowId;
+    public:
+        AccessibleGridControlHeaderCell(sal_Int32 _nColumnRowId,
+                        const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+                        ::vcl::table::IAccessibleTable& _rTable,
+                        ::vcl::table::AccessibleTableControlObjType  _eObjType);
+        /** @return  The count of visible children. */
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+
+        /** @return  The XAccessible interface of the specified child. */
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+            getAccessibleChild( sal_Int32 nChildIndex ) override;
+
+        /** @return  The index of this object among the parent's children. */
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+
+        /** Grabs the focus to the GridControl. */
+        virtual void SAL_CALL grabFocus() override;
+
+        // XInterface
+
+        /** Queries for a new interface. */
+        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
+
+        /** Acquires the object (calls acquire() on base class). */
+        virtual void SAL_CALL acquire() noexcept override;
+
+        /** Releases the object (calls release() on base class). */
+        virtual void SAL_CALL release() noexcept override;
+        // XAccessible
+
+        /** @return  The XAccessibleContext interface of this object. */
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL
+        getAccessibleContext() override;
+
+        /** @return
+                The name of this class.
+        */
+        virtual OUString SAL_CALL getImplementationName() override;
+
+        /** Creates a new AccessibleStateSetHelper and fills it with states of the
+            current object.
+            @return
+                A filled AccessibleStateSetHelper.
+        */
+        rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override;
+
+    private:
+        virtual tools::Rectangle implGetBoundingBox() override;
+
+        virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
+    };
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx
new file mode 100644
index 000000000..69e3d9229
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx
@@ -0,0 +1,172 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+
+#pragma once
+
+#include <extended/AccessibleGridControlTableBase.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include <extended/AccessibleGridControlTableCell.hxx>
+
+
+namespace accessibility {
+
+
+typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleSelection >
+        AccessibleGridControlTableSelectionImplHelper;
+/** This class represents the accessible object of the data table of a
+    Grid control. */
+class AccessibleGridControlTable final : public AccessibleGridControlTableBase,
+                                public AccessibleGridControlTableSelectionImplHelper
+{
+public:
+    AccessibleGridControlTable(
+        const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+            ::vcl::table::IAccessibleTable& rTable);
+
+private:
+    virtual ~AccessibleGridControlTable() override = default;
+    std::vector< rtl::Reference<AccessibleGridControlTableCell> > m_aCellVector;
+public:
+    // XAccessibleContext
+
+    /** @return  The XAccessible interface of the specified child. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild( sal_Int32 nChildIndex ) override;
+
+    /** @return  The index of this object among the parent's children. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+
+    // XAccessibleComponent
+
+    /** @return  The accessible child rendered under the given point. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
+
+    /** Grabs the focus to (the current cell of) the data table. */
+    virtual void SAL_CALL grabFocus() override;
+
+    // XAccessibleTable
+
+    /** @return  The description text of the specified row. */
+    virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) override;
+
+    /** @return  The description text of the specified column. */
+    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override;
+
+    /** @return  The XAccessibleTable interface of the row header bar. */
+    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleRowHeaders() override;
+
+    /** @return  The XAccessibleTable interface of the column header bar. */
+    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleColumnHeaders() override;
+
+    /** @return  An index list of completely selected rows. */
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleRows() override;
+
+    /** @return  An index list of completely selected columns. */
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleColumns() override;
+
+    /** @return  TRUE, if the specified row is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override;
+
+    /** @return  TRUE, if the specified column is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override;
+
+    /** @return The XAccessible interface of the cell object at the specified
+                cell position. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+
+    /** @return  TRUE, if the specified cell is selected. */
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
+
+    // XAccessibleSelection
+
+    /** Selects the specified child (row or column of the table). */
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+
+    /** @return  TRUE, if the specified child (row/column) is selected. */
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+
+    /** Clears the complete selection. */
+    virtual void SAL_CALL clearAccessibleSelection() override;
+
+    /** Selects all children or first, if multiselection is not supported. */
+    virtual void SAL_CALL selectAllAccessibleChildren() override;
+
+    /** @return  The number of selected rows/columns. */
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override;
+
+    /** @return  The specified selected row/column. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+
+    /** Removes the specified row/column from the selection. */
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+     // XInterface
+
+    /** Queries for a new interface. */
+    css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
+
+    /** Acquires the object (calls acquire() on base class). */
+    virtual void SAL_CALL acquire() noexcept override;
+
+    /** Releases the object (calls release() on base class). */
+    virtual void SAL_CALL release() noexcept override;
+    // XServiceInfo
+
+    /** @return  The name of this class. */
+    virtual OUString SAL_CALL getImplementationName() override;
+
+    // XComponent
+    virtual void SAL_CALL dispose() override;
+
+    virtual void commitEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue,
+                             const css::uno::Any& rOldValue) override;
+
+private:
+    // internal virtual methods
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual tools::Rectangle implGetBoundingBox() override;
+    ///** @attention  This method requires locked mutex's and a living object.
+    //    @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
+
+
+    //// internal helper methods
+    ///** @attention  This method requires a locked mutex.
+    //    @return  The XAccessibleTable interface of the specified header bar. */
+    /// @throws css::uno::RuntimeException
+    css::uno::Reference< css::accessibility::XAccessibleTable >
+    implGetHeaderBar( sal_Int32 nChildIndex );
+};
+
+
+} // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
new file mode 100644
index 000000000..6ef2737af
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
@@ -0,0 +1,175 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+
+#pragma once
+
+#include <extended/AccessibleGridControlBase.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/accessibility/XAccessibleTable.hpp>
+
+
+namespace accessibility {
+
+typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleTable >
+        AccessibleGridControlTableImplHelper;
+
+/** The Grid Control accessible table objects inherit from this base class. It
+    implements basic functionality for the XAccessibleTable interface.
+    Grid COntrol table objects are: the data table, the column header bar and the
+    row header bar. */
+class AccessibleGridControlTableBase :
+    public GridControlAccessibleElement,
+    public AccessibleGridControlTableImplHelper
+{
+public:
+    /** Constructor sets specified name and description.
+        @param rxParent  XAccessible interface of the parent object.
+        @param rTable    The Table control.
+        @param eObjType  Type of table control object */
+    AccessibleGridControlTableBase(
+        const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+        ::vcl::table::IAccessibleTable& rTable,
+        ::vcl::table::AccessibleTableControlObjType  eObjType );
+
+protected:
+    virtual ~AccessibleGridControlTableBase() override = default;
+
+public:
+    // XAccessibleContext
+
+    /** @return  The count of visible children. */
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+
+    /** @return  The role of this object (a table). */
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
+
+    /*  Derived classes have to implement:
+        -   getAccessibleChild,
+        -   getAccessibleIndexInParent. */
+
+    // XAccessibleComponent
+
+    /*  Derived classes have to implement:
+        -   getAccessibleAt,
+        -   grabFocus. */
+
+    // XAccessibleTable
+
+    /** @return  The number of used rows in the table (0 = empty table). */
+    virtual sal_Int32 SAL_CALL getAccessibleRowCount() override;
+
+    /** @return  The number of used columns in the table (0 = empty table). */
+    virtual sal_Int32 SAL_CALL getAccessibleColumnCount() override;
+
+    /** @return  The row extent of the specified cell (always 1). */
+    virtual sal_Int32 SAL_CALL
+    getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+
+    /** @return  The column extent of the specified cell (always 1). */
+    virtual sal_Int32 SAL_CALL
+    getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+
+    /** @return  The caption cell of the table (not supported). */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleCaption() override;
+
+    /** @return  The summary object of the table (not supported). */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleSummary() override;
+
+    /** @return  The child index of the specified cell. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override;
+
+    /** @return  The row index of the specified child cell. */
+    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override;
+
+    /** @return  The column index of the specified child cell. */
+    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override;
+
+    /*  Derived classes have to implement:
+        -   getAccessibleRowDescription,
+        -   getAccessibleColumnDescription,
+        -   getAccessibleRowHeaders,
+        -   getAccessibleColumnHeaders,
+        -   getSelectedAccessibleRows,
+        -   getSelectedAccessibleColumns,
+        -   isAccessibleRowSelected,
+        -   isAccessibleColumnSelected,
+        -   getAccessibleCellAt,
+        -   isAccessibleSelected. */
+
+    // XInterface
+
+    /** Queries for a new interface. */
+    css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
+
+    /** Acquires the object (calls acquire() on base class). */
+    virtual void SAL_CALL acquire() noexcept override;
+
+    /** Releases the object (calls release() on base class). */
+    virtual void SAL_CALL release() noexcept override;
+
+    // XTypeProvider
+
+    /** @return  a sequence of possible types (received from base classes). */
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+
+    /** @return  a unique implementation ID. */
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+
+protected:
+    // internal helper methods
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The row index of the specified cell index. */
+    sal_Int32 implGetRow( sal_Int32 nChildIndex ) const;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The column index of the specified cell index. */
+    sal_Int32 implGetColumn( sal_Int32 nChildIndex ) const;
+
+    /** Fills a sequence with sorted indexes of completely selected rows.
+        @attention  This method requires locked mutex's and a living object.
+        @param rSeq  Out-parameter that takes the sorted row index list. */
+    void implGetSelectedRows( css::uno::Sequence< sal_Int32 >& rSeq );
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified row index is invalid. */
+    void ensureIsValidRow( sal_Int32 nRow );
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified column index is invalid. */
+    void ensureIsValidColumn( sal_Int32 nColumn );
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified cell address is invalid. */
+    void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn );
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified child index is invalid. */
+    void ensureIsValidIndex( sal_Int32 nChildIndex );
+};
+
+
+} // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
new file mode 100644
index 000000000..6e3ee3367
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
@@ -0,0 +1,150 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+#pragma once
+
+#include <comphelper/accessibletexthelper.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <extended/AccessibleGridControlBase.hxx>
+#include <vcl/accessibletable.hxx>
+#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
+
+namespace accessibility
+{
+    class AccessibleGridControlCell : public AccessibleGridControlBase
+    {
+    private:
+        sal_Int32               m_nRowPos;      // the row number of the table cell
+        sal_Int32               m_nColPos;      // the column id of the table cell
+
+    protected:
+        // attribute access
+        sal_Int32    getRowPos( ) const { return m_nRowPos; }
+        sal_Int32    getColumnPos( ) const { return m_nColPos; }
+
+        // XAccessibleComponent
+        virtual void SAL_CALL grabFocus() override;
+
+    public:
+        // XAccessibleContext
+        virtual OUString SAL_CALL getAccessibleName() override;
+
+    protected:
+        AccessibleGridControlCell(
+            const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
+            ::vcl::table::IAccessibleTable& _rTable,
+            sal_Int32 _nRowPos,
+            sal_uInt16 _nColPos,
+            ::vcl::table::AccessibleTableControlObjType _eType
+        );
+
+        virtual ~AccessibleGridControlCell() override = default;
+
+    private:
+        AccessibleGridControlCell( const AccessibleGridControlCell& ) = delete;
+        AccessibleGridControlCell& operator=( const AccessibleGridControlCell& ) = delete;
+    };
+
+    typedef ::cppu::ImplHelper2 <   css::accessibility::XAccessibleText
+                                ,   css::accessibility::XAccessible
+                                >   AccessibleTextHelper_BASE;
+    // implementation of a table cell of GridControl
+    class AccessibleGridControlTableCell final   :public AccessibleGridControlCell
+                                        ,public AccessibleTextHelper_BASE
+                                        ,public ::comphelper::OCommonAccessibleText
+    {
+    private:
+        // OCommonAccessibleText
+        virtual OUString                        implGetText() override;
+        virtual css::lang::Locale               implGetLocale() override;
+        virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override final;
+        virtual tools::Rectangle implGetBoundingBox() override;
+        virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
+
+    public:
+        AccessibleGridControlTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
+                                    ::vcl::table::IAccessibleTable& _rTable,
+                                    sal_Int32 _nRowId,
+                                    sal_uInt16 _nColId);
+
+        // XInterface -------------------------------------------------------------
+
+        /** Queries for a new interface. */
+        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
+
+        /** Acquires the object (calls acquire() on base class). */
+        virtual void SAL_CALL acquire() noexcept override;
+
+        /** Releases the object (calls release() on base class). */
+        virtual void SAL_CALL release() noexcept override;
+
+        /** @return  The index of this object among the parent's children. */
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+
+        /** @return
+                The name of this class.
+        */
+        virtual OUString SAL_CALL getImplementationName() override;
+
+        /** @return
+                The count of visible children.
+        */
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+
+        /** @return
+                The XAccessible interface of the specified child.
+        */
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+            getAccessibleChild( sal_Int32 nChildIndex ) override;
+
+        /** Creates a new AccessibleStateSetHelper and fills it with states of the
+            current object.
+            @return
+                A filled AccessibleStateSetHelper.
+        */
+        rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override;
+
+        // XAccessible ------------------------------------------------------------
+
+        /** @return  The XAccessibleContext interface of this object. */
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL
+        getAccessibleContext() override;
+
+        // XAccessibleText
+        virtual sal_Int32 SAL_CALL getCaretPosition() override;
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+        virtual sal_Int32 SAL_CALL getCharacterCount() override;
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+        virtual OUString SAL_CALL getSelectedText() override;
+        virtual sal_Int32 SAL_CALL getSelectionStart() override;
+        virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual OUString SAL_CALL getText() override;
+        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual sal_Bool SAL_CALL scrollSubstringTo( sal_Int32 nStartIndex, sal_Int32 nEndIndex, css::accessibility::AccessibleScrollType aScrollType) override;
+    };
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/AccessibleIconView.hxx b/accessibility/inc/extended/AccessibleIconView.hxx
new file mode 100644
index 000000000..d5ab5eafb
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleIconView.hxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <sal/config.h>
+
+#include "accessiblelistbox.hxx"
+
+namespace accessibility
+{
+class AccessibleIconView final : public AccessibleListBox
+{
+public:
+    AccessibleIconView(SvTreeListBox const& _rListBox,
+                       const css::uno::Reference<css::accessibility::XAccessible>& _xParent);
+
+protected:
+    // VCLXAccessibleComponent
+    virtual void ProcessWindowEvent(const VclWindowEvent& rVclWindowEvent) override;
+};
+} // namespace accessibility
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/accessibility/inc/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
new file mode 100644
index 000000000..ba4654654
--- /dev/null
+++ b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <extended/AccessibleBrowseBoxBase.hxx>
+#include <vcl/AccessibleBrowseBoxObjType.hxx>
+
+namespace accessibility
+{
+
+
+    // = AccessibleBrowseBoxCell
+
+    /** common accessibility-functionality for browse box elements which occupy a cell
+    */
+    class AccessibleBrowseBoxCell : public AccessibleBrowseBoxBase
+    {
+    private:
+        sal_Int32               m_nRowPos;      // the row number of the table cell
+        sal_uInt16              m_nColPos;      // the column id of the table cell
+
+    protected:
+        // attribute access
+        sal_Int32    getRowPos( ) const { return m_nRowPos; }
+        sal_Int32    getColumnPos( ) const { return m_nColPos; }
+
+    protected:
+        // AccessibleBrowseBoxBase overridables
+        virtual tools::Rectangle implGetBoundingBox() override;
+        virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
+
+        // XAccessibleComponent
+        virtual void SAL_CALL grabFocus() override;
+
+    protected:
+        AccessibleBrowseBoxCell(
+            const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
+            ::vcl::IAccessibleTableProvider& _rBrowseBox,
+            const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
+            sal_Int32 _nRowPos,
+            sal_uInt16 _nColPos,
+            AccessibleBrowseBoxObjType _eType = AccessibleBrowseBoxObjType::TableCell
+        );
+
+        virtual ~AccessibleBrowseBoxCell() override;
+
+    private:
+        AccessibleBrowseBoxCell( const AccessibleBrowseBoxCell& ) = delete;
+        AccessibleBrowseBoxCell& operator=( const AccessibleBrowseBoxCell& ) = delete;
+    };
+
+
+}   // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
new file mode 100644
index 000000000..093a3ade4
--- /dev/null
+++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
@@ -0,0 +1,131 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+#pragma once
+
+#include <extended/accessiblebrowseboxcell.hxx>
+#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
+#include <comphelper/compbase.hxx>
+#include <comphelper/accessiblewrapper.hxx>
+
+namespace accessibility
+{
+
+    // = EditBrowseBoxTableCell
+
+    class EditBrowseBoxTableCell final : public AccessibleBrowseBoxCell
+                                    ,public ::comphelper::OAccessibleContextWrapperHelper
+    {
+    public:
+        EditBrowseBoxTableCell(
+            const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
+            const css::uno::Reference< css::accessibility::XAccessible >& _rxOwningAccessible,
+            const css::uno::Reference< css::accessibility::XAccessibleContext >& _xControlChild,
+            ::vcl::IAccessibleTableProvider& _rBrowseBox,
+            const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
+            sal_Int32 _nRowPos,
+            sal_uInt16 _nColPos
+        );
+
+    private:
+        virtual ~EditBrowseBoxTableCell() override;
+
+        // XAccessibleComponent
+        virtual sal_Int32 SAL_CALL getForeground(  ) override ;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override ;
+
+        // XServiceInfo
+        virtual OUString SAL_CALL getImplementationName() override;
+
+        // XInterface
+        DECLARE_XINTERFACE( )
+        // XTypeProvider
+        DECLARE_XTYPEPROVIDER( )
+
+        // XAccessibleContext
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+
+        sal_Int16 SAL_CALL getAccessibleRole() override;
+
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+
+        // OComponentHelper
+        virtual void SAL_CALL disposing() override;
+
+        // XComponent/OComponentProxyAggregationHelper (needs to be disambiguated)
+        virtual void SAL_CALL dispose() final override;
+
+        // OAccessibleContextWrapperHelper();
+        void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) override;
+
+        EditBrowseBoxTableCell( const EditBrowseBoxTableCell& ) = delete;
+        EditBrowseBoxTableCell& operator=( const EditBrowseBoxTableCell& ) = delete;
+    };
+
+
+    // = EditBrowseBoxTableCell
+
+    // XAccessible providing an EditBrowseBoxTableCell
+    class EditBrowseBoxTableCellAccess final :
+        public comphelper::WeakComponentImplHelper<css::accessibility::XAccessible>
+    {
+        css::uno::WeakReference< css::accessibility::XAccessibleContext >
+                                            m_aContext;
+        css::uno::Reference< css::accessibility::XAccessible >
+                                            m_xParent;
+        css::uno::Reference< css::accessibility::XAccessible >
+                                            m_xControlAccessible;
+        css::uno::Reference< css::awt::XWindow >
+                                            m_xFocusWindow;
+        ::vcl::IAccessibleTableProvider*    m_pBrowseBox;
+        sal_Int32                           m_nRowPos;
+        sal_uInt16                          m_nColPos;
+
+    public:
+        EditBrowseBoxTableCellAccess(
+            css::uno::Reference< css::accessibility::XAccessible > _xParent,
+            css::uno::Reference< css::accessibility::XAccessible > _xControlAccessible,
+            css::uno::Reference< css::awt::XWindow > _xFocusWindow,
+            ::vcl::IAccessibleTableProvider& _rBrowseBox,
+            sal_Int32 _nRowPos,
+            sal_uInt16 _nColPos
+        );
+
+    private:
+        virtual ~EditBrowseBoxTableCellAccess() override;
+
+        // XAccessible
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
+
+        // XComponent/WeakComponentImplHelper
+        virtual void disposing(std::unique_lock<std::mutex>&) override;
+
+        EditBrowseBoxTableCellAccess( const EditBrowseBoxTableCellAccess& ) = delete;
+        EditBrowseBoxTableCellAccess& operator=( const EditBrowseBoxTableCellAccess& ) = delete;
+    };
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
new file mode 100644
index 000000000..836956fc4
--- /dev/null
+++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
@@ -0,0 +1,100 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include <cppuhelper/implbase2.hxx>
+#include <vcl/vclevent.hxx>
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+
+// class AccessibleListBox -----------------------------------------------
+
+class SvtIconChoiceCtrl;
+
+namespace accessibility
+{
+    typedef ::cppu::ImplHelper2<  css::accessibility::XAccessible
+                                , css::accessibility::XAccessibleSelection> AccessibleIconChoiceCtrl_BASE;
+
+    /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry
+    */
+    class AccessibleIconChoiceCtrl final : public AccessibleIconChoiceCtrl_BASE
+                                          ,public VCLXAccessibleComponent
+    {
+        css::uno::Reference< css::accessibility::XAccessible > m_xParent;
+
+        virtual ~AccessibleIconChoiceCtrl() override = default;
+
+        /** this function is called upon disposing the component */
+        virtual void SAL_CALL   disposing() override;
+
+        virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+        virtual void    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+
+        VclPtr< SvtIconChoiceCtrl > getCtrl() const;
+
+    public:
+        /** OAccessibleBase needs a valid view
+            @param  _rIconCtrl
+                is the box for which we implement an accessible object
+            @param  _xParent
+                is our parent accessible object
+        */
+        AccessibleIconChoiceCtrl( SvtIconChoiceCtrl const & _rIconCtrl,
+                                  const css::uno::Reference< css::accessibility::XAccessible >& _xParent );
+
+        // XTypeProvider
+        DECLARE_XTYPEPROVIDER()
+
+        // XInterface
+        DECLARE_XINTERFACE()
+
+        // XServiceInfo
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+        // XAccessible
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+
+        // XAccessibleSelection
+        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+        void SAL_CALL clearAccessibleSelection(  ) override;
+        void SAL_CALL selectAllAccessibleChildren(  ) override;
+        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    };
+
+
+}// namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
new file mode 100644
index 000000000..915736e95
--- /dev/null
+++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
@@ -0,0 +1,179 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/compbase8.hxx>
+#include <cppuhelper/basemutex.hxx>
+#include <comphelper/accessibletexthelper.hxx>
+#include <tools/gen.hxx>
+#include <vcl/vclptr.hxx>
+
+// forward
+
+class SvxIconChoiceCtrlEntry;
+class SvtIconChoiceCtrl;
+
+namespace accessibility
+{
+
+
+    typedef ::cppu::WeakAggComponentImplHelper8< css::accessibility::XAccessible
+                                                , css::accessibility::XAccessibleContext
+                                                , css::accessibility::XAccessibleComponent
+                                                , css::accessibility::XAccessibleEventBroadcaster
+                                                , css::accessibility::XAccessibleText
+                                                , css::accessibility::XAccessibleAction
+                                                , css::lang::XServiceInfo
+                                                , css::lang::XEventListener > AccessibleIconChoiceCtrlEntry_BASE;
+
+    /** the class AccessibleListBoxEntry represents the class for an accessible object of a listbox entry */
+    class AccessibleIconChoiceCtrlEntry final : public ::cppu::BaseMutex,
+                                                public AccessibleIconChoiceCtrlEntry_BASE,
+                                                public ::comphelper::OCommonAccessibleText
+    {
+        /** The treelistbox control */
+        VclPtr<SvtIconChoiceCtrl>           m_pIconCtrl;
+        sal_Int32                           m_nIndex;
+
+        /// client id in the AccessibleEventNotifier queue
+        sal_uInt32                          m_nClientId;
+
+        css::uno::Reference< css::accessibility::XAccessible > m_xParent;
+
+        tools::Rectangle               GetBoundingBox_Impl() const;
+        tools::Rectangle               GetBoundingBoxOnScreen_Impl() const;
+        bool                IsAlive_Impl() const;
+        bool                IsShowing_Impl() const;
+
+        /// @throws css::lang::DisposedException
+        /// @throws css::uno::RuntimeException
+        tools::Rectangle               GetBoundingBox();
+        /// @throws css::lang::DisposedException
+        /// @throws css::uno::RuntimeException
+        tools::Rectangle               GetBoundingBoxOnScreen();
+        /// @throws css::lang::DisposedException
+        void                    EnsureIsAlive() const;
+
+        virtual ~AccessibleIconChoiceCtrlEntry() override;
+        /** this function is called upon disposing the component
+        */
+        virtual void SAL_CALL                   disposing() override;
+
+        // OCommonAccessibleText
+        virtual OUString                        implGetText() override;
+        virtual css::lang::Locale               implGetLocale() override;
+        virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override final;
+
+    public:
+        /** Ctor()
+            @param  _rIconCtrl
+                the icon control
+            @param  _nPos
+                the entry number
+            @param  _xParent
+                is our parent accessible object
+        */
+        AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
+                                       sal_Int32 _nPos,
+                                       const css::uno::Reference< css::accessibility::XAccessible >& _xParent );
+
+        // XTypeProvider
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+
+        // XServiceInfo
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+        // XEventListener
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+
+        // XAccessible
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual css::lang::Locale SAL_CALL getLocale(  ) override;
+
+        // XAccessibleComponent
+        virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+        virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+        virtual css::awt::Point SAL_CALL getLocation(  ) override;
+        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+        virtual css::awt::Size SAL_CALL getSize(  ) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
+
+        // XAccessibleText
+        virtual sal_Int32 SAL_CALL getCaretPosition() override;
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+        virtual sal_Int32 SAL_CALL getCharacterCount() override;
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+        virtual OUString SAL_CALL getSelectedText() override;
+        virtual sal_Int32 SAL_CALL getSelectionStart() override;
+        virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual OUString SAL_CALL getText() override;
+        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual sal_Bool SAL_CALL scrollSubstringTo( sal_Int32 nStartIndex, sal_Int32 nEndIndex, css::accessibility::AccessibleScrollType aScrollType) override;
+
+        // XAccessibleEventBroadcaster
+        virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+        virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+
+        // XAccessibleAction
+        virtual sal_Int32 SAL_CALL getAccessibleActionCount(  ) override;
+        virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) override;
+        virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
+    };
+
+
+}// namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx
new file mode 100644
index 000000000..40b01ea18
--- /dev/null
+++ b/accessibility/inc/extended/accessiblelistbox.hxx
@@ -0,0 +1,126 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include <cppuhelper/implbase2.hxx>
+#include <vcl/vclevent.hxx>
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+
+#include <unordered_map>
+
+// class AccessibleListBox -----------------------------------------------
+
+class SvTreeListBox;
+class SvTreeListEntry;
+
+namespace accessibility
+{
+    class AccessibleListBoxEntry;
+
+    /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry
+    */
+    class AccessibleListBox :
+        public cppu::ImplHelper2<
+            css::accessibility::XAccessible,
+            css::accessibility::XAccessibleSelection>,
+        public VCLXAccessibleComponent
+    {
+
+        css::uno::Reference< css::accessibility::XAccessible > m_xParent;
+        // OComponentHelper overridables
+        /** this function is called upon disposing the component */
+        virtual void SAL_CALL   disposing() override;
+
+    protected:
+        // VCLXAccessibleComponent
+        virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+        virtual void    ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ) override;
+        virtual void    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+
+    private:
+        VclPtr< SvTreeListBox > getListBox() const;
+
+        void            RemoveChildEntries(SvTreeListEntry*);
+
+        sal_Int32 GetRoleType() const;
+
+    public:
+        /** OAccessibleBase needs a valid view
+            @param  _rListBox
+                is the box for which we implement an accessible object
+            @param  _xParent
+                is our parent accessible object
+        */
+        AccessibleListBox( SvTreeListBox const & _rListBox,
+                           const css::uno::Reference< css::accessibility::XAccessible >& _xParent );
+
+        virtual ~AccessibleListBox() override;
+
+        rtl::Reference<AccessibleListBoxEntry> implGetAccessible(SvTreeListEntry & rEntry);
+
+        // XTypeProvider
+        DECLARE_XTYPEPROVIDER()
+
+        // XInterface
+        DECLARE_XINTERFACE()
+
+        // XServiceInfo
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+        // XAccessible
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+
+        // XAccessibleSelection
+        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+        void SAL_CALL clearAccessibleSelection(  ) override;
+        void SAL_CALL selectAllAccessibleChildren(  ) override;
+        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+
+    private:
+
+        typedef std::unordered_map<SvTreeListEntry*, rtl::Reference<AccessibleListBoxEntry>> MAP_ENTRY;
+        MAP_ENTRY m_mapEntry;
+
+        css::uno::Reference< css::accessibility::XAccessible > m_xFocusedChild;
+
+        accessibility::AccessibleListBoxEntry* GetCurEventEntry( const VclWindowEvent& rVclWindowEvent );
+
+    };
+
+
+}// namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx
new file mode 100644
index 000000000..449803bc3
--- /dev/null
+++ b/accessibility/inc/extended/accessiblelistboxentry.hxx
@@ -0,0 +1,223 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <deque>
+#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+#include <cppuhelper/compbase9.hxx>
+#include <cppuhelper/basemutex.hxx>
+#include <comphelper/accessibletexthelper.hxx>
+#include <vcl/toolkit/treelistentry.hxx>
+#include <tools/gen.hxx>
+
+// forward ---------------------------------------------------------------
+
+namespace com::sun::star::awt {
+    struct Point;
+    struct Rectangle;
+    struct Size;
+    class XFocusListener;
+}
+
+class SvTreeListBox;
+class SvTreeListEntry;
+
+
+namespace accessibility
+{
+    class AccessibleListBox;
+
+// class AccessibleListBoxEntry ------------------------------------------
+    typedef ::cppu::WeakAggComponentImplHelper9< css::accessibility::XAccessible
+                                                , css::accessibility::XAccessibleContext
+                                                , css::accessibility::XAccessibleComponent
+                                                , css::accessibility::XAccessibleEventBroadcaster
+                                                , css::accessibility::XAccessibleAction
+                                                , css::accessibility::XAccessibleSelection
+                                                , css::accessibility::XAccessibleText
+                                                , css::accessibility::XAccessibleValue
+                                                , css::lang::XServiceInfo > AccessibleListBoxEntry_BASE;
+
+    /** the class AccessibleListBoxEntry represents the class for an accessible object of a listbox entry */
+    class AccessibleListBoxEntry final : public ::cppu::BaseMutex
+                                        ,public AccessibleListBoxEntry_BASE
+                                        ,public ::comphelper::OCommonAccessibleText
+    {
+    friend class AccessibleListBox;
+
+    private:
+        VclPtr<SvTreeListBox>               m_pTreeListBox;
+        /** The treelistbox control */
+        std::deque< sal_Int32 >           m_aEntryPath;
+        SvTreeListEntry*                    m_pSvLBoxEntry; // Needed for a11y focused item...
+
+
+        /// client id in the AccessibleEventNotifier queue
+        sal_uInt32                          m_nClientId;
+
+        css::uno::WeakReference<css::accessibility::XAccessible> m_wListBox;
+        AccessibleListBox & m_rListBox;
+
+        tools::Rectangle               GetBoundingBox_Impl() const;
+        tools::Rectangle               GetBoundingBoxOnScreen_Impl() const;
+        bool                IsAlive_Impl() const;
+        bool                IsShowing_Impl() const;
+
+        /// @throws css::lang::DisposedException
+        /// @throws css::uno::RuntimeException
+        tools::Rectangle               GetBoundingBox();
+        /// @throws css::lang::DisposedException
+        /// @throws css::uno::RuntimeException
+        tools::Rectangle               GetBoundingBoxOnScreen();
+        /// @throws css::lang::DisposedException
+        void                    EnsureIsAlive() const;
+
+        void                    NotifyAccessibleEvent( sal_Int16 _nEventId, const css::uno::Any& _aOldValue, const css::uno::Any& _aNewValue );
+
+        virtual ~AccessibleListBoxEntry() override;
+
+        /** this function is called upon disposing the component
+        */
+        virtual void SAL_CALL   disposing() override;
+
+        DECL_LINK( WindowEventListener, VclWindowEvent&, void );
+
+        // OCommonAccessibleText
+        virtual OUString                        implGetText() override;
+        virtual css::lang::Locale               implGetLocale() override;
+        virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override;
+
+    public:
+        /** Ctor()
+            @param  _rListBox
+                the view control
+            @param  rEntry
+                the entry
+            @param rListBox
+                the a11y object for _rListBox
+        */
+        AccessibleListBoxEntry( SvTreeListBox& _rListBox,
+                                SvTreeListEntry& rEntry,
+                                AccessibleListBox & rListBox);
+
+        SvTreeListEntry* GetSvLBoxEntry() const { return m_pSvLBoxEntry; }
+
+
+    private:
+        // XTypeProvider
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+
+        // XServiceInfo
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+        // XAccessible
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual css::lang::Locale SAL_CALL getLocale(  ) override;
+
+        // XAccessibleComponent
+        virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+        virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+        virtual css::awt::Point SAL_CALL getLocation(  ) override;
+        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+        virtual css::awt::Size SAL_CALL getSize(  ) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
+
+        // XAccessibleText
+        virtual sal_Int32 SAL_CALL getCaretPosition() override;
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+        virtual sal_Int32 SAL_CALL getCharacterCount() override;
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+        virtual OUString SAL_CALL getSelectedText() override;
+        virtual sal_Int32 SAL_CALL getSelectionStart() override;
+        virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual OUString SAL_CALL getText() override;
+        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual sal_Bool SAL_CALL scrollSubstringTo( sal_Int32 nStartIndex, sal_Int32 nEndIndex, css::accessibility::AccessibleScrollType aScrollType) override;
+
+        // XAccessibleEventBroadcaster
+        virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+        virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+
+        // XAccessibleAction
+        virtual sal_Int32 SAL_CALL getAccessibleActionCount(  ) override;
+        virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) override;
+        virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
+
+        // XAccessibleSelection
+        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+        void SAL_CALL clearAccessibleSelection(  ) override;
+        void SAL_CALL selectAllAccessibleChildren(  ) override;
+        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+
+        // XAccessibleValue
+        virtual css::uno::Any SAL_CALL getCurrentValue(  ) override;
+        virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override;
+        virtual css::uno::Any SAL_CALL getMaximumValue(  ) override;
+        virtual css::uno::Any SAL_CALL getMinimumValue(  ) override;
+        virtual css::uno::Any SAL_CALL getMinimumIncrement(  ) override;
+
+        css::uno::Reference< css::accessibility::XAccessible > implGetParentAccessible( ) const;
+        SvTreeListEntry* GetRealChild(sal_Int32 nIndex);
+        sal_Int32 GetRoleType() const;
+    };
+
+
+}// namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/accessibletabbar.hxx b/accessibility/inc/extended/accessibletabbar.hxx
new file mode 100644
index 000000000..973bbbe2e
--- /dev/null
+++ b/accessibility/inc/extended/accessibletabbar.hxx
@@ -0,0 +1,106 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase2.hxx>
+#include <extended/accessibletabbarbase.hxx>
+
+#include <vector>
+
+namespace utl {
+class AccessibleStateSetHelper;
+}
+
+
+namespace accessibility
+{
+
+
+
+
+    typedef ::cppu::ImplHelper2<
+        css::accessibility::XAccessible,
+        css::lang::XServiceInfo > AccessibleTabBar_BASE;
+
+    class AccessibleTabBar final : public AccessibleTabBarBase,
+                                public AccessibleTabBar_BASE
+    {
+        typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
+
+        AccessibleChildren      m_aAccessibleChildren;
+
+        virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+        void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+        // OCommonAccessibleComponent
+        virtual css::awt::Rectangle implGetBounds(  ) override;
+
+        // XComponent
+        virtual void SAL_CALL   disposing() override;
+
+    public:
+        AccessibleTabBar( TabBar* pTabBar );
+
+        // XInterface
+        DECLARE_XINTERFACE()
+
+        // XTypeProvider
+        DECLARE_XTYPEPROVIDER()
+
+        // XServiceInfo
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+        // XAccessible
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual css::lang::Locale SAL_CALL getLocale(  ) override;
+
+        // XAccessibleComponent
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
+
+        // XAccessibleExtendedComponent
+        virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+        virtual OUString SAL_CALL getTitledBorderText(  ) override;
+        virtual OUString SAL_CALL getToolTipText(  ) override;
+    };
+
+
+}   // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/accessibletabbarbase.hxx b/accessibility/inc/extended/accessibletabbarbase.hxx
new file mode 100644
index 000000000..d08f20e3e
--- /dev/null
+++ b/accessibility/inc/extended/accessibletabbarbase.hxx
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <comphelper/accessiblecomponenthelper.hxx>
+#include <tools/link.hxx>
+#include <vcl/vclptr.hxx>
+
+class TabBar;
+class VclSimpleEvent;
+class VclWindowEvent;
+
+
+namespace accessibility
+{
+
+class AccessibleTabBarBase : public comphelper::OAccessibleExtendedComponentHelper
+{
+public:
+    explicit            AccessibleTabBarBase( TabBar* pTabBar );
+    virtual             ~AccessibleTabBarBase() override;
+
+protected:
+    DECL_LINK( WindowEventListener, VclWindowEvent&, void );
+
+    virtual void        ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+
+    // XComponent
+    virtual void SAL_CALL disposing() override;
+
+private:
+    void                SetTabBarPointer( TabBar* pTabBar );
+    void                ClearTabBarPointer();
+
+protected:
+    VclPtr<TabBar>        m_pTabBar;
+};
+
+
+}   // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx
new file mode 100644
index 000000000..81bf83f24
--- /dev/null
+++ b/accessibility/inc/extended/accessibletabbarpage.hxx
@@ -0,0 +1,120 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase2.hxx>
+#include <extended/accessibletabbarbase.hxx>
+
+namespace utl {
+class AccessibleStateSetHelper;
+}
+
+
+namespace accessibility
+{
+
+
+
+
+    typedef ::cppu::ImplHelper2<
+        css::accessibility::XAccessible,
+        css::lang::XServiceInfo > AccessibleTabBarPage_BASE;
+
+    class AccessibleTabBarPage final : public AccessibleTabBarBase,
+                                       public AccessibleTabBarPage_BASE
+    {
+        friend class AccessibleTabBarPageList;
+
+    private:
+        sal_uInt16              m_nPageId;
+        bool                    m_bShowing;
+        bool                    m_bSelected;
+        OUString                m_sPageText;
+
+        css::uno::Reference< css::accessibility::XAccessible >        m_xParent;
+
+        bool                    IsEnabled();
+        bool                    IsShowing() const;
+        bool                    IsSelected() const;
+
+        void                    SetShowing( bool bShowing );
+        void                    SetSelected( bool bSelected );
+        void                    SetPageText( const OUString& sPageText );
+
+        sal_uInt16              GetPageId() const { return m_nPageId; }
+
+        void                    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+        // OCommonAccessibleComponent
+        virtual css::awt::Rectangle implGetBounds(  ) override;
+
+        // XComponent
+        virtual void SAL_CALL   disposing() override;
+
+    public:
+        AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId,
+                              const css::uno::Reference< css::accessibility::XAccessible >& rxParent );
+
+        // XInterface
+        DECLARE_XINTERFACE()
+
+        // XTypeProvider
+        DECLARE_XTYPEPROVIDER()
+
+        // XServiceInfo
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+        // XAccessible
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual css::lang::Locale SAL_CALL getLocale(  ) override;
+
+        // XAccessibleComponent
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
+
+        // XAccessibleExtendedComponent
+        virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+        virtual OUString SAL_CALL getTitledBorderText(  ) override;
+        virtual OUString SAL_CALL getToolTipText(  ) override;
+    };
+
+
+}   // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx b/accessibility/inc/extended/accessibletabbarpagelist.hxx
new file mode 100644
index 000000000..89a8c6310
--- /dev/null
+++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx
@@ -0,0 +1,127 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase3.hxx>
+#include <extended/accessibletabbarbase.hxx>
+
+#include <vector>
+
+namespace utl {
+class AccessibleStateSetHelper;
+}
+
+
+namespace accessibility
+{
+
+
+
+
+    typedef ::cppu::ImplHelper3<
+        css::accessibility::XAccessible,
+        css::accessibility::XAccessibleSelection,
+        css::lang::XServiceInfo > AccessibleTabBarPageList_BASE;
+
+    class AccessibleTabBarPageList final : public AccessibleTabBarBase,
+                                           public AccessibleTabBarPageList_BASE
+    {
+    private:
+        typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
+
+        AccessibleChildren      m_aAccessibleChildren;
+        sal_Int32               m_nIndexInParent;
+
+        void                    UpdateShowing( bool bShowing );
+        void                    UpdateSelected( sal_Int32 i, bool bSelected );
+        void                    UpdatePageText( sal_Int32 i );
+
+        void                    InsertChild( sal_Int32 i );
+        void                    RemoveChild( sal_Int32 i );
+        void                    MoveChild( sal_Int32 i, sal_Int32 j );
+
+        virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+        void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+        // OCommonAccessibleComponent
+        virtual css::awt::Rectangle implGetBounds(  ) override;
+
+        // XComponent
+        virtual void SAL_CALL   disposing() override;
+
+    public:
+        AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent );
+
+        // XInterface
+        DECLARE_XINTERFACE()
+
+        // XTypeProvider
+        DECLARE_XTYPEPROVIDER()
+
+        // XServiceInfo
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+        // XAccessible
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual css::lang::Locale SAL_CALL getLocale(  ) override;
+
+        // XAccessibleComponent
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
+
+        // XAccessibleExtendedComponent
+        virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+        virtual OUString SAL_CALL getTitledBorderText(  ) override;
+        virtual OUString SAL_CALL getToolTipText(  ) override;
+
+        // XAccessibleSelection
+        virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+        virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+        virtual void SAL_CALL clearAccessibleSelection(  ) override;
+        virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+        virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+        virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override;
+    };
+
+
+}   // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/accessibletablistbox.hxx b/accessibility/inc/extended/accessibletablistbox.hxx
new file mode 100644
index 000000000..17f30ce60
--- /dev/null
+++ b/accessibility/inc/extended/accessibletablistbox.hxx
@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <extended/AccessibleBrowseBox.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <vcl/accessibletableprovider.hxx>
+
+class SvHeaderTabListBox;
+
+
+namespace accessibility {
+
+class AccessibleBrowseBoxTable;
+
+typedef ::cppu::ImplHelper1  <   css::accessibility::XAccessible
+                            >   AccessibleTabListBox_Base;
+
+/** !!! */
+class AccessibleTabListBox final
+                :public AccessibleBrowseBox
+                ,public AccessibleTabListBox_Base
+                ,public ::vcl::IAccessibleTabListBox
+{
+private:
+    VclPtr<SvHeaderTabListBox>        m_pTabListBox;
+
+public:
+    /** ctor()
+        @param rxParent  XAccessible interface of the parent object.
+        @param rBox  The HeaderTabListBox control. */
+    AccessibleTabListBox(
+        const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+        SvHeaderTabListBox& rBox );
+
+    // XInterface
+    DECLARE_XINTERFACE( )
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER( )
+
+    // XAccessibleContext -----------------------------------------------------
+
+    /** @return  The count of visible children. */
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+
+    /** @return  The XAccessible interface of the specified child. */
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild( sal_Int32 nChildIndex ) override;
+
+    // XAccessibleContext
+    css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() override;
+
+    // IAccessibleTabListBox
+    virtual css::uno::Reference< css::accessibility::XAccessible >
+        getMyself() override
+    {
+        return this;
+    }
+
+    css::uno::Reference< css::accessibility::XAccessible >
+        getHeaderBar() override
+    {
+        return AccessibleBrowseBox::getHeaderBar( AccessibleBrowseBoxObjType::ColumnHeaderBar );
+    }
+
+private:
+    /** dtor() */
+    virtual ~AccessibleTabListBox() override;
+
+    /** This method creates and returns an accessible table.
+        @return  An AccessibleBrowseBoxTable. */
+    virtual rtl::Reference<AccessibleBrowseBoxTable> createAccessibleTable() override;
+};
+
+
+} // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/accessibletablistboxtable.hxx b/accessibility/inc/extended/accessibletablistboxtable.hxx
new file mode 100644
index 000000000..73d5660b6
--- /dev/null
+++ b/accessibility/inc/extended/accessibletablistboxtable.hxx
@@ -0,0 +1,108 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <extended/AccessibleBrowseBoxTable.hxx>
+#include <comphelper/uno3.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+
+class SvHeaderTabListBox;
+
+
+namespace accessibility {
+
+typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection >
+            AccessibleTabListBoxTableImplHelper;
+
+class AccessibleTabListBoxTable final : public AccessibleBrowseBoxTable, public AccessibleTabListBoxTableImplHelper
+{
+private:
+    VclPtr<SvHeaderTabListBox>     m_pTabListBox;
+
+    css::uno::Reference< css::accessibility::XAccessible >  m_xCurChild;
+
+    void                    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    DECL_LINK(        WindowEventListener, VclWindowEvent&, void );
+
+    // helpers ----------------------------------------------------------------
+
+    /** Throws an exception, if nIndex is not a valid child index. */
+    void ensureValidIndex( sal_Int32 _nIndex ) const;
+
+    /** Selects the specified row. */
+    void implSelectRow( sal_Int32 _nRow, bool _bSelect );
+
+    /** Returns the count of rows in the table. */
+    sal_Int32 implGetRowCount() const override;
+    /** Returns the total column count in the table. */
+    sal_Int32 implGetColumnCount() const override;
+    /** Returns the count of selected rows in the table. */
+    sal_Int32 implGetSelRowCount() const;
+
+    /** Returns the row index from cell index. */
+    sal_Int32 implGetRow( sal_Int32 _nIndex ) const
+    {
+        auto nColCount = implGetColumnCount();
+        assert(nColCount != 0);
+        return _nIndex / nColCount;
+    }
+
+    /** Returns the absolute row index of the nSelRow-th selected row. */
+    sal_Int32 implGetSelRow( sal_Int32 _nSelRow ) const;
+
+public:
+    /** ctor()
+        @param rxParent  XAccessible interface of the parent object.
+        @param rBox  The HeaderTabListBox control. */
+    AccessibleTabListBoxTable(
+        const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+        SvHeaderTabListBox& rBox );
+
+private:
+    /** dtor() */
+    virtual ~AccessibleTabListBoxTable() override;
+
+public:
+    // XInterface
+    DECLARE_XINTERFACE( )
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER( )
+
+    // XServiceInfo
+    virtual OUString SAL_CALL getImplementationName() override;
+
+    // XAccessibleSelection
+    void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+    sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    void SAL_CALL clearAccessibleSelection(  ) override;
+    void SAL_CALL selectAllAccessibleChildren(  ) override;
+    sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+};
+
+
+} // namespace accessibility
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx
new file mode 100644
index 000000000..f5696d8bf
--- /dev/null
+++ b/accessibility/inc/extended/textwindowaccessibility.hxx
@@ -0,0 +1,600 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+#include <svl/lstner.hxx>
+#include <vcl/textdata.hxx>
+#include <vcl/texteng.hxx>
+#include <vcl/textview.hxx>
+#include <vcl/window.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
+#include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp>
+#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#include <toolkit/awt/vclxwindow.hxx>
+#include <cppuhelper/basemutex.hxx>
+#include <cppuhelper/compbase7.hxx>
+#include <comphelper/accessibletexthelper.hxx>
+#include <rtl/ref.hxx>
+
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <queue>
+#include <memory>
+#include <unordered_map>
+
+class TextEngine;
+class TextView;
+
+namespace accessibility
+{
+
+class Document;
+
+class SfxListenerGuard
+{
+public:
+    SfxListenerGuard(::SfxListener & rListener):
+        m_rListener(rListener), m_pNotifier(nullptr) {}
+
+    ~SfxListenerGuard() { endListening(); }
+
+    // Not thread safe:
+    void startListening(::SfxBroadcaster & rNotifier);
+
+    // Not thread safe:
+    void endListening();
+
+private:
+    ::SfxListener & m_rListener;
+    ::SfxBroadcaster * m_pNotifier;
+};
+
+class WindowListenerGuard
+{
+public:
+    WindowListenerGuard(::Link<VclWindowEvent&,void> const & rListener):
+        m_aListener(rListener), m_pNotifier(nullptr) {}
+
+    ~WindowListenerGuard() { endListening(); }
+
+    // Not thread safe:
+    void startListening(vcl::Window & rNotifier);
+
+    // Not thread safe:
+    void endListening();
+
+private:
+    ::Link<VclWindowEvent&,void> m_aListener;
+    VclPtr<vcl::Window> m_pNotifier;
+};
+
+class ParagraphInfo
+{
+public:
+    ParagraphInfo(::sal_Int32 nHeight): m_nHeight(nHeight) {}
+
+    css::uno::WeakReference< css::accessibility::XAccessible > const &
+    getParagraph() const { return m_xParagraph; }
+
+    ::sal_Int32 getHeight() const { return m_nHeight; }
+
+    void setParagraph(
+        css::uno::Reference< css::accessibility::XAccessible > const &
+        rParagraph) { m_xParagraph = rParagraph; }
+
+    void changeHeight(::sal_Int32 nHeight) { m_nHeight = nHeight; }
+
+private:
+    css::uno::WeakReference< css::accessibility::XAccessible >
+    m_xParagraph;
+    ::sal_Int32 m_nHeight;
+};
+
+typedef std::vector< ParagraphInfo > Paragraphs;
+
+typedef ::cppu::WeakAggComponentImplHelper7<
+    css::accessibility::XAccessible,
+    css::accessibility::XAccessibleContext,
+    css::accessibility::XAccessibleComponent,
+    css::accessibility::XAccessibleEditableText,
+    css::accessibility::XAccessibleMultiLineText,
+    css::accessibility::XAccessibleTextAttributes,
+    css::accessibility::XAccessibleEventBroadcaster > ParagraphBase;
+
+// The Paragraph's number is the absolute position within the text engine (from
+// 0 to N - 1), whereas the Paragraph's index is the position within the text
+// view/accessible parent (from 0 to M - 1).  Paragraphs outside the currently
+// visible range have an index of -1.
+class Paragraph final:
+    private cppu::BaseMutex, public ParagraphBase, private ::comphelper::OCommonAccessibleText
+{
+public:
+    Paragraph(::rtl::Reference< Document > xDocument,
+                  Paragraphs::size_type nNumber);
+
+    // Not thread-safe.
+    Paragraphs::size_type getNumber() const { return m_nNumber; }
+
+    // Not thread-safe.
+    void numberChanged(bool bIncremented);
+
+    // Not thread-safe.
+    void textChanged();
+
+    // Thread-safe.
+    void notifyEvent(::sal_Int16 nEventId, css::uno::Any const & rOldValue,
+                     css::uno::Any const & rNewValue);
+
+private:
+    // OCommonAccessibleText
+    virtual void implGetParagraphBoundary( const OUString& rText,
+                                           css::i18n::Boundary& rBoundary,
+                                           ::sal_Int32 nIndex ) override;
+    virtual void implGetLineBoundary( const OUString& rText,
+                                      css::i18n::Boundary& rBoundary,
+                                      ::sal_Int32 nIndex ) override;
+
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext >
+    SAL_CALL getAccessibleContext() override;
+
+    virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override;
+
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild(::sal_Int32 i) override;
+
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleParent() override;
+
+    virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+
+    virtual ::sal_Int16 SAL_CALL getAccessibleRole() override;
+
+    virtual OUString SAL_CALL getAccessibleDescription() override;
+
+    virtual OUString SAL_CALL getAccessibleName() override;
+
+    virtual
+    css::uno::Reference< css::accessibility::XAccessibleRelationSet >
+    SAL_CALL getAccessibleRelationSet() override;
+
+    virtual
+    css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
+    getAccessibleStateSet() override;
+
+    virtual css::lang::Locale SAL_CALL getLocale() override;
+
+    virtual sal_Bool SAL_CALL containsPoint(css::awt::Point const & rPoint) override;
+
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint(css::awt::Point const & rPoint) override;
+
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
+
+    virtual css::awt::Point SAL_CALL getLocation() override;
+
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
+
+    virtual css::awt::Size SAL_CALL getSize() override;
+
+    virtual void SAL_CALL grabFocus() override;
+
+    virtual sal_Int32 SAL_CALL getForeground() override;
+
+    virtual sal_Int32 SAL_CALL getBackground() override;
+
+    virtual ::sal_Int32 SAL_CALL getCaretPosition() override;
+
+    virtual sal_Bool SAL_CALL setCaretPosition(::sal_Int32 nIndex) override;
+
+    virtual ::sal_Unicode SAL_CALL getCharacter(::sal_Int32 nIndex) override;
+
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
+    getCharacterAttributes(::sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+
+    virtual css::awt::Rectangle SAL_CALL
+    getCharacterBounds(::sal_Int32 nIndex) override;
+
+    virtual ::sal_Int32 SAL_CALL getCharacterCount() override;
+
+    virtual ::sal_Int32 SAL_CALL
+    getIndexAtPoint(css::awt::Point const & rPoint) override;
+
+    virtual OUString SAL_CALL getSelectedText() override;
+
+    virtual ::sal_Int32 SAL_CALL getSelectionStart() override;
+
+    virtual ::sal_Int32 SAL_CALL getSelectionEnd() override;
+
+    virtual sal_Bool SAL_CALL setSelection(::sal_Int32 nStartIndex,
+                                             ::sal_Int32 nEndIndex) override;
+
+    virtual sal_Bool SAL_CALL scrollSubstringTo( sal_Int32 nStartIndex, sal_Int32 nEndIndex, css::accessibility::AccessibleScrollType aScrollType) override;
+
+    virtual OUString SAL_CALL getText() override;
+
+    virtual OUString SAL_CALL getTextRange(::sal_Int32 nStartIndex,
+                                                  ::sal_Int32 nEndIndex) override;
+
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+
+    virtual sal_Bool SAL_CALL copyText(::sal_Int32 nStartIndex,
+                                         ::sal_Int32 nEndIndex) override;
+
+    virtual sal_Bool SAL_CALL cutText(::sal_Int32 nStartIndex,
+                                        ::sal_Int32 nEndIndex) override;
+
+    virtual sal_Bool SAL_CALL pasteText(::sal_Int32 nIndex) override;
+
+    virtual sal_Bool SAL_CALL deleteText(::sal_Int32 nStartIndex,
+                                           ::sal_Int32 nEndIndex) override;
+
+    virtual sal_Bool SAL_CALL insertText(OUString const & rText,
+                                           ::sal_Int32 nIndex) override;
+
+    virtual sal_Bool SAL_CALL replaceText(
+        ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex,
+        OUString const & rReplacement) override;
+
+    virtual sal_Bool SAL_CALL setAttributes(
+        ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex,
+        css::uno::Sequence< css::beans::PropertyValue > const &
+        rAttributeSet) override;
+
+    virtual sal_Bool SAL_CALL setText(OUString const & rText) override;
+
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
+    getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedAttributes) override;
+
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
+    getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes) override;
+
+    virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex ) override;
+
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtLineNumber( ::sal_Int32 nLineNo ) override;
+
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret(  ) override;
+
+    virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret(  ) override;
+
+    virtual void SAL_CALL addAccessibleEventListener(
+        css::uno::Reference<
+        css::accessibility::XAccessibleEventListener > const & rListener) override;
+
+    virtual void SAL_CALL removeAccessibleEventListener(
+        css::uno::Reference<
+        css::accessibility::XAccessibleEventListener > const & rListener) override;
+
+    virtual void SAL_CALL disposing() override;
+
+    virtual OUString implGetText() override;
+
+    virtual css::lang::Locale implGetLocale() override;
+
+    virtual void implGetSelection(::sal_Int32 & rStartIndex,
+                                  ::sal_Int32 & rEndIndex) override;
+
+    // Throws css::lang::DisposedException:
+    void checkDisposed();
+
+    ::rtl::Reference< Document > m_xDocument;
+    Paragraphs::size_type m_nNumber;
+
+    /// client id in the AccessibleEventNotifier queue
+    sal_uInt32 m_nClientId;
+
+    OUString m_aParagraphText;
+};
+
+
+typedef std::unordered_map< OUString,
+                         css::beans::PropertyValue > tPropValMap;
+
+class Document final : public ::VCLXAccessibleComponent, public ::SfxListener
+{
+public:
+    Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine,
+             ::TextView & rView);
+
+    const css::uno::Reference< css::accessibility::XAccessible >&
+    getAccessible() const { return m_xAccessible; }
+
+    // Must be called only after init has been called.
+    css::lang::Locale retrieveLocale();
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const *" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    ::sal_Int32 retrieveParagraphIndex(Paragraph const * pParagraph);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const *" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    ::sal_Int64 retrieveParagraphState(Paragraph const * pParagraph);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const &" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    css::awt::Rectangle
+    retrieveParagraphBounds(Paragraph const * pParagraph, bool bAbsolute);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const &" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    OUString retrieveParagraphText(Paragraph const * pParagraph);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const &" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    void retrieveParagraphSelection(Paragraph const * pParagraph,
+                                    ::sal_Int32 * pBegin, ::sal_Int32 * pEnd);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const *" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    ::sal_Int32 retrieveParagraphCaretPosition(Paragraph const * pParagraph);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const &" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    // Throws css::lang::IndexOutOfBoundsException.
+    css::awt::Rectangle
+    retrieveCharacterBounds(Paragraph const * pParagraph,
+                            ::sal_Int32 nIndex);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const &" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    ::sal_Int32 retrieveCharacterIndex(Paragraph const * pParagraph,
+                                       css::awt::Point const & rPoint);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const &" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    // Throws css::lang::IndexOutOfBoundsException.
+    css::uno::Sequence< css::beans::PropertyValue > retrieveCharacterAttributes(
+        Paragraph const * pParagraph, ::sal_Int32 nIndex,
+        const css::uno::Sequence< OUString >& aRequestedAttributes);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const &" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    // Throws css::lang::IndexOutOfBoundsException.
+    css::uno::Sequence< css::beans::PropertyValue > retrieveRunAttributes(
+        Paragraph const * pParagraph, ::sal_Int32 Index,
+        const css::uno::Sequence< OUString >& RequestedAttributes);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const &" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    void changeParagraphText(Paragraph const * pParagraph,
+                             OUString const & rText);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const &" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    // Throws css::lang::IndexOutOfBoundsException.
+    void changeParagraphText(Paragraph const * pParagraph, ::sal_Int32 nBegin,
+                             ::sal_Int32 nEnd, bool bCut, bool bPaste,
+                             OUString const & rText);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const &" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    // Throws css::lang::IndexOutOfBoundsException.
+    void copyParagraphText(Paragraph const * pParagraph,
+                           ::sal_Int32 nBegin, ::sal_Int32 nEnd);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const &" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    // Throws css::lang::IndexOutOfBoundsException.
+    void changeParagraphAttributes(
+        Paragraph const * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd,
+        css::uno::Sequence< css::beans::PropertyValue > const &
+        rAttributeSet);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "Paragraph const &" instead of a
+    // "::rtl::Reference< Paragraph > const &".
+    // Throws css::lang::IndexOutOfBoundsException.
+    void changeParagraphSelection(Paragraph const * pParagraph,
+                                  ::sal_Int32 nBegin, ::sal_Int32 nEnd);
+
+    css::i18n::Boundary
+    retrieveParagraphLineBoundary( Paragraph const * pParagraph,
+                                   ::sal_Int32 nIndex, ::sal_Int32 *pLineNo);
+
+    css::i18n::Boundary
+    retrieveParagraphBoundaryOfLine( Paragraph const * pParagraph,
+                                     ::sal_Int32 nIndex );
+
+    sal_Int32 retrieveParagraphLineWithCursor( Paragraph const * pParagraph );
+
+    css::uno::Reference< css::accessibility::XAccessibleRelationSet >
+    retrieveParagraphRelationSet( Paragraph const * pParagraph );
+
+private:
+    virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override;
+
+    virtual css::uno::Reference< css::accessibility::XAccessible >
+    SAL_CALL getAccessibleChild(::sal_Int32 i) override;
+
+    virtual ::sal_Int16 SAL_CALL getAccessibleRole() override;
+
+    virtual css::uno::Reference< css::accessibility::XAccessible >
+    SAL_CALL getAccessibleAtPoint(css::awt::Point const & rPoint) override;
+
+    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+    virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override;
+
+    // ??? Will be called with both the external (Solar) and internal mutex
+    // locked:
+    virtual void SAL_CALL disposing() override;
+
+    // ??? Will be called with the external (Solar) mutex locked.
+    // init will already have been called.
+    virtual void Notify(::SfxBroadcaster & rBC, ::SfxHint const & rHint) override;
+
+    // Assuming that this will only be called with the external (Solar) mutex
+    // locked.
+    // init will already have been called.
+    DECL_LINK(WindowEventHandler, VclWindowEvent&, void);
+
+    // Must be called with both the external (Solar) and internal mutex
+    // locked.
+    void init();
+
+    // Must be called with both the external (Solar) and internal mutex
+    // locked, and after init has been called:
+    static ::rtl::Reference< Paragraph >
+    getParagraph(Paragraphs::iterator const & rIt);
+
+    // Must be called with both the external (Solar) and internal mutex
+    // locked, and after init has been called.
+    // Throws css::uno::RuntimeException.
+    css::uno::Reference< css::accessibility::XAccessible >
+    getAccessibleChild(Paragraphs::iterator const & rIt);
+
+    // Must be called with both the external (Solar) and internal mutex
+    // locked, and after init has been called:
+    void determineVisibleRange();
+
+    // Must be called with both the external (Solar) and internal mutex
+    // locked, and after init has been called:
+    void notifyVisibleRangeChanges(
+        Paragraphs::iterator const & rOldVisibleBegin,
+        Paragraphs::iterator const & rOldVisibleEnd,
+        Paragraphs::iterator const & rInserted);
+
+    // Must be called with both the external (Solar) and internal mutex
+    // locked, and after init has been called:
+    void changeParagraphText(::sal_uInt32 nNumber, ::sal_uInt16 nBegin, ::sal_uInt16 nEnd,
+                             bool bCut, bool bPaste,
+                             OUString const & rText);
+
+    void
+    handleParagraphNotifications();
+
+    void handleSelectionChangeNotification();
+
+    void sendEvent(::sal_Int32 start, ::sal_Int32 end, ::sal_Int16 nEventId);
+
+    void disposeParagraphs();
+
+    static css::uno::Any mapFontColor(::Color const & rColor);
+
+    static ::Color mapFontColor(css::uno::Any const & rColor);
+
+    static css::uno::Any mapFontWeight(::FontWeight nWeight);
+
+    static ::FontWeight mapFontWeight(css::uno::Any const & rWeight);
+
+    void retrieveRunAttributesImpl(
+        Paragraph const * pParagraph, ::sal_Int32 Index,
+        const css::uno::Sequence< OUString >& RequestedAttributes,
+        tPropValMap& rRunAttrSeq);
+
+    css::uno::Reference< css::accessibility::XAccessible > m_xAccessible;
+    ::TextEngine & m_rEngine;
+    ::TextView & m_rView;
+
+    SfxListenerGuard m_aEngineListener;
+    WindowListenerGuard m_aViewListener;
+
+    // All the following members have valid values only after calling init:
+
+    std::unique_ptr< Paragraphs > m_xParagraphs;
+
+    // m_nViewOffset is from the start of the document (0) to the start of the
+    // current view, and m_nViewHeight is the height of the view:
+    ::sal_Int32 m_nViewOffset;
+    ::sal_Int32 m_nViewHeight;
+
+    // m_aVisibleBegin points to the first Paragraph that is (partially)
+    // contained in the view, and m_aVisibleEnd points past the last Paragraph
+    // that is (partially) contained.  If no Paragraphs are (partially) in the
+    // view, both m_aVisibleBegin and m_aVisibleEnd are set to
+    // m_xParagraphs->end().  These values are only changed by
+    // determineVisibleRange.
+    Paragraphs::iterator m_aVisibleBegin;
+    Paragraphs::iterator m_aVisibleEnd;
+
+    // m_nVisibleBeginOffset is from m_nViewOffset back to the start of the
+    // Paragraph pointed to by m_aVisibleBegin (and always has a non-negative
+    // value).  If m_aVisibleBegin == m_xParagraphs->end(),
+    // m_nVisibleBeginOffset is set to 0.  These values are only changed by
+    // determineVisibleRange.
+    ::sal_Int32 m_nVisibleBeginOffset;
+
+    // If no selection has yet been set, all the following four variables are
+    // set to -1.  m_nSelectionLastPara/Pos is also the cursor position.
+    ::sal_Int32 m_nSelectionFirstPara;
+    ::sal_Int32 m_nSelectionFirstPos;
+    ::sal_Int32 m_nSelectionLastPara;
+    ::sal_Int32 m_nSelectionLastPos;
+
+    Paragraphs::iterator m_aFocused;
+
+    std::queue< ::TextHint > m_aParagraphNotifications;
+    bool m_bSelectionChangedNotification;
+};
+
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */