3 files changed, 6 insertions, 10 deletions
diff --git a/toolkit/source/controls/table/tablecontrol.cxx b/toolkit/source/controls/table/tablecontrol.cxx
index b3582a846d50..993c9c50bfc4 100644
--- a/toolkit/source/controls/table/tablecontrol.cxx
+++ b/toolkit/source/controls/table/tablecontrol.cxx
@@ -313,10 +313,8 @@ namespace svt::table
 
     Reference< XAccessible > TableControl::CreateAccessible()
     {
-        vcl::Window* pParent = GetAccessibleParentWindow();
-        ENSURE_OR_RETURN( pParent, "TableControl::CreateAccessible - parent not found", nullptr );
-
-        return m_pImpl->getAccessible( *pParent );
+        css::uno::Reference<css::accessibility::XAccessible> xParent = GetAccessibleParent();
+        return m_pImpl->getAccessible(xParent);
     }
 
     OUString TableControl::GetAccessibleObjectName( AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const
diff --git a/toolkit/source/controls/table/tablecontrol_impl.cxx b/toolkit/source/controls/table/tablecontrol_impl.cxx
index 1900de551ddc..8dfb737f64a9 100644
--- a/toolkit/source/controls/table/tablecontrol_impl.cxx
+++ b/toolkit/source/controls/table/tablecontrol_impl.cxx
@@ -2339,17 +2339,15 @@ namespace svt::table
     }
 
     const rtl::Reference<accessibility::AccessibleGridControl>&
-    TableControl_Impl::getAccessible(vcl::Window& i_parentWindow)
+    TableControl_Impl::getAccessible(const css::uno::Reference<css::accessibility::XAccessible>& rxParent)
     {
         if (m_xAccessibleTable.is())
             return m_xAccessibleTable;
 
         DBG_TESTSOLARMUTEX();
-
-        Reference<XAccessible> const xAccParent = i_parentWindow.GetAccessible();
-        if (xAccParent.is())
+        if (rxParent.is())
         {
-            m_xAccessibleTable = new accessibility::AccessibleGridControl(xAccParent, m_rAntiImpl);
+            m_xAccessibleTable = new accessibility::AccessibleGridControl(rxParent, m_rAntiImpl);
         }
 
         return m_xAccessibleTable;
diff --git a/toolkit/source/controls/table/tablecontrol_impl.hxx b/toolkit/source/controls/table/tablecontrol_impl.hxx
index 33b0393f0f82..3753e597ba47 100644
--- a/toolkit/source/controls/table/tablecontrol_impl.hxx
+++ b/toolkit/source/controls/table/tablecontrol_impl.hxx
@@ -290,7 +290,7 @@ namespace svt::table
 
         // A11Y
         const rtl::Reference<accessibility::AccessibleGridControl>&
-        getAccessible(vcl::Window& i_parentWindow);
+        getAccessible(const css::uno::Reference<css::accessibility::XAccessible>& rxParent);
         void            disposeAccessible();
 
         // ITableModelListener