a11y: Move AccessibleTableControlObjType to toolkit-only header

It's only used in the toolkit module by now, so there's no
more need to have it in a global header.

Change-Id: Iba820035752e5f4ed5a0e6f99f6c792447d4209b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180798
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>

19 files changed, 62 insertions, 113 deletions

diff --git a/include/vcl/accessibletable.hxx b/include/vcl/accessibletable.hxx
deleted file mode 100644
index 7f2d2954c885..000000000000
--- a/include/vcl/accessibletable.hxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- 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_VCL_ACCESSIBLETABLE_HXX
-#define INCLUDED_VCL_ACCESSIBLETABLE_HXX
-
-namespace vcl::table
-{
-
-enum class AccessibleTableControlObjType
-{
-    GRIDCONTROL,         /// The GridControl itself.
-    TABLE,               /// The data table.
-    ROWHEADERBAR,        /// The row header bar.
-    COLUMNHEADERBAR,     /// The horizontal column header bar.
-    TABLECELL,           /// A cell of the data table.
-    ROWHEADERCELL,       /// A cell of the row header bar.
-    COLUMNHEADERCELL,    /// A cell of the column header bar.
-};
-
-} // namespace vcl::table
-
-#endif // INCLUDED_VCL_ACCESSIBLETABLE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 9dc0d1a2936d..b327cdbcb79c 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6124,7 +6124,6 @@ include/vcl/Scanline.hxx
 include/vcl/abstdlg.hxx
 include/vcl/accessibility/vclxaccessiblecomponent.hxx
 include/vcl/accessiblefactory.hxx
-include/vcl/accessibletable.hxx
 include/vcl/accessibletableprovider.hxx
 include/vcl/alpha.hxx
 include/vcl/bitmap.hxx
diff --git a/toolkit/inc/controls/table/AccessibleGridControl.hxx b/toolkit/inc/controls/table/AccessibleGridControl.hxx
index ffeacebe43f4..23d3bebf4bb6 100644
--- a/toolkit/inc/controls/table/AccessibleGridControl.hxx
+++ b/toolkit/inc/controls/table/AccessibleGridControl.hxx
@@ -121,7 +121,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( ::vcl::table::AccessibleTableControlObjType eObjType );
+        implGetHeaderBar(AccessibleTableControlObjType eObjType);
 
     /** This method returns one of the children that are always present:
         Data table, row and column header bar or corner control.
diff --git a/toolkit/inc/controls/table/AccessibleGridControlBase.hxx b/toolkit/inc/controls/table/AccessibleGridControlBase.hxx
index 22e6f4500006..0b3532ec3dda 100644
--- a/toolkit/inc/controls/table/AccessibleGridControlBase.hxx
+++ b/toolkit/inc/controls/table/AccessibleGridControlBase.hxx
@@ -57,7 +57,7 @@ public:
     AccessibleGridControlBase(
         css::uno::Reference< css::accessibility::XAccessible > xParent,
         svt::table::TableControl& rTable,
-        ::vcl::table::AccessibleTableControlObjType  eObjType );
+        AccessibleTableControlObjType eObjType);
 
 protected:
     virtual ~AccessibleGridControlBase() = default;
@@ -139,7 +139,7 @@ public:
     // helper methods
 
     /** @return  The GridControl object type. */
-    inline ::vcl::table::AccessibleTableControlObjType getType() const;
+    inline AccessibleTableControlObjType getType() const;
 
     /** Commits an event to all listeners. */
     virtual void commitEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue,
@@ -183,7 +183,7 @@ protected:
     /** The SVT Table control. */
     svt::table::TableControl& m_aTable;
     /** The type of this object (for names, descriptions, state sets, ...). */
-    ::vcl::table::AccessibleTableControlObjType m_eObjType;
+    AccessibleTableControlObjType m_eObjType;
 };
 
 
@@ -205,7 +205,7 @@ protected:
     GridControlAccessibleElement(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
         svt::table::TableControl& rTable,
-        ::vcl::table::AccessibleTableControlObjType  eObjType );
+        AccessibleTableControlObjType  eObjType );
 
 protected:
     virtual ~GridControlAccessibleElement() override;
