weld SwCondCollPage

and put back original SvTreeListBox a11y factory use

Change-Id: I4ad8ce29d8fed6ec5d44e9a1d641919a89226b79
Reviewed-on: https://gerrit.libreoffice.org/63501
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

21 files changed, 241 insertions, 76 deletions

diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx
index 2f6c60f64f57..c0abfc8989c2 100644
--- a/accessibility/inc/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -24,7 +24,7 @@
 #include <extended/AccessibleBrowseBoxBase.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <svtools/accessibletableprovider.hxx>
+#include <vcl/accessibletableprovider.hxx>
 #include <memory>
 
 namespace accessibility {
@@ -42,7 +42,7 @@ protected:
     AccessibleBrowseBox(
         const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
         const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator,
-        ::svt::IAccessibleTableProvider& _rBrowseBox
+        ::vcl::IAccessibleTableProvider& _rBrowseBox
     );
 
     virtual ~AccessibleBrowseBox() override;
@@ -122,7 +122,7 @@ public:
     */
     css::uno::Reference<
         css::accessibility::XAccessible >
-        getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType )
+        getHeaderBar( ::vcl::AccessibleBrowseBoxObjType _eObjType )
         {
             return implGetHeaderBar(_eObjType);
         }
@@ -159,7 +159,7 @@ protected:
         @return  The XAccessible interface of the header bar. */
     css::uno::Reference<
         css::accessibility::XAccessible >
-        implGetHeaderBar( ::svt::AccessibleBrowseBoxObjType eObjType );
+        implGetHeaderBar( ::vcl::AccessibleBrowseBoxObjType eObjType );
 
     /** This method returns one of the children that are always present:
         Data table, row and column header bar or corner control.
@@ -195,20 +195,20 @@ private:
 */
 class AccessibleBrowseBoxAccess:
     public cppu::WeakImplHelper<css::accessibility::XAccessible>,
-    public ::svt::IAccessibleBrowseBox
+    public ::vcl::IAccessibleBrowseBox
 {
 private:
     ::osl::Mutex                        m_aMutex;
     css::uno::Reference< css::accessibility::XAccessible >
                                         m_xParent;
-    ::svt::IAccessibleTableProvider&    m_rBrowseBox;
+    ::vcl::IAccessibleTableProvider&    m_rBrowseBox;
 
     rtl::Reference<AccessibleBrowseBox> m_xContext;
 
 public:
     AccessibleBrowseBoxAccess(
         const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
-        ::svt::IAccessibleTableProvider& _rBrowseBox
+        ::vcl::IAccessibleTableProvider& _rBrowseBox
     );
 
     /// returns the AccessibleContext belonging to this Accessible
@@ -233,7 +233,7 @@ protected:
         return m_xContext.is() && m_xContext->isAlive();
     }
     virtual css::uno::Reference< css::accessibility::XAccessible >
-        getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) override
+        getHeaderBar( ::vcl::AccessibleBrowseBoxObjType _eObjType ) override
     {
         css::uno::Reference< css::accessibility::XAccessible > xAccessible;
         AccessibleBrowseBox* pContext( getContext() );
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index 64c9636e9be5..99fb010e5f82 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -23,7 +23,7 @@
 
 #include <sal/config.h>
 
-#include <svtools/AccessibleBrowseBoxObjType.hxx>
+#include <vcl/AccessibleBrowseBoxObjType.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
 #include <vcl/svapp.hxx>
@@ -52,7 +52,7 @@ namespace utl {
     class AccessibleStateSetHelper;
 }
 
-namespace svt {
+namespace vcl {
     class IAccessibleTableProvider;
 }
 
@@ -86,9 +86,9 @@ public:
         @param eObjType         Object type */
     AccessibleBrowseBoxBase(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
-        ::svt::IAccessibleTableProvider& rBrowseBox,
+        ::vcl::IAccessibleTableProvider& rBrowseBox,
         const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-        ::svt::AccessibleBrowseBoxObjType eObjType );
+        ::vcl::AccessibleBrowseBoxObjType eObjType );
 
     /** Constructor sets specified name and description.
         @param rxParent         XAccessible interface of the parent object.
@@ -99,9 +99,9 @@ public:
         @param rDescription     The description text of this object. */
     AccessibleBrowseBoxBase(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
-        ::svt::IAccessibleTableProvider& rBrowseBox,
+        ::vcl::IAccessibleTableProvider& rBrowseBox,
         const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-        ::svt::AccessibleBrowseBoxObjType eObjType,
+        ::vcl::AccessibleBrowseBoxObjType eObjType,
         const OUString& rName,
         const OUString& rDescription );
 
@@ -219,7 +219,7 @@ public:
     // helper methods
 
     /** @return  The BrowseBox object type. */
-    inline ::svt::AccessibleBrowseBoxObjType getType() const;
+    inline ::vcl::AccessibleBrowseBoxObjType getType() const;
 
     /** Changes the name of the object and notifies listeners. */
     void setAccessibleName( const OUString& rName );
@@ -297,7 +297,7 @@ protected:
     /** The parent accessible object. */
     css::uno::Reference< css::accessibility::XAccessible > mxParent;
     /** The VCL BrowseBox control. */
-    ::svt::IAccessibleTableProvider* mpBrowseBox;
+    ::vcl::IAccessibleTableProvider* mpBrowseBox;
 
     /** This is the window which get all the nice focus events
     */
@@ -310,7 +310,7 @@ private:
     OUString maDescription;
 
     /** The type of this object (for names, descriptions, state sets, ...). */
-    ::svt::AccessibleBrowseBoxObjType meObjType;
+    ::vcl::AccessibleBrowseBoxObjType meObjType;
 
     ::comphelper::AccessibleEventNotifier::TClientId    m_aClientId;
 };
