include/vcl/accessibility/AccessibleBrowseBoxHeaderBar.hxx | 21 +--------- vcl/source/accessibility/AccessibleBrowseBoxHeaderBar.cxx | 26 +------------ 2 files changed, 6 insertions(+), 41 deletions(-)
New commits: commit f099a981bddb128ef5e49f18a24ccd4f373c34e6 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Jan 12 20:47:03 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Jan 13 21:58:40 2026 +0100 vcl a11y: Use ImplInheritanceHelper for AccessibleBrowseBoxHeaderBar Change-Id: Ie60013333521b1dfc57260b518c4cd1eee9c3ca8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197145 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/vcl/accessibility/AccessibleBrowseBoxHeaderBar.hxx b/include/vcl/accessibility/AccessibleBrowseBoxHeaderBar.hxx index 43033cdcf43e..c7203159bd27 100644 --- a/include/vcl/accessibility/AccessibleBrowseBoxHeaderBar.hxx +++ b/include/vcl/accessibility/AccessibleBrowseBoxHeaderBar.hxx @@ -25,17 +25,13 @@ #include <vcl/accessibility/AccessibleBrowseBoxTableBase.hxx> #include <vcl/accessibility/AccessibleBrowseBoxObjType.hxx> - -typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection > - AccessibleBrowseBoxHeaderBarImplHelper; - /** This class represents the accessible object of a header bar of a BrowseBox control (row or column header bar). This object supports the XAccessibleSelection interface. Selecting a child of this object selects complete rows or columns of the data table. */ -class AccessibleBrowseBoxHeaderBar final : - public AccessibleBrowseBoxTableBase, - public AccessibleBrowseBoxHeaderBarImplHelper +class AccessibleBrowseBoxHeaderBar final + : public cppu::ImplInheritanceHelper<AccessibleBrowseBoxTableBase, + css::accessibility::XAccessibleSelection> { public: /** @param rxParent Parent that holds the browsebox headerbar control @@ -134,17 +130,6 @@ public: /** Removes the specified row/column from the selection. */ virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; - // XInterface - - /** Queries for a new interface. */ - css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; - - /** Acquires the object (calls acquire() on base class). */ - virtual void SAL_CALL acquire() noexcept override; - - /** Releases the object (calls release() on base class). */ - virtual void SAL_CALL release() noexcept override; - // XServiceInfo /** @return The name of this class. */ diff --git a/vcl/source/accessibility/AccessibleBrowseBoxHeaderBar.cxx b/vcl/source/accessibility/AccessibleBrowseBoxHeaderBar.cxx index fef2e90e63db..a478a53f614d 100644 --- a/vcl/source/accessibility/AccessibleBrowseBoxHeaderBar.cxx +++ b/vcl/source/accessibility/AccessibleBrowseBoxHeaderBar.cxx @@ -33,10 +33,9 @@ using namespace ::com::sun::star::accessibility; // Ctor/Dtor/disposing -------------------------------------------------------- AccessibleBrowseBoxHeaderBar::AccessibleBrowseBoxHeaderBar( - const Reference< XAccessible >& rxParent, - vcl::IAccessibleTableProvider& rBrowseBox, - AccessibleBrowseBoxObjType eObjType ) : - AccessibleBrowseBoxTableBase( rxParent, rBrowseBox,eObjType ) + const Reference<XAccessible>& rxParent, vcl::IAccessibleTableProvider& rBrowseBox, + AccessibleBrowseBoxObjType eObjType) + : ImplInheritanceHelper(rxParent, rBrowseBox, eObjType) { OSL_ENSURE( isRowBar() || isColumnBar(), "AccessibleBrowseBoxHeaderBar - invalid object type" ); @@ -267,25 +266,6 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::deselectAccessibleChild( } } -// XInterface ----------------------------------------------------------------- - -Any SAL_CALL AccessibleBrowseBoxHeaderBar::queryInterface( const uno::Type& rType ) -{ - Any aAny( AccessibleBrowseBoxTableBase::queryInterface( rType ) ); - return aAny.hasValue() ? - aAny : AccessibleBrowseBoxHeaderBarImplHelper::queryInterface( rType ); -} - -void SAL_CALL AccessibleBrowseBoxHeaderBar::acquire() noexcept -{ - AccessibleBrowseBoxTableBase::acquire(); -} - -void SAL_CALL AccessibleBrowseBoxHeaderBar::release() noexcept -{ - AccessibleBrowseBoxTableBase::release(); -} - // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationName()