@@ -224,7 +224,7 @@ private:
 
 // inlines
 
-inline ::vcl::table::AccessibleTableControlObjType AccessibleGridControlBase::getType() const
+inline AccessibleTableControlObjType AccessibleGridControlBase::getType() const
 {
     return m_eObjType;
 }
diff --git a/toolkit/inc/controls/table/AccessibleGridControlHeader.hxx b/toolkit/inc/controls/table/AccessibleGridControlHeader.hxx
index 6f0dd179a015..f4fa9c20fe37 100644
--- a/toolkit/inc/controls/table/AccessibleGridControlHeader.hxx
+++ b/toolkit/inc/controls/table/AccessibleGridControlHeader.hxx
@@ -40,7 +40,7 @@ public:
         const css::uno::Reference<
             css::accessibility::XAccessible >& rxParent,
             svt::table::TableControl& rTable,
-            ::vcl::table::AccessibleTableControlObjType  eObjType );
+            AccessibleTableControlObjType eObjType);
 
 private:
     virtual ~AccessibleGridControlHeader() override = default;
@@ -137,12 +137,12 @@ private:
 
 inline bool AccessibleGridControlHeader::isRowBar() const
 {
-    return getType() == ::vcl::table::AccessibleTableControlObjType::ROWHEADERBAR;
+    return getType() == AccessibleTableControlObjType::ROWHEADERBAR;
 }
 
 inline bool AccessibleGridControlHeader::isColumnBar() const
 {
-    return getType() == ::vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR;
+    return getType() == AccessibleTableControlObjType::COLUMNHEADERBAR;
 }
 
 
diff --git a/toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx b/toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx
index f6387f0bde9f..b7b406f19c68 100644
--- a/toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx
+++ b/toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx
@@ -31,7 +31,7 @@ namespace accessibility
         AccessibleGridControlHeaderCell(sal_Int32 _nColumnRowId,
                         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
                         svt::table::TableControl& _rTable,
-                        ::vcl::table::AccessibleTableControlObjType  _eObjType);
+                        AccessibleTableControlObjType  _eObjType);
         /** @return  The count of visible children. */
         virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
 
diff --git a/toolkit/inc/controls/table/AccessibleGridControlTableBase.hxx b/toolkit/inc/controls/table/AccessibleGridControlTableBase.hxx
index c5869ed22cef..8e77da8aec3b 100644
--- a/toolkit/inc/controls/table/AccessibleGridControlTableBase.hxx
+++ b/toolkit/inc/controls/table/AccessibleGridControlTableBase.hxx
@@ -47,7 +47,7 @@ public:
     AccessibleGridControlTableBase(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
         svt::table::TableControl& rTable,
-        ::vcl::table::AccessibleTableControlObjType  eObjType );
+        AccessibleTableControlObjType  eObjType);
 
 protected:
     virtual ~AccessibleGridControlTableBase() override = default;
diff --git a/toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx b/toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx
index 58ed164e1dbc..57d5118cb87e 100644
--- a/toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx
+++ b/toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx
@@ -23,7 +23,6 @@
 
 #include <comphelper/accessibletexthelper.hxx>
 #include <cppuhelper/implbase2.hxx>
-#include <vcl/accessibletable.hxx>
 #include <com/sun/star/accessibility/AccessibleScrollType.hpp>
 
 namespace accessibility
@@ -52,7 +51,7 @@ namespace accessibility
             svt::table::TableControl& _rTable,
             sal_Int32 _nRowPos,
             sal_uInt16 _nColPos,
-            ::vcl::table::AccessibleTableControlObjType _eType
+            AccessibleTableControlObjType _eType
         );
 
         virtual ~AccessibleGridControlCell() override = default;