@@ -340,9 +340,9 @@ protected:
     */
     BrowseBoxAccessibleElement(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
-        ::svt::IAccessibleTableProvider& rBrowseBox,
+        ::vcl::IAccessibleTableProvider& rBrowseBox,
         const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-        ::svt::AccessibleBrowseBoxObjType eObjType );
+        ::vcl::AccessibleBrowseBoxObjType eObjType );
 
     /** Constructor sets specified name and description.
 
@@ -355,9 +355,9 @@ protected:
     */
     BrowseBoxAccessibleElement(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
-        ::svt::IAccessibleTableProvider& rBrowseBox,
+        ::vcl::IAccessibleTableProvider& rBrowseBox,
         const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-        ::svt::AccessibleBrowseBoxObjType eObjType,
+        ::vcl::AccessibleBrowseBoxObjType eObjType,
         const OUString& rName,
         const OUString& rDescription );
 
@@ -395,7 +395,7 @@ public:
 
 // inlines
 
-inline ::svt::AccessibleBrowseBoxObjType AccessibleBrowseBoxBase::getType() const
+inline ::vcl::AccessibleBrowseBoxObjType AccessibleBrowseBoxBase::getType() const
 {
     return meObjType;
 }
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index 0a579376649b..d0edc3af1057 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -47,7 +47,7 @@ namespace accessibility
 
     public:
         AccessibleCheckBoxCell(const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
-                                ::svt::IAccessibleTableProvider& _rBrowseBox,
+                                ::vcl::IAccessibleTableProvider& _rBrowseBox,
                                 const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
                                 sal_Int32 _nRowPos,
                                 sal_uInt16 _nColPos,
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
index 72358475d880..eef541c0caaf 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
@@ -47,8 +47,8 @@ public:
                          BBTYPE_COLUMNHEADERBAR. */
     AccessibleBrowseBoxHeaderBar(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
-        ::svt::IAccessibleTableProvider& rBrowseBox,
-        ::svt::AccessibleBrowseBoxObjType eObjType );
+        ::vcl::IAccessibleTableProvider& rBrowseBox,
+        ::vcl::AccessibleBrowseBoxObjType eObjType );
 
 private:
     virtual ~AccessibleBrowseBoxHeaderBar() override;
@@ -204,12 +204,12 @@ private:
 
 inline bool AccessibleBrowseBoxHeaderBar::isRowBar() const
 {
-    return getType() == ::svt::BBTYPE_ROWHEADERBAR;
+    return getType() == ::vcl::BBTYPE_ROWHEADERBAR;
 }
 
 inline bool AccessibleBrowseBoxHeaderBar::isColumnBar() const
 {
-    return getType() == ::svt::BBTYPE_COLUMNHEADERBAR;
+    return getType() == ::vcl::BBTYPE_COLUMNHEADERBAR;
 }
 
 
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
index e1aae2311957..a0f2c140d16d 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
@@ -29,9 +29,9 @@ namespace accessibility
     public:
         AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnRowId,
                                           const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
