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>

9 files changed, 36 insertions, 51 deletions

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>