sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 53 ++----------- sc/source/ui/Accessibility/AccessibleTableBase.cxx | 53 +------------ sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx | 29 ------- sc/source/ui/inc/AccessibleTableBase.hxx | 39 +-------- 4 files changed, 23 insertions(+), 151 deletions(-)
New commits: commit ff1099bad4475551562e5f759b40aa40b955ca4b Author: Michael Weghorn <[email protected]> AuthorDate: Mon Jun 23 15:26:48 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Jun 24 08:00:04 2025 +0200 sc a11y: Use ImplInheritancehelper for ScAccessibleTableBase Change-Id: Ie045d59a2265130ff2c62b4fbe9375f697b57b7d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186837 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index c9c20b25f08a..5652cd3977c4 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -34,14 +34,11 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -ScAccessibleTableBase::ScAccessibleTableBase( - const uno::Reference<XAccessible>& rxParent, - ScDocument* pDoc, - const ScRange& rRange) - : - ScAccessibleContextBase (rxParent, AccessibleRole::TABLE), - maRange(rRange), - mpDoc(pDoc) +ScAccessibleTableBase::ScAccessibleTableBase(const uno::Reference<XAccessible>& rxParent, + ScDocument* pDoc, const ScRange& rRange) + : ImplInheritanceHelper(rxParent, AccessibleRole::TABLE) + , maRange(rRange) + , mpDoc(pDoc) { } @@ -57,33 +54,6 @@ void SAL_CALL ScAccessibleTableBase::disposing() ScAccessibleContextBase::disposing(); } - //===== XInterface ===================================================== - -uno::Any SAL_CALL ScAccessibleTableBase::queryInterface( uno::Type const & rType ) -{ - if ( rType == cppu::UnoType<XAccessibleTableSelection>::get()) - { - return uno::Any(uno::Reference<XAccessibleTableSelection>(this)); - } - else - { - uno::Any aAny (ScAccessibleTableBaseImpl::queryInterface(rType)); - return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType); - } -} - -void SAL_CALL ScAccessibleTableBase::acquire() - noexcept -{ - ScAccessibleContextBase::acquire(); -} - -void SAL_CALL ScAccessibleTableBase::release() - noexcept -{ - ScAccessibleContextBase::release(); -} - //===== XAccessibleTable ================================================ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowCount( ) @@ -411,19 +381,6 @@ OUString SAL_CALL ScAccessibleTableBase::getImplementationName() return u"ScAccessibleTableBase"_ustr; } - //===== XTypeProvider =================================================== - -uno::Sequence< uno::Type > SAL_CALL ScAccessibleTableBase::getTypes() -{ - return comphelper::concatSequences(ScAccessibleTableBaseImpl::getTypes(), ScAccessibleContextBase::getTypes()); -} - -uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleTableBase::getImplementationId() -{ - return css::uno::Sequence<sal_Int8>(); -} - void ScAccessibleTableBase::CommitTableModelChange(sal_Int32 nStartRow, sal_Int32 nStartCol, sal_Int32 nEndRow, sal_Int32 nEndCol, sal_uInt16 nId) { AccessibleTableModelChange aModelChange; diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 20d7eaee3503..bca85765909a 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -24,21 +24,12 @@ #include <com/sun/star/accessibility/XAccessibleTable.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/accessibility/XAccessibleTableSelection.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> -/** @descr - This base class provides an implementation of the - <code>AccessibleTable</code> service. -*/ - -typedef cppu::ImplHelper2< css::accessibility::XAccessibleTable, - css::accessibility::XAccessibleSelection> - ScAccessibleTableBaseImpl; - -class ScAccessibleTableBase : - public ScAccessibleContextBase, - public css::accessibility::XAccessibleTableSelection, - public ScAccessibleTableBaseImpl +class ScAccessibleTableBase + : public cppu::ImplInheritanceHelper< + ScAccessibleContextBase, css::accessibility::XAccessibleTableSelection, + css::accessibility::XAccessibleTable, css::accessibility::XAccessibleSelection> { public: ScAccessibleTableBase( @@ -52,15 +43,6 @@ public: using ScAccessibleContextBase::disposing; virtual void SAL_CALL disposing() override; - ///===== XInterface ===================================================== - - virtual css::uno::Any SAL_CALL queryInterface( - css::uno::Type const & rType ) override; - - virtual void SAL_CALL acquire() noexcept override; - - virtual void SAL_CALL release() noexcept override; - ///===== XAccessibleTable ================================================ /// Returns the number of rows in the table. @@ -210,17 +192,6 @@ public: virtual OUString SAL_CALL getImplementationName() override; - ///===== XTypeProvider =================================================== - - /// returns the possible types - virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() override; - - /** Returns an implementation id. - */ - virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() override; - protected: /// contains the range of the table, because it could be a subrange of the complete table ScRange maRange; commit 9ca78aee9286533a456a8a389afea12ebd076743 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Jun 23 15:21:37 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Jun 24 07:59:56 2025 +0200 sc a11y: Use ImplInheritancehelper for ScAccessiblePreviewHeaderCell Change-Id: Id627d8a57cf708c7daf5353eff153dfd9569291e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186836 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index dabac4466834..e8421dfcaa06 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -49,16 +49,16 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -ScAccessiblePreviewHeaderCell::ScAccessiblePreviewHeaderCell( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, - ScPreviewShell* pViewShell, - const ScAddress& rCellPos, bool bIsColHdr, bool bIsRowHdr, - sal_Int32 nIndex ) : - ScAccessibleContextBase( rxParent, AccessibleRole::TABLE_CELL ), - mpViewShell( pViewShell ), - mnIndex( nIndex ), - maCellPos( rCellPos ), - mbColumnHeader( bIsColHdr ), - mbRowHeader( bIsRowHdr ) +ScAccessiblePreviewHeaderCell::ScAccessiblePreviewHeaderCell( + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, + ScPreviewShell* pViewShell, const ScAddress& rCellPos, bool bIsColHdr, bool bIsRowHdr, + sal_Int32 nIndex) + : ImplInheritanceHelper(rxParent, AccessibleRole::TABLE_CELL) + , mpViewShell(pViewShell) + , mnIndex(nIndex) + , maCellPos(rCellPos) + , mbColumnHeader(bIsColHdr) + , mbRowHeader(bIsRowHdr) { if (mpViewShell) mpViewShell->AddAccessibilityObject(*this); @@ -104,26 +104,6 @@ void ScAccessiblePreviewHeaderCell::Notify( SfxBroadcaster& rBC, const SfxHint& ScAccessibleContextBase::Notify(rBC, rHint); } -//===== XInterface ===================================================== - -uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::queryInterface( uno::Type const & rType ) -{ - uno::Any aAny (ScAccessiblePreviewHeaderCellImpl::queryInterface(rType)); - return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType); -} - -void SAL_CALL ScAccessiblePreviewHeaderCell::acquire() - noexcept -{ - ScAccessibleContextBase::acquire(); -} - -void SAL_CALL ScAccessiblePreviewHeaderCell::release() - noexcept -{ - ScAccessibleContextBase::release(); -} - //===== XAccessibleValue ================================================ uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getCurrentValue() @@ -266,19 +246,6 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServ return comphelper::concatSequences(ScAccessibleContextBase::getSupportedServiceNames(), vals); } -//===== XTypeProvider ======================================================= - -uno::Sequence< uno::Type > SAL_CALL ScAccessiblePreviewHeaderCell::getTypes() -{ - return comphelper::concatSequences(ScAccessiblePreviewHeaderCellImpl::getTypes(), ScAccessibleContextBase::getTypes()); -} - -uno::Sequence<sal_Int8> SAL_CALL - ScAccessiblePreviewHeaderCell::getImplementationId() -{ - return css::uno::Sequence<sal_Int8>(); -} - AbsoluteScreenPixelRectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() { tools::Rectangle aCellRect; diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index 01b1171120cd..25054c2c7a38 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <tools/gen.hxx> #include <address.hxx> -#include <cppuhelper/implbase1.hxx> class ScPreviewShell; class ScPreviewTableInfo; @@ -31,12 +30,9 @@ namespace accessibility { class AccessibleTextHelper; } -typedef cppu::ImplHelper1< css::accessibility::XAccessibleValue> - ScAccessiblePreviewHeaderCellImpl; - -class ScAccessiblePreviewHeaderCell : - public ScAccessibleContextBase, - public ScAccessiblePreviewHeaderCellImpl +class ScAccessiblePreviewHeaderCell + : public cppu::ImplInheritanceHelper<ScAccessibleContextBase, + css::accessibility::XAccessibleValue> { public: ScAccessiblePreviewHeaderCell( const css::uno::Reference<css::accessibility::XAccessible>& rxParent, @@ -57,15 +53,6 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - ///===== XInterface ===================================================== - - virtual css::uno::Any SAL_CALL queryInterface( - css::uno::Type const & rType ) override; - - virtual void SAL_CALL acquire() noexcept override; - - virtual void SAL_CALL release() noexcept override; - //===== XAccessibleValue ================================================ virtual css::uno::Any SAL_CALL getCurrentValue() override; @@ -93,16 +80,6 @@ public: virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - ///===== XTypeProvider =================================================== - - virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() override; - - /** Returns an implementation id. - */ - virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() override; - protected: virtual OUString createAccessibleDescription() override; virtual OUString createAccessibleName() override;