diff --git a/toolkit/inc/controls/table/tablecontrol.hxx b/toolkit/inc/controls/table/tablecontrol.hxx
index 482330fef39b..a4ed69f4a60b 100644
--- a/toolkit/inc/controls/table/tablecontrol.hxx
+++ b/toolkit/inc/controls/table/tablecontrol.hxx
@@ -21,18 +21,27 @@
 
 #include <controls/table/tablecontrolinterface.hxx>
 #include <controls/table/tablemodel.hxx>
-#include <vcl/accessibletable.hxx>
 
 #include <vcl/ctrl.hxx>
 #include <vcl/seleng.hxx>
 
 #include <memory>
 
+enum class AccessibleTableControlObjType
+{
+    GRIDCONTROL,         /// The GridControl itself.
+    TABLE,               /// The data table.
+    ROWHEADERBAR,        /// The row header bar.
+    COLUMNHEADERBAR,     /// The horizontal column header bar.
+    TABLECELL,           /// A cell of the data table.
+    ROWHEADERCELL,       /// A cell of the row header bar.
+    COLUMNHEADERCELL,    /// A cell of the column header bar.
+};
+
 namespace svt::table
 {
     class TableControl_Impl;
 
-
     //= TableControl
 
     /** a basic control which manages table-like data, i.e. a number of cells
@@ -109,13 +118,13 @@ namespace svt::table
 
         /** Creates and returns the accessible object of the whole GridControl. */
         virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
-        OUString GetAccessibleObjectName(vcl::table::AccessibleTableControlObjType eObjType,
+        OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType,
                                          sal_Int32 _nRow, sal_Int32 _nCol) const;
         void GoToCell(sal_Int32 _nColumnPos, sal_Int32 _nRow);
         OUString
-        GetAccessibleObjectDescription(vcl::table::AccessibleTableControlObjType eObjType) const;
+        GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType) const;
         void FillAccessibleStateSet(sal_Int64& rStateSet,
-                                    vcl::table::AccessibleTableControlObjType eObjType) const;
+                                    AccessibleTableControlObjType eObjType) const;
 
         // temporary methods
         // Those do not really belong into the public API - they're intended for firing A11Y-related events. However,
diff --git a/toolkit/source/controls/table/AccessibleGridControl.cxx b/toolkit/source/controls/table/AccessibleGridControl.cxx
index 740431ad73e3..f89bf57b4183 100644
--- a/toolkit/source/controls/table/AccessibleGridControl.cxx
+++ b/toolkit/source/controls/table/AccessibleGridControl.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <utility>
-#include <vcl/accessibletable.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/unohelp.hxx>
 
@@ -37,7 +36,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::accessibility;
 using namespace ::vcl;
-using namespace ::vcl::table;
 
 AccessibleGridControl::AccessibleGridControl(
             const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator,
@@ -104,7 +102,7 @@ AccessibleGridControl::getAccessibleChild( sal_Int64 nChildIndex )
             if(!m_xColumnHeaderBar.is())
             {
                 m_xColumnHeaderBar = new AccessibleGridControlHeader(m_aCreator, m_aTable,
-                                                                     vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR);
+                                                                     AccessibleTableControlObjType::COLUMNHEADERBAR);
             }
             xChild = m_xColumnHeaderBar.get();
         }
@@ -113,7 +111,7 @@ AccessibleGridControl::getAccessibleChild( sal_Int64 nChildIndex )
             if(!m_xRowHeaderBar.is())
             {
                 m_xRowHeaderBar = new AccessibleGridControlHeader(m_aCreator, m_aTable,
-                                                                  vcl::table::AccessibleTableControlObjType::ROWHEADERBAR);
+                                                                  AccessibleTableControlObjType::ROWHEADERBAR);
             }
             xChild = m_xRowHeaderBar.get();
         }
diff --git a/toolkit/source/controls/table/AccessibleGridControlBase.cxx b/toolkit/source/controls/table/AccessibleGridControlBase.cxx
index 5b169f94b7dd..cc14239f2e8a 100644
--- a/toolkit/source/controls/table/AccessibleGridControlBase.cxx
+++ b/toolkit/source/controls/table/AccessibleGridControlBase.cxx
@@ -20,7 +20,6 @@
 #include <controls/table/AccessibleGridControlBase.hxx>
 
 #include <utility>