-                                          ::svt::IAccessibleTableProvider&                  _rBrowseBox,
+                                          ::vcl::IAccessibleTableProvider&                  _rBrowseBox,
                                           const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-                                          ::svt::AccessibleBrowseBoxObjType  _eObjType);
+                                          ::vcl::AccessibleBrowseBoxObjType  _eObjType);
         /** @return  The count of visible children. */
         virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
@@ -47,7 +47,7 @@ namespace accessibility
 
         bool isRowBarCell() const
         {
-            return getType() == ::svt::BBTYPE_ROWHEADERCELL;
+            return getType() == ::vcl::BBTYPE_ROWHEADERCELL;
         }
 
         /** @return
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
index adc877bc27e8..04e26a28618b 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
@@ -35,7 +35,7 @@ class AccessibleBrowseBoxTable : public AccessibleBrowseBoxTableBase
 public:
     AccessibleBrowseBoxTable(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
-        ::svt::IAccessibleTableProvider& rBrowseBox );
+        ::vcl::IAccessibleTableProvider& rBrowseBox );
 
 protected:
     virtual ~AccessibleBrowseBoxTable() override;
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
index ac98a503b9c0..b74e95969f49 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
@@ -50,8 +50,8 @@ public:
         @param eObjType         Type of BrowseBox object. */
     AccessibleBrowseBoxTableBase(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
-        ::svt::IAccessibleTableProvider& rBrowseBox,
-        ::svt::AccessibleBrowseBoxObjType eObjType );
+        ::vcl::IAccessibleTableProvider& rBrowseBox,
+        ::vcl::AccessibleBrowseBoxObjType eObjType );
 
 protected:
     virtual ~AccessibleBrowseBoxTableBase() override = default;
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
index 63229c19b3ce..40acc768917c 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
@@ -45,7 +45,7 @@ namespace accessibility
 
     public:
         AccessibleBrowseBoxTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
-                                    ::svt::IAccessibleTableProvider& _rBrowseBox,
+                                    ::vcl::IAccessibleTableProvider& _rBrowseBox,
                                     const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
                                     sal_Int32 _nRowId,
                                     sal_uInt16 _nColId,
diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx
index 3968c3e07e33..4d09a3b9d2af 100644
--- a/accessibility/inc/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/extended/AccessibleGridControl.hxx
@@ -24,7 +24,7 @@
 #include <extended/AccessibleGridControlTable.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <svtools/accessibletable.hxx>
