diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2025-03-15 15:37:47 -0700 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2025-03-16 03:07:25 +0100 |
| commit | cee4f55e66efcf54179457316b244229961a067b (patch) | |
| tree | aed89e40e569d6a91e1644082b093aee39578afb /toolkit | |
| parent | 6901639601f0ae1b0d48afa083ee3503ef5c9398 (diff) | |
toolkit a11y: Use existing Window::GetAccessibleParent
Change-Id: I8a4ef1676707c519f6b90707e3d36b2f69121ecf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182979
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/controls/table/tablecontrol.cxx | 6 | ||||
| -rw-r--r-- | toolkit/source/controls/table/tablecontrol_impl.cxx | 8 | ||||
| -rw-r--r-- | toolkit/source/controls/table/tablecontrol_impl.hxx | 2 |
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 |