-#include <vcl/accessibletable.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/unohelp.hxx>
 #include <vcl/window.hxx>
@@ -40,7 +39,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 using namespace ::vcl;
-using namespace ::vcl::table;
 
 
 namespace accessibility {
@@ -49,7 +47,7 @@ using namespace com::sun::star::accessibility::AccessibleStateType;
 
 AccessibleGridControlBase::AccessibleGridControlBase(
     css::uno::Reference<css::accessibility::XAccessible> xParent, svt::table::TableControl& rTable,
-    ::vcl::table::AccessibleTableControlObjType eObjType)
+    AccessibleTableControlObjType eObjType)
     : m_xParent(std::move(xParent))
     , m_aTable(rTable)
     , m_eObjType(eObjType)
@@ -274,7 +272,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground(  )
 
 GridControlAccessibleElement::GridControlAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
                         svt::table::TableControl& rTable,
-                        ::vcl::table::AccessibleTableControlObjType  eObjType )
+                        AccessibleTableControlObjType  eObjType )
     : GridControlAccessibleElement_Base(rxParent, rTable, eObjType)
 {
 }
diff --git a/toolkit/source/controls/table/AccessibleGridControlHeader.cxx b/toolkit/source/controls/table/AccessibleGridControlHeader.cxx
index 8baea20fcf81..36606111424e 100644
--- a/toolkit/source/controls/table/AccessibleGridControlHeader.cxx
+++ b/toolkit/source/controls/table/AccessibleGridControlHeader.cxx
@@ -21,7 +21,6 @@
 #include <controls/table/AccessibleGridControlHeaderCell.hxx>
 
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <vcl/accessibletable.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/unohelp.hxx>
 
@@ -33,7 +32,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::accessibility;
 using namespace ::vcl;