+#include <vcl/accessibletable.hxx>
 #include <memory>
 
 namespace accessibility {
@@ -40,7 +40,7 @@ class AccessibleGridControl final : public AccessibleGridControlBase
     AccessibleGridControl(
         const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
         const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator,
-    ::svt::table::IAccessibleTable& _rTable
+    ::vcl::table::IAccessibleTable& _rTable
     );
 
     virtual ~AccessibleGridControl() override = default;
@@ -125,7 +125,7 @@ private:
         @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( ::svt::table::AccessibleTableControlObjType eObjType );
+        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.
@@ -163,17 +163,17 @@ private:
 
 class AccessibleGridControlAccess :
      public ::cppu::WeakImplHelper< css::accessibility::XAccessible >
-    ,public ::svt::table::IAccessibleTableControl
+    ,public ::vcl::table::IAccessibleTableControl
 {
 private:
     css::uno::Reference< css::accessibility::XAccessible > m_xParent;
-    ::svt::table::IAccessibleTable *                       m_pTable;
+    ::vcl::table::IAccessibleTable *                       m_pTable;
     rtl::Reference<AccessibleGridControl>                  m_xContext;
 
 public:
     AccessibleGridControlAccess(
         const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
-        ::svt::table::IAccessibleTable& _rTable
+        ::vcl::table::IAccessibleTable& _rTable
     );
 
     /// returns the AccessibleContext belonging to this Accessible
diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx
index 2c9cbd42fae1..4e4f86ebba1f 100644
--- a/accessibility/inc/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLBASE_HXX
 #define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLBASE_HXX
 
-#include <svtools/accessibletable.hxx>
+#include <vcl/accessibletable.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
 #include <vcl/svapp.hxx>
@@ -73,8 +73,8 @@ public:
         @param eObjType  Type of accessible table control. */
     AccessibleGridControlBase(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
-        ::svt::table::IAccessibleTable& rTable,
-        ::svt::table::AccessibleTableControlObjType  eObjType );
+        ::vcl::table::IAccessibleTable& rTable,
+        ::vcl::table::AccessibleTableControlObjType  eObjType );
 
 protected:
     virtual ~AccessibleGridControlBase() override;
@@ -191,7 +191,7 @@ public:
     // helper methods
 
     /** @return  The GridControl object type. */
-    inline ::svt::table::AccessibleTableControlObjType getType() const;
+    inline ::vcl::table::AccessibleTableControlObjType getType() const;
 
     /** Commits an event to all listeners. */
     void commitEvent(
@@ -258,9 +258,9 @@ protected:
     /** The parent accessible object. */
     css::uno::Reference< css::accessibility::XAccessible > m_xParent;
     /** The SVT Table control. */
-    ::svt::table::IAccessibleTable& m_aTable;
+    ::vcl::table::IAccessibleTable& m_aTable;
     /** The type of this object (for names, descriptions, state sets, ...). */
-    ::svt::table::AccessibleTableControlObjType m_eObjType;
+    ::vcl::table::AccessibleTableControlObjType m_eObjType;
 
 private:
     /** Localized name. */
@@ -290,8 +290,8 @@ protected:
     */
     GridControlAccessibleElement(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
-        ::svt::table::IAccessibleTable& rTable,
-        ::svt::table::AccessibleTableControlObjType  eObjType );
+        ::vcl::table::IAccessibleTable& rTable,
+        ::vcl::table::AccessibleTableControlObjType  eObjType );
 
 public:
     // XInterface
@@ -316,7 +316,7 @@ private:
 
 // inlines
 
-inline ::svt::table::AccessibleTableControlObjType AccessibleGridControlBase::getType() const
+inline ::vcl::table::AccessibleTableControlObjType AccessibleGridControlBase::getType() const
 {
     return m_eObjType;
 }
diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
index b0046627b528..b487b00820c6 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
@@ -40,8 +40,8 @@ public:
     AccessibleGridControlHeader(
         const css::uno::Reference<
             css::accessibility::XAccessible >& rxParent,
-            ::svt::table::IAccessibleTable& rTable,
-            ::svt::table::AccessibleTableControlObjType  eObjType );
+            ::vcl::table::IAccessibleTable& rTable,
+            ::vcl::table::AccessibleTableControlObjType  eObjType );
 
 private:
     virtual ~AccessibleGridControlHeader() override = default;
@@ -141,12 +141,12 @@ private:
 
 inline bool AccessibleGridControlHeader::isRowBar() const
 {
-    return getType() == ::svt::table::TCTYPE_ROWHEADERBAR;
+    return getType() == ::vcl::table::TCTYPE_ROWHEADERBAR;
 }
 
 inline bool AccessibleGridControlHeader::isColumnBar() const
 {
-    return getType() == ::svt::table::TCTYPE_COLUMNHEADERBAR;
+    return getType() == ::vcl::table::TCTYPE_COLUMNHEADERBAR;
 }
 
 
diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
index 00076df2a484..a47c04770055 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
@@ -29,8 +29,8 @@ namespace accessibility
     public:
         AccessibleGridControlHeaderCell(sal_Int32 _nColumnRowId,
                         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
-                        ::svt::table::IAccessibleTable& _rTable,
-                        ::svt::table::AccessibleTableControlObjType  _eObjType);
+                        ::vcl::table::IAccessibleTable& _rTable,
+                        ::vcl::table::AccessibleTableControlObjType  _eObjType);
         /** @return  The count of visible children. */
         virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx
index 18627c22e021..0a20021bc1ac 100644
--- a/accessibility/inc/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx
@@ -40,7 +40,7 @@ class AccessibleGridControlTable final : public AccessibleGridControlTableBase,
 public:
     AccessibleGridControlTable(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
-            ::svt::table::IAccessibleTable& rTable);
+            ::vcl::table::IAccessibleTable& rTable);
 
 private:
     virtual ~AccessibleGridControlTable() override = default;
diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
index 8df02ca1c88e..4928573ef894 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
@@ -46,8 +46,8 @@ public:
         @param eObjType  Type of table control object */
     AccessibleGridControlTableBase(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
-        ::svt::table::IAccessibleTable& rTable,
-        ::svt::table::AccessibleTableControlObjType  eObjType );
+        ::vcl::table::IAccessibleTable& rTable,
+        ::vcl::table::AccessibleTableControlObjType  eObjType );
 
 protected:
     virtual ~AccessibleGridControlTableBase() override = default;
diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
index 6af2e021e5c0..dfbd4a49228b 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
@@ -22,7 +22,7 @@
 #include <comphelper/accessibletexthelper.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <extended/AccessibleGridControlBase.hxx>
-#include <svtools/accessibletable.hxx>
+#include <vcl/accessibletable.hxx>
 
 namespace accessibility
 {
@@ -43,10 +43,10 @@ namespace accessibility
     protected:
         AccessibleGridControlCell(
             const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
-            ::svt::table::IAccessibleTable& _rTable,
+            ::vcl::table::IAccessibleTable& _rTable,
             sal_Int32 _nRowPos,
             sal_uInt16 _nColPos,
-            ::svt::table::AccessibleTableControlObjType _eType
+            ::vcl::table::AccessibleTableControlObjType _eType
         );
 
         virtual ~AccessibleGridControlCell() override = default;
@@ -74,7 +74,7 @@ namespace accessibility
 
     public:
         AccessibleGridControlTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
-                                    ::svt::table::IAccessibleTable& _rTable,
+                                    ::vcl::table::IAccessibleTable& _rTable,
                                     sal_Int32 _nRowId,
                                     sal_uInt16 _nColId);
 
diff --git a/accessibility/inc/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
index be139a494b16..0f4e291c7657 100644
--- a/accessibility/inc/extended/accessiblebrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
@@ -21,8 +21,7 @@
 #define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX
 
 #include <extended/AccessibleBrowseBoxBase.hxx>
-#include <svtools/AccessibleBrowseBoxObjType.hxx>
-
+#include <vcl/AccessibleBrowseBoxObjType.hxx>
 
 namespace accessibility
 {
@@ -54,11 +53,11 @@ namespace accessibility
     protected:
         AccessibleBrowseBoxCell(
             const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
-            ::svt::IAccessibleTableProvider& _rBrowseBox,
+            ::vcl::IAccessibleTableProvider& _rBrowseBox,
             const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
             sal_Int32 _nRowPos,
             sal_uInt16 _nColPos,
-            ::svt::AccessibleBrowseBoxObjType _eType = ::svt::BBTYPE_TABLECELL
+            ::vcl::AccessibleBrowseBoxObjType _eType = ::vcl::BBTYPE_TABLECELL
         );
 
         virtual ~AccessibleBrowseBoxCell() override;
diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
index 3713c6d162a7..5c4025de4e87 100644
--- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
@@ -41,7 +41,7 @@ namespace accessibility
             const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
             const css::uno::Reference< css::accessibility::XAccessible >& _rxOwningAccessible,
             const css::uno::Reference< css::accessibility::XAccessibleContext >& _xControlChild,
-            ::svt::IAccessibleTableProvider& _rBrowseBox,
+            ::vcl::IAccessibleTableProvider& _rBrowseBox,
             const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
             sal_Int32 _nRowPos,
             sal_uInt16 _nColPos
@@ -107,7 +107,7 @@ namespace accessibility
                                             m_xControlAccessible;
         css::uno::Reference< css::awt::XWindow >
                                             m_xFocusWindow;
-        ::svt::IAccessibleTableProvider*    m_pBrowseBox;
+        ::vcl::IAccessibleTableProvider*    m_pBrowseBox;
         sal_Int32                           m_nRowPos;
         sal_uInt16                          m_nColPos;
 
@@ -116,7 +116,7 @@ namespace accessibility
             const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
             const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible,
             const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow,
-            ::svt::IAccessibleTableProvider& _rBrowseBox,
+            ::vcl::IAccessibleTableProvider& _rBrowseBox,
             sal_Int32 _nRowPos,
             sal_uInt16 _nColPos
         );
diff --git a/accessibility/inc/extended/accessibletablistbox.hxx b/accessibility/inc/extended/accessibletablistbox.hxx
index 1c56d867bd33..10777aad97a8 100644
--- a/accessibility/inc/extended/accessibletablistbox.hxx
+++ b/accessibility/inc/extended/accessibletablistbox.hxx
@@ -23,7 +23,7 @@
 #include <extended/AccessibleBrowseBox.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <svtools/accessibletableprovider.hxx>
+#include <vcl/accessibletableprovider.hxx>
 
 class SvHeaderTabListBox;
 
@@ -39,7 +39,7 @@ typedef ::cppu::ImplHelper1  <   css::accessibility::XAccessible
 class AccessibleTabListBox final
                 :public AccessibleBrowseBox
                 ,public AccessibleTabListBox_Base
-                ,public ::svt::IAccessibleTabListBox
+                ,public ::vcl::IAccessibleTabListBox
 {
 private:
     VclPtr<SvHeaderTabListBox>        m_pTabListBox;
@@ -79,7 +79,7 @@ public:
     css::uno::Reference< css::accessibility::XAccessible >
         getHeaderBar() override
     {
-        return AccessibleBrowseBox::getHeaderBar( svt::BBTYPE_COLUMNHEADERBAR );
+        return AccessibleBrowseBox::getHeaderBar( vcl::BBTYPE_COLUMNHEADERBAR );
     }
 
 private:
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx
index 064002780e2a..bfcd9876a129 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -337,10 +337,6 @@
 #include <svl/SfxBroadcaster.hxx>
 #include <svl/hint.hxx>
 #include <svl/svldllapi.h>
-#include <svtools/AccessibleBrowseBoxObjType.hxx>
-#include <svtools/accessibletable.hxx>
-#include <svtools/accessibletableprovider.hxx>
-#include <svtools/headbar.hxx>
 #include <svtools/svtdllapi.h>
 #include <svtools/tabbar.hxx>
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
@@ -380,6 +376,10 @@
 #include <unotools/resmgr.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/unotoolsdllapi.h>
+#include <vcl/AccessibleBrowseBoxObjType.hxx>
+#include <vcl/accessibletable.hxx>
+#include <vcl/accessibletableprovider.hxx>
+#include <vcl/headbar.hxx>
 #include <vcl/transfer.hxx>
 #include <vcl/treelist.hxx>
 #include <vcl/treelistbox.hxx>
diff --git a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx
new file mode 100644
index 000000000000..9a6c74a6177c
--- /dev/null
+++ b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx
@@ -0,0 +1,60 @@
+/* -*- 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 .
+ */
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBAR_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBAR_HXX
+
+#include <vcl/headbar.hxx>
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+#include <toolkit/awt/vclxwindow.hxx>
+
+//  class VCLXAccessibleHeaderBar
+
+typedef std::vector< css::uno::WeakReference< css::accessibility::XAccessible > >
+    ListItems;
+
+class VCLXAccessibleHeaderBar : public VCLXAccessibleComponent
+{
+
+public:
+    VclPtr<HeaderBar>  m_pHeadBar;
+    virtual ~VCLXAccessibleHeaderBar() override;
+
+    VCLXAccessibleHeaderBar( VCLXWindow* pVCLXindow );
+
+    // XAccessibleContext
+    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;
+
+
+    // XServiceInfo
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+public:
+    virtual void SAL_CALL disposing() override;
+    css::uno::Reference< css::accessibility::XAccessible > CreateChild(sal_Int32 i);
+
+private:
+    ListItems m_aAccessibleChildren;
+};
+
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBAR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
new file mode 100644
index 000000000000..aa22e6259628
--- /dev/null
+++ b/accessibility/inc/standard/vclxaccessibleheaderbaritem.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 .
+ */
+#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBARITEM_HXX
+#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBARITEM_HXX
+
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <comphelper/accessiblecomponenthelper.hxx>
+#include <cppuhelper/implbase2.hxx>
+
+#include <tools/link.hxx>
+
+#include <vcl/vclptr.hxx>
+
+#include <vector>
+
+class HeaderBar;
+class VclSimpleEvent;
+class VclWindowEvent;
+
+namespace utl {
+class AccessibleStateSetHelper;
+}
+
+
+//    ----------------------------------------------------
+//    class VCLXAccessibleHeaderBarItem
+//    ----------------------------------------------------
+
+typedef ::cppu::ImplHelper2<
+    css::accessibility::XAccessible,
+    css::lang::XServiceInfo > VCLXAccessibleHeaderBarItem_BASE;
+
+class VCLXAccessibleHeaderBarItem final : public comphelper::OAccessibleExtendedComponentHelper,
+                                    public VCLXAccessibleHeaderBarItem_BASE
+{
+private:
+    VclPtr<HeaderBar>        m_pHeadBar;
+    sal_Int32 const          m_nIndexInParent;
+
+    void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+    // OCommonAccessibleComponent
+    virtual css::awt::Rectangle implGetBounds(  ) override;
+
+public:
+    VCLXAccessibleHeaderBarItem( HeaderBar*    pHeadBar, sal_Int32 _nIndexInParent );
+    virtual ~VCLXAccessibleHeaderBarItem() override;
+
+    // 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;
+};
+
+#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBARITEM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */