3 files changed, 21 insertions, 23 deletions
diff --git a/toolkit/inc/controls/table/AccessibleGridControl.hxx b/toolkit/inc/controls/table/AccessibleGridControl.hxx
index 11c08ea321d8..ee9fe3546b40 100644
--- a/toolkit/inc/controls/table/AccessibleGridControl.hxx
+++ b/toolkit/inc/controls/table/AccessibleGridControl.hxx
@@ -160,7 +160,8 @@ private:
     the context holds this instance weak.</p>
 */
 
-class AccessibleGridControlAccess final : public ::vcl::table::IAccessibleTableControl
+class AccessibleGridControlAccess final
+    : public cppu::WeakImplHelper<css::accessibility::XAccessible>
 {
 private:
     css::uno::Reference< css::accessibility::XAccessible > m_xParent;
@@ -176,35 +177,31 @@ public:
     /// 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
-    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
+    void DisposeAccessImpl();
+
+    bool isAlive() const { return m_xContext.is() && m_xContext->isAlive(); }
+
+    void commitCellEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue,
+                         const css::uno::Any& rOldValue)
     {
          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
+
+    void commitTableEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue,
+                          const css::uno::Any& rOldValue)
     {
          AccessibleGridControl* pContext( getContext() );
          if ( pContext )
             pContext->commitTableEvent( nEventId, rNewValue, rOldValue );
     }
-    virtual void commitEvent( sal_Int16 nEventId,
-        const css::uno::Any& rNewValue ) override
+
+    void commitEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue)
     {
         AccessibleGridControl* pContext( getContext() );
         if ( pContext )
@@ -212,6 +209,7 @@ private:
     }
 
 private:
+    virtual ~AccessibleGridControlAccess() override;
     AccessibleGridControlAccess( const AccessibleGridControlAccess& ) = delete;
     AccessibleGridControlAccess& operator=( const AccessibleGridControlAccess& ) = delete;
 };
diff --git a/toolkit/source/controls/table/tablecontrol_impl.cxx b/toolkit/source/controls/table/tablecontrol_impl.cxx
index b2139285c188..931ab4b155ec 100644
--- a/toolkit/source/controls/table/tablecontrol_impl.cxx
+++ b/toolkit/source/controls/table/tablecontrol_impl.cxx
@@ -2368,8 +2368,8 @@ namespace svt::table
             impl_ni_ScrollColumns( _pScrollbar->GetDelta() );
     }
 
-
-    const rtl::Reference<vcl::table::IAccessibleTableControl> & TableControl_Impl::getAccessible( vcl::Window& i_parentWindow )
+    const rtl::Reference<accessibility::AccessibleGridControlAccess>&
+    TableControl_Impl::getAccessible(vcl::Window& i_parentWindow)
     {
         if (m_pAccessibleTable)
             return m_pAccessibleTable;
diff --git a/toolkit/source/controls/table/tablecontrol_impl.hxx b/toolkit/source/controls/table/tablecontrol_impl.hxx
index a2fc6ec873d7..8fa77c18b975 100644
--- a/toolkit/source/controls/table/tablecontrol_impl.hxx
+++ b/toolkit/source/controls/table/tablecontrol_impl.hxx
@@ -19,12 +19,12 @@
 
 #pragma once
 
-#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <controls/table/AccessibleGridControl.hxx>
 #include <controls/table/tablemodel.hxx>
 #include <controls/table/tablecontrolinterface.hxx>
 
+#include <com/sun/star/accessibility/XAccessible.hpp>
 #include <vcl/accessibletable.hxx>
-
 #include <vcl/seleng.hxx>
 
 #include <vector>
@@ -130,7 +130,7 @@ namespace svt::table
         RowPos                  m_nAnchor;
         bool                    m_bUpdatingColWidths;
 
-        rtl::Reference<vcl::table::IAccessibleTableControl> m_pAccessibleTable;
+        rtl::Reference<accessibility::AccessibleGridControlAccess> m_pAccessibleTable;
 
     public:
         void        setModel( const PTableModel& _pModel );
@@ -290,8 +290,8 @@ namespace svt::table
         tools::Rectangle calcCellRect( sal_Int32 nRow, sal_Int32 nCol ) const;
 
         // A11Y
-        const rtl::Reference<vcl::table::IAccessibleTableControl> &
-                        getAccessible( vcl::Window& i_parentWindow );
+        const rtl::Reference<accessibility::AccessibleGridControlAccess>&
+        getAccessible(vcl::Window& i_parentWindow);
         void            disposeAccessible();
 
         bool     isAccessibleAlive() const { return impl_isAccessibleAlive(); }