-using namespace ::vcl::table;
 
 
 namespace accessibility {
@@ -42,7 +40,7 @@ namespace accessibility {
 AccessibleGridControlHeader::AccessibleGridControlHeader(
         const Reference< XAccessible >& rxParent,
         svt::table::TableControl& rTable,
-        ::vcl::table::AccessibleTableControlObjType      eObjType):
+        AccessibleTableControlObjType eObjType):
         AccessibleGridControlTableBase( rxParent, rTable, eObjType )
 {
     OSL_ENSURE( isRowBar() || isColumnBar(),
@@ -67,7 +65,7 @@ sal_Int64 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent()
     SolarMutexGuard aSolarGuard;
 
     ensureAlive();
-    if (m_eObjType == vcl::table::AccessibleTableControlObjType::ROWHEADERBAR && m_aTable.HasColHeader())
+    if (m_eObjType == AccessibleTableControlObjType::ROWHEADERBAR && m_aTable.HasColHeader())
         return 1;
     else
         return 0;
@@ -196,16 +194,16 @@ Reference< XAccessible > AccessibleGridControlHeader::implGetChild(
         sal_Int32 nRow, sal_uInt32 nColumnPos )
 {
     Reference< XAccessible > xChild;
-    if (m_eObjType == vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR)
+    if (m_eObjType == AccessibleTableControlObjType::COLUMNHEADERBAR)
     {
         rtl::Reference<AccessibleGridControlHeaderCell> pColHeaderCell = new AccessibleGridControlHeaderCell(nColumnPos, this, m_aTable,
-                                                                                                             vcl::table::AccessibleTableControlObjType::COLUMNHEADERCELL);
+                                                                                                             AccessibleTableControlObjType::COLUMNHEADERCELL);
         xChild = pColHeaderCell;
     }
-    else if (m_eObjType == vcl::table::AccessibleTableControlObjType::ROWHEADERBAR)
+    else if (m_eObjType == AccessibleTableControlObjType::ROWHEADERBAR)
     {
         rtl::Reference<AccessibleGridControlHeaderCell> pRowHeaderCell = new AccessibleGridControlHeaderCell(nRow, this, m_aTable,
-                                                                                                             vcl::table::AccessibleTableControlObjType::ROWHEADERCELL);
+                                                                                                             AccessibleTableControlObjType::ROWHEADERCELL);
         xChild = pRowHeaderCell;
     }
     return xChild;
diff --git a/toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx b/toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx
index 5551dbf79182..b23c103a705f 100644
--- a/toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx
+++ b/toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx
@@ -20,7 +20,6 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <controls/table/AccessibleGridControlHeaderCell.hxx>
-#include <vcl/accessibletable.hxx>
 #include <vcl/svapp.hxx>
 
 namespace accessibility
@@ -29,7 +28,6 @@ namespace accessibility
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::uno;
     using namespace ::vcl;
-    using namespace ::vcl::table;
 
 AccessibleGridControlHeaderCell::AccessibleGridControlHeaderCell(sal_Int32 _nColumnRowId,
                                   const Reference< XAccessible >& rxParent,
diff --git a/toolkit/source/controls/table/AccessibleGridControlTable.cxx b/toolkit/source/controls/table/AccessibleGridControlTable.cxx
index 72e2e2a376db..ab6a5b5c5add 100644
--- a/toolkit/source/controls/table/AccessibleGridControlTable.cxx
+++ b/toolkit/source/controls/table/AccessibleGridControlTable.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <controls/table/AccessibleGridControlTable.hxx>
 #include <controls/table/AccessibleGridControlTableCell.hxx>
-#include <vcl/accessibletable.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/unohelp.hxx>
 #include <tools/debug.hxx>
@@ -35,7 +34,6 @@ using ::com::sun::star::uno::Any;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 using namespace ::vcl;
-using namespace ::vcl::table;
 
 
 namespace accessibility {
diff --git a/toolkit/source/controls/table/AccessibleGridControlTableBase.cxx b/toolkit/source/controls/table/AccessibleGridControlTableBase.cxx
index 2d32159bd9cf..36953b900353 100644
--- a/toolkit/source/controls/table/AccessibleGridControlTableBase.cxx
+++ b/toolkit/source/controls/table/AccessibleGridControlTableBase.cxx
@@ -20,7 +20,6 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <controls/table/AccessibleGridControlTableBase.hxx>
-#include <vcl/accessibletable.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/sequence.hxx>
 
@@ -31,7 +30,6 @@ using css::uno::Any;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 using namespace ::vcl;
-using namespace ::vcl::table;
 
 
 namespace accessibility {
diff --git a/toolkit/source/controls/table/AccessibleGridControlTableCell.cxx b/toolkit/source/controls/table/AccessibleGridControlTableCell.cxx
index 6ebc48494a67..0d80a6977a29 100644
--- a/toolkit/source/controls/table/AccessibleGridControlTableCell.cxx
+++ b/toolkit/source/controls/table/AccessibleGridControlTableCell.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <controls/table/AccessibleGridControlTableCell.hxx>
-#include <vcl/accessibletable.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/unohelp.hxx>
 #include <tools/gen.hxx>
@@ -45,7 +44,6 @@ namespace accessibility
     using ::com::sun::star::accessibility::XAccessible;
     using namespace ::com::sun::star::accessibility;
     using namespace ::vcl;
-    using namespace ::vcl::table;
 
 
     // = AccessibleGridControlCell
@@ -53,7 +51,7 @@ namespace accessibility
 
     AccessibleGridControlCell::AccessibleGridControlCell(
             const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, svt::table::TableControl& _rTable,
-            sal_Int32 _nRowPos, sal_uInt16 _nColPos, ::vcl::table::AccessibleTableControlObjType _eType )
+            sal_Int32 _nRowPos, sal_uInt16 _nColPos, AccessibleTableControlObjType _eType )
         :AccessibleGridControlBase( _rxParent, _rTable, _eType )
         ,m_nRowPos( _nRowPos )
         ,m_nColPos( _nColPos )
diff --git a/toolkit/source/controls/table/tablecontrol.cxx b/toolkit/source/controls/table/tablecontrol.cxx
index eb67a8f8370a..edebb01ab5a8 100644
--- a/toolkit/source/controls/table/tablecontrol.cxx
+++ b/toolkit/source/controls/table/tablecontrol.cxx
@@ -322,25 +322,25 @@ namespace svt::table
         return m_pImpl->getAccessible( *pParent );
     }
 
-    OUString TableControl::GetAccessibleObjectName( vcl::table::AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const
+    OUString TableControl::GetAccessibleObjectName( AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const
     {
         OUString aRetText;
         //Window* pWin;
         switch( eObjType )
         {
-            case vcl::table::AccessibleTableControlObjType::GRIDCONTROL:
+            case AccessibleTableControlObjType::GRIDCONTROL:
                 aRetText = "Grid control";
                 break;
-            case vcl::table::AccessibleTableControlObjType::TABLE:
+            case AccessibleTableControlObjType::TABLE:
                 aRetText = "Grid control";
                 break;
-            case vcl::table::AccessibleTableControlObjType::ROWHEADERBAR:
+            case AccessibleTableControlObjType::ROWHEADERBAR:
                 aRetText = "RowHeaderBar";
                 break;
-            case vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR:
+            case AccessibleTableControlObjType::COLUMNHEADERBAR:
                 aRetText = "ColumnHeaderBar";
                 break;
-            case vcl::table::AccessibleTableControlObjType::TABLECELL:
+            case AccessibleTableControlObjType::TABLECELL:
                 //the name of the cell consists of column name and row name if defined
                 //if the name is equal to cell content, it'll be read twice
                 if(GetModel()->hasColumnHeaders())
@@ -353,10 +353,10 @@ namespace svt::table
                 }
                 //aRetText = GetAccessibleCellText(_nRow, _nCol);
                 break;
-            case vcl::table::AccessibleTableControlObjType::ROWHEADERCELL:
+            case AccessibleTableControlObjType::ROWHEADERCELL:
                 aRetText = GetRowName(_nRow);
                 break;
-            case vcl::table::AccessibleTableControlObjType::COLUMNHEADERCELL:
+            case AccessibleTableControlObjType::COLUMNHEADERCELL:
                 aRetText = GetColumnName(_nCol);
                 break;
             default:
@@ -366,24 +366,24 @@ namespace svt::table
     }
 
 
-    OUString TableControl::GetAccessibleObjectDescription( vcl::table::AccessibleTableControlObjType eObjType ) const
+    OUString TableControl::GetAccessibleObjectDescription( AccessibleTableControlObjType eObjType ) const
     {
         OUString aRetText;
         switch( eObjType )
         {
-            case vcl::table::AccessibleTableControlObjType::GRIDCONTROL:
+            case AccessibleTableControlObjType::GRIDCONTROL:
                 aRetText = "Grid control description";
                 break;
-            case vcl::table::AccessibleTableControlObjType::TABLE:
+            case AccessibleTableControlObjType::TABLE:
                     aRetText = "TABLE description";
                 break;
-            case vcl::table::AccessibleTableControlObjType::ROWHEADERBAR:
+            case AccessibleTableControlObjType::ROWHEADERBAR:
                     aRetText = "ROWHEADERBAR description";
                 break;
-            case vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR:
+            case AccessibleTableControlObjType::COLUMNHEADERBAR:
                     aRetText = "COLUMNHEADERBAR description";
                 break;
-            case vcl::table::AccessibleTableControlObjType::TABLECELL:
+            case AccessibleTableControlObjType::TABLECELL:
                 // the description of the cell consists of column name and row name if defined
                 // if the name is equal to cell content, it'll be read twice
                 if ( GetModel()->hasColumnHeaders() )
@@ -395,10 +395,10 @@ namespace svt::table
                     aRetText += GetRowName( GetCurrentRow() );
                 }
                 break;
-            case vcl::table::AccessibleTableControlObjType::ROWHEADERCELL:
+            case AccessibleTableControlObjType::ROWHEADERCELL:
                     aRetText = "ROWHEADERCELL description";
                 break;
-            case vcl::table::AccessibleTableControlObjType::COLUMNHEADERCELL:
+            case AccessibleTableControlObjType::COLUMNHEADERCELL:
                     aRetText = "COLUMNHEADERCELL description";
                 break;
         }
@@ -428,12 +428,12 @@ namespace svt::table
 
     void TableControl::FillAccessibleStateSet(
             sal_Int64& rStateSet,
-            vcl::table::AccessibleTableControlObjType eObjType ) const
+            AccessibleTableControlObjType eObjType ) const
     {
         switch( eObjType )
         {
-            case vcl::table::AccessibleTableControlObjType::GRIDCONTROL:
-            case vcl::table::AccessibleTableControlObjType::TABLE:
+            case AccessibleTableControlObjType::GRIDCONTROL:
+            case AccessibleTableControlObjType::TABLE:
 
                 rStateSet |= AccessibleStateType::FOCUSABLE;
 
@@ -455,21 +455,21 @@ namespace svt::table
                 if ( IsReallyVisible() )
                     rStateSet |= AccessibleStateType::VISIBLE;
 
-                if ( eObjType == vcl::table::AccessibleTableControlObjType::TABLE )
+                if ( eObjType == AccessibleTableControlObjType::TABLE )
                     rStateSet |= AccessibleStateType::MANAGES_DESCENDANTS;
                 break;
 
-            case vcl::table::AccessibleTableControlObjType::ROWHEADERBAR:
+            case AccessibleTableControlObjType::ROWHEADERBAR:
                 rStateSet |= AccessibleStateType::VISIBLE;
                 rStateSet |= AccessibleStateType::MANAGES_DESCENDANTS;
                 break;
 
-            case vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR:
+            case AccessibleTableControlObjType::COLUMNHEADERBAR:
                 rStateSet |= AccessibleStateType::VISIBLE;
                 rStateSet |= AccessibleStateType::MANAGES_DESCENDANTS;
                 break;
 
-            case vcl::table::AccessibleTableControlObjType::TABLECELL:
+            case AccessibleTableControlObjType::TABLECELL:
                 {
                     rStateSet |= AccessibleStateType::FOCUSABLE;
                     if ( HasChildPathFocus() )
@@ -485,12 +485,12 @@ namespace svt::table
                 }
                 break;
 
-            case vcl::table::AccessibleTableControlObjType::ROWHEADERCELL:
+            case AccessibleTableControlObjType::ROWHEADERCELL:
                 rStateSet |= AccessibleStateType::VISIBLE;
                 rStateSet |= AccessibleStateType::TRANSIENT;
                 break;
 
-            case vcl::table::AccessibleTableControlObjType::COLUMNHEADERCELL:
+            case AccessibleTableControlObjType::COLUMNHEADERCELL:
                 rStateSet |= AccessibleStateType::VISIBLE;
                 break;
         }
diff --git a/toolkit/source/controls/table/tablecontrol_impl.hxx b/toolkit/source/controls/table/tablecontrol_impl.hxx
index 07409773705a..96a7490c6204 100644
--- a/toolkit/source/controls/table/tablecontrol_impl.hxx
+++ b/toolkit/source/controls/table/tablecontrol_impl.hxx
@@ -24,7 +24,6 @@
 #include <controls/table/tablecontrolinterface.hxx>
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
-#include <vcl/accessibletable.hxx>
 #include <vcl/seleng.hxx>
 
 #include <vector>
diff --git a/vcl/source/accessibility/acc_factory.cxx b/vcl/source/accessibility/acc_factory.cxx
index e1ac5e7b02b8..010110d9941c 100644
--- a/vcl/source/accessibility/acc_factory.cxx
+++ b/vcl/source/accessibility/acc_factory.cxx
@@ -56,14 +56,12 @@
 #include <vcl/toolkit/fixed.hxx>
 #include <vcl/toolkit/fixedhyper.hxx>
 #include <vcl/accessibility/vclxaccessiblecomponent.hxx>
-#include <vcl/accessibletable.hxx>
 
 using namespace ::accessibility;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::accessibility;
 using namespace ::vcl;
-using namespace ::vcl::table;
 
 namespace {