From aa2cad6d86d13fe4981e67095cdeabb9bae3a3d3 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Fri, 13 Dec 2024 12:37:03 +0100 Subject: a11y: Drop always null AccessibleBrowseBoxTableCell focus win param Both callers of AccessibleFactory::createAccessibleBrowseBoxTableCell unconditionally pass nullptr for the `_xFocusWindow` param. Therefore, drop the parameter from that method and the AccessibleBrowseBoxTableCell ctor, and unconditionally pass nullptr to the base class ctor. Change-Id: I22d5cb98332aa5d89fc4c479d0ec29588fe83e4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178416 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 3 +-- accessibility/source/helper/acc_factory.cxx | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'accessibility/source') diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index dbfce6d4d3a9..f45f6099d6c5 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx @@ -67,11 +67,10 @@ namespace accessibility AccessibleBrowseBoxTableCell::AccessibleBrowseBoxTableCell(const Reference& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos, sal_Int32 _nOffset ) - :AccessibleBrowseBoxCell( _rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos ) + :AccessibleBrowseBoxCell(_rxParent, _rBrowseBox, nullptr, _nRowPos, _nColPos) { m_nOffset = ( _nOffset == OFFSET_DEFAULT ) ? sal_Int32(vcl::BBINDEX_FIRSTCONTROL) : _nOffset; sal_Int32 nIndex = getIndex_Impl( _nRowPos, _nColPos, _rBrowseBox.GetColumnCount() ); diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index ac32fb769b13..d238e3720e43 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -172,7 +172,6 @@ public: createAccessibleBrowseBoxTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId, sal_Int32 _nOffset @@ -413,9 +412,9 @@ Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderBar( Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxTableCell( const Reference< XAccessible >& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox, - const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId, sal_Int32 _nOffset ) const + sal_Int32 _nRowId, sal_uInt16 _nColId, sal_Int32 _nOffset) const { - return new AccessibleBrowseBoxTableCell( _rxParent, _rBrowseBox, _xFocusWindow, + return new AccessibleBrowseBoxTableCell( _rxParent, _rBrowseBox, _nRowId, _nColId, _nOffset ); } -- cgit