accessibility/inc/extended/AccessibleBrowseBoxBase.hxx | 4 --- accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx | 1 accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx | 1 accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 9 +++----- accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx | 3 -- accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx | 2 - accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 2 - accessibility/source/helper/acc_factory.cxx | 11 +++------- include/vcl/accessiblefactory.hxx | 2 - svtools/source/brwbox/brwbox3.cxx | 1 svtools/source/brwbox/editbrowsebox2.cxx | 1 vcl/source/treelist/svtabbx.cxx | 5 +--- 12 files changed, 12 insertions(+), 30 deletions(-)
New commits: commit a3e4ee0aa6cc55ed50f792fcfecaedf8ae623b09 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Dec 13 13:39:32 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Dec 13 20:51:38 2024 +0100 a11y: Drop always null BrowseBoxAccessibleElement focus win param Drop the `_xFocusWindow` param from the BrowseBoxAccessibleElement ctor. Both subclasses are unconditionally passing nullptr. Just unconditionally pass nullptr in the base class ctor instead of forwarding the (always nullptr) param. Change-Id: I9296ae8dae8ac53c52cec99e143288e70a586ce0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178432 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx index cd1c09590d70..f75aa59c2b16 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx @@ -323,20 +323,17 @@ protected: @param rxParent XAccessible interface of the parent object. @param rBrowseBox The BrowseBox control. - @param _xFocusWindow The window that gets all the focus events. @param eObjType Object type */ BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType eObjType ); /** Constructor sets specified name and description. @param rxParent XAccessible interface of the parent object. @param rBrowseBox The BrowseBox control. - @param _xFocusWindow The window that gets all the focus events. @param eObjType Object type @param rName The name of this object. @param rDescription The description text of this object. @@ -344,7 +341,6 @@ protected: BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType eObjType, const OUString& rName, const OUString& rDescription ); diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 2aa047b105c1..5557ba691564 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -518,16 +518,15 @@ Reference< css::accessibility::XAccessibleContext > SAL_CALL BrowseBoxAccessible BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType eObjType ) - : BrowseBoxAccessibleElement_Base(rxParent, rBrowseBox, _xFocusWindow, eObjType) + AccessibleBrowseBoxObjType eObjType ) + : BrowseBoxAccessibleElement_Base(rxParent, rBrowseBox, nullptr, eObjType) { } BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType eObjType, - const OUString& rName, const OUString& rDescription ) - : BrowseBoxAccessibleElement_Base(rxParent, rBrowseBox, _xFocusWindow, eObjType, rName, rDescription) + AccessibleBrowseBoxObjType eObjType, const OUString& rName, const OUString& rDescription ) + : BrowseBoxAccessibleElement_Base(rxParent, rBrowseBox, nullptr, eObjType, rName, rDescription) { } diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index 868a86e3eebf..c7e8ce1605cf 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx @@ -35,7 +35,6 @@ AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnR AccessibleBrowseBoxObjType eObjType) : BrowseBoxAccessibleElement(rxParent, rBrowseBox, - nullptr, eObjType, rBrowseBox.GetAccessibleObjectName( eObjType ,_nColumnRowId), rBrowseBox.GetAccessibleObjectDescription( eObjType ,_nColumnRowId)) diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index bb213c348f3d..c1363eaf0249 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx @@ -41,7 +41,7 @@ AccessibleBrowseBoxTableBase::AccessibleBrowseBoxTableBase( const Reference< XAccessible >& rxParent, vcl::IAccessibleTableProvider& rBrowseBox, AccessibleBrowseBoxObjType eObjType ) : - AccessibleBrowseBoxTableImplHelper( rxParent, rBrowseBox, nullptr, eObjType ) + AccessibleBrowseBoxTableImplHelper(rxParent, rBrowseBox, eObjType) { } commit 7eefb8056311fe31be6b2a8af4f234e90b90e556 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Dec 13 12:56:10 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Dec 13 20:51:32 2024 +0100 a11y: Drop always null AccessibleBrowseBoxHeaderCell focus win param Both callers of AccessibleFactory::createAccessibleCheckBoxCell (in SvHeaderTabListBox::CreateAccessibleColumnHeader) unconditionally pass nullptr for the `_xFocusWindow` param. Therefore, drop the parameter from that method and the AccessibleBrowseBoxHeaderCell ctor, and unconditionally pass nullptr to the base class ctor. This is basically the same as for AccessibleBrowseBoxTableCell in previous commit Change-Id: I22d5cb98332aa5d89fc4c479d0ec29588fe83e4d Author: Michael Weghorn <[email protected]> Date: Fri Dec 13 12:37:03 2024 +0100 a11y: Drop always null AccessibleBrowseBoxTableCell focus win param Change-Id: Ife57d0163f1c99407e08875ba98725ea114597cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178418 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx index 530e9f37f1e2..fd4638486eb6 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx @@ -29,7 +29,6 @@ namespace accessibility AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnRowId, const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& _rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType _eObjType); /** @return The count of visible children. */ virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index 87a9d2b7ab83..868a86e3eebf 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx @@ -32,11 +32,10 @@ namespace accessibility AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnRowId, const Reference< XAccessible >& rxParent, vcl::IAccessibleTableProvider& rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType eObjType) : BrowseBoxAccessibleElement(rxParent, rBrowseBox, - _xFocusWindow, + nullptr, eObjType, rBrowseBox.GetAccessibleObjectName( eObjType ,_nColumnRowId), rBrowseBox.GetAccessibleObjectDescription( eObjType ,_nColumnRowId)) diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index a3b3032e54e8..3b8ff10ae776 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -182,7 +182,6 @@ public: sal_Int32 _nColumnRowId, const css::uno::Reference< css::accessibility::XAccessible >& rxParent, vcl::IAccessibleTableProvider& _rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType _eObjType ) const override; @@ -419,10 +418,10 @@ Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxTableCell( Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderCell( sal_Int32 _nColumnRowId, const Reference< XAccessible >& rxParent, vcl::IAccessibleTableProvider& _rBrowseBox, - const Reference< XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType _eObjType ) const + AccessibleBrowseBoxObjType _eObjType) const { return new AccessibleBrowseBoxHeaderCell( _nColumnRowId, rxParent, _rBrowseBox, - _xFocusWindow, _eObjType ); + _eObjType); } Reference< XAccessible > AccessibleFactory::createAccessibleCheckBoxCell( diff --git a/include/vcl/accessiblefactory.hxx b/include/vcl/accessiblefactory.hxx index 66b8d3f08851..84b508910bb9 100644 --- a/include/vcl/accessiblefactory.hxx +++ b/include/vcl/accessiblefactory.hxx @@ -137,7 +137,6 @@ namespace vcl sal_Int32 _nColumnRowId, const css::uno::Reference< css::accessibility::XAccessible >& rxParent, vcl::IAccessibleTableProvider& _rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType _eObjType ) const = 0; diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index bbadb5964ed5..649da48cfc1d 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -51,7 +51,6 @@ namespace svt _nPos, _rParent, _rBrowseBox, - nullptr, _eType ); aFind = _raHeaderCells.emplace( _nPos, xAccessible ).first; diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx index cc43d12a6dd4..cc3e1c7322f1 100644 --- a/vcl/source/treelist/svtabbx.cxx +++ b/vcl/source/treelist/svtabbx.cxx @@ -924,8 +924,7 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleColumnHeader( sal_u // no -> create new header cell xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxHeaderCell( _nColumn, m_pAccessible->getHeaderBar(), - *this, nullptr, AccessibleBrowseBoxObjType::ColumnHeaderCell - ); + *this, AccessibleBrowseBoxObjType::ColumnHeaderCell); // insert into list m_aAccessibleChildren[ _nColumn ] = xChild; commit fd50ed4aac52d5a83a417949e358edf6eb34b785 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Dec 13 12:42:25 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Dec 13 20:51:25 2024 +0100 a11y: Drop always null AccessibleCheckBoxCell focus win param Both callers of AccessibleFactory::createAccessibleCheckBoxCell unconditionally pass nullptr for the `_xFocusWindow` param. Therefore, drop the parameter from that method and the AccessibleCheckBoxCell ctor, and unconditionally pass nullptr to the base class ctor. This is the same as for AccessibleBrowseBoxTableCell in previous commit Change-Id: I22d5cb98332aa5d89fc4c479d0ec29588fe83e4d Author: Michael Weghorn <[email protected]> Date: Fri Dec 13 12:37:03 2024 +0100 a11y: Drop always null AccessibleBrowseBoxTableCell focus win param Change-Id: I76660aed909fc73ab19bc99a3e3bfb54176e7e10 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178417 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx index dbc2fbd52aaf..25a9ea2b737e 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -44,7 +44,6 @@ namespace accessibility public: AccessibleCheckBoxCell(const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::vcl::IAccessibleTableProvider& _rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos, const TriState& _eState, diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx index fa91719e78d5..e0a36478b0a2 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx @@ -30,12 +30,11 @@ namespace accessibility AccessibleCheckBoxCell::AccessibleCheckBoxCell(const Reference<XAccessible >& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos ,const TriState& _eState, bool _bIsTriState) - :AccessibleBrowseBoxCell(_rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos, AccessibleBrowseBoxObjType::CheckBoxCell) + :AccessibleBrowseBoxCell(_rxParent, _rBrowseBox, nullptr, _nRowPos, _nColPos, AccessibleBrowseBoxObjType::CheckBoxCell) ,m_eState(_eState) ,m_bIsTriState(_bIsTriState) { diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index d238e3720e43..a3b3032e54e8 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -190,7 +190,6 @@ public: createAccessibleCheckBoxCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos, const TriState& _eState, @@ -428,10 +427,9 @@ Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderCell( Reference< XAccessible > AccessibleFactory::createAccessibleCheckBoxCell( const Reference< XAccessible >& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox, - const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos, - const TriState& _eState, bool _bIsTriState ) const + sal_Int32 _nRowPos, sal_uInt16 _nColPos, const TriState& _eState, bool _bIsTriState) const { - return new AccessibleCheckBoxCell( _rxParent, _rBrowseBox, _xFocusWindow, + return new AccessibleCheckBoxCell( _rxParent, _rBrowseBox, _nRowPos, _nColPos, _eState, _bIsTriState ); } diff --git a/include/vcl/accessiblefactory.hxx b/include/vcl/accessiblefactory.hxx index 984e6ecd4e94..66b8d3f08851 100644 --- a/include/vcl/accessiblefactory.hxx +++ b/include/vcl/accessiblefactory.hxx @@ -145,7 +145,6 @@ namespace vcl createAccessibleCheckBoxCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox, - const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos, const TriState& _eState, diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index a72918ebb0fb..67c0aa84867a 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -48,7 +48,6 @@ Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(sal_Int32 _ xReturn = getAccessibleFactory().createAccessibleCheckBoxCell( xAccContext->getAccessibleChild( ::vcl::BBINDEX_TABLE ), *this, - nullptr, _nRow, _nColumnPos, eState, diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx index 35892646ba48..cc43d12a6dd4 100644 --- a/vcl/source/treelist/svtabbx.cxx +++ b/vcl/source/treelist/svtabbx.cxx @@ -893,7 +893,7 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleCell( sal_Int32 _nR bool bIsCheckBox = IsCellCheckBox( _nRow, _nColumnPos, eState ); if ( bIsCheckBox ) xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleCheckBoxCell( - m_pAccessible->getTable(), *this, nullptr, _nRow, _nColumnPos, eState, false ); + m_pAccessible->getTable(), *this, _nRow, _nColumnPos, eState, false); else xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxTableCell( m_pAccessible->getTable(), *this, _nRow, _nColumnPos, OFFSET_NONE );
