svtools/source/brwbox/brwbox3.cxx | 7 ++-----
toolkit/source/controls/table/tablecontrol.cxx | 6 ++----
toolkit/source/controls/table/tablecontrol_impl.cxx | 8 +++-----
toolkit/source/controls/table/tablecontrol_impl.hxx | 2 +-
4 files changed, 8 insertions(+), 15 deletions(-)
New commits:
commit 714927c249e69b35a38ae1e563e441a62ae539a7
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat Mar 15 15:46:06 2025 -0700
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sun Mar 16 03:07:32 2025 +0100
svtools a11y: Use existing Window::GetAccessibleParent
Change-Id: I5eb010b76f5756b3c7164e4cc25f505dea14c510
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182980
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/svtools/source/brwbox/brwbox3.cxx
b/svtools/source/brwbox/brwbox3.cxx
index 8eaa3d4986f1..c54336c43b7d 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -68,12 +68,9 @@ Reference<XAccessible> BrowseBox::getAccessibleTable()
Reference< XAccessible > BrowseBox::CreateAccessible()
{
- vcl::Window* pParent = GetAccessibleParentWindow();
- DBG_ASSERT( pParent, "BrowseBox::CreateAccessible - parent not found" );
-
- if (pParent && !m_xAccessible)
+ if (!m_xAccessible)
{
- Reference< XAccessible > xAccParent = pParent->GetAccessible();
+ Reference<XAccessible> xAccParent = GetAccessibleParent();
if( xAccParent.is() )
{
m_xAccessible = new AccessibleBrowseBox(xAccParent, *this);
commit cee4f55e66efcf54179457316b244229961a067b
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat Mar 15 15:37:47 2025 -0700
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sun Mar 16 03:07:25 2025 +0100
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.wegh...@posteo.de>
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
