sc/source/ui/Accessibility/AccessibleCellBase.cxx | 50 +++-------------------
sc/source/ui/inc/AccessibleCell.hxx | 1
sc/source/ui/inc/AccessibleCellBase.hxx | 28 ------------
3 files changed, 10 insertions(+), 69 deletions(-)
New commits:
commit 665f2bf131a6a7359d36d16d531691c100a2dead
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Jun 5 11:16:32 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Jun 5 15:53:14 2025 +0200
sc a11y: Use ImplInheritanceHelper for ScAccessibleCellBase
Change-Id: I131a4b703277bcad5214b098c68fdfd050bf74f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186207
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 8735629c858d..055c74313fe9 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -46,16 +46,13 @@ using namespace ::com::sun::star::accessibility;
//===== internal ============================================================
-ScAccessibleCellBase::ScAccessibleCellBase(
- const uno::Reference<XAccessible>& rxParent,
- ScDocument* pDoc,
- const ScAddress& rCellAddress,
- sal_Int64 nIndex)
- :
- ScAccessibleContextBase(rxParent, AccessibleRole::TABLE_CELL),
- maCellAddress(rCellAddress),
- mpDoc(pDoc),
- mnIndex(nIndex)
+ScAccessibleCellBase::ScAccessibleCellBase(const uno::Reference<XAccessible>&
rxParent,
+ ScDocument* pDoc, const ScAddress&
rCellAddress,
+ sal_Int64 nIndex)
+ : ImplInheritanceHelper(rxParent, AccessibleRole::TABLE_CELL)
+ , maCellAddress(rCellAddress)
+ , mpDoc(pDoc)
+ , mnIndex(nIndex)
{
}
@@ -164,26 +161,6 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getBackground()
return nColor;
}
- //===== XInterface =====================================================
-
-uno::Any SAL_CALL ScAccessibleCellBase::queryInterface( uno::Type const &
rType )
-{
- uno::Any aAny (ScAccessibleCellBaseImpl::queryInterface(rType));
- return aAny.hasValue() ? aAny :
ScAccessibleContextBase::queryInterface(rType);
-}
-
-void SAL_CALL ScAccessibleCellBase::acquire()
- noexcept
-{
- ScAccessibleContextBase::acquire();
-}
-
-void SAL_CALL ScAccessibleCellBase::release()
- noexcept
-{
- ScAccessibleContextBase::release();
-}
-
//===== XAccessibleContext ==============================================
sal_Int64
@@ -272,19 +249,6 @@ OUString SAL_CALL
ScAccessibleCellBase::getImplementationName()
return u"ScAccessibleCellBase"_ustr;
}
- //===== XTypeProvider ===================================================
-
-uno::Sequence< uno::Type > SAL_CALL ScAccessibleCellBase::getTypes()
-{
- return comphelper::concatSequences(ScAccessibleCellBaseImpl::getTypes(),
ScAccessibleContextBase::getTypes());
-}
-
-uno::Sequence<sal_Int8> SAL_CALL
- ScAccessibleCellBase::getImplementationId()
-{
- return css::uno::Sequence<sal_Int8>();
-}
-
bool ScAccessibleCellBase::IsEditable(sal_Int64 nParentStates)
{
bool bEditable = nParentStates & AccessibleStateType::EDITABLE;
diff --git a/sc/source/ui/inc/AccessibleCell.hxx
b/sc/source/ui/inc/AccessibleCell.hxx
index 0df06614d38f..5c4020a3a33a 100644
--- a/sc/source/ui/inc/AccessibleCell.hxx
+++ b/sc/source/ui/inc/AccessibleCell.hxx
@@ -24,6 +24,7 @@
#include "viewdata.hxx"
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
+#include <cppuhelper/implbase1.hxx>
#include <rtl/ref.hxx>
#include <editeng/AccessibleStaticTextBase.hxx>
#include <comphelper/uno3.hxx>
diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx
b/sc/source/ui/inc/AccessibleCellBase.hxx
index f756faf4821f..44d5e71af152 100644
--- a/sc/source/ui/inc/AccessibleCellBase.hxx
+++ b/sc/source/ui/inc/AccessibleCellBase.hxx
@@ -22,14 +22,10 @@
#include "AccessibleContextBase.hxx"
#include <address.hxx>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#include <cppuhelper/implbase1.hxx>
-
-typedef cppu::ImplHelper1< css::accessibility::XAccessibleValue>
- ScAccessibleCellBaseImpl;
class ScAccessibleCellBase
- : public ScAccessibleContextBase,
- public ScAccessibleCellBaseImpl
+ : public cppu::ImplInheritanceHelper<ScAccessibleContextBase,
+ css::accessibility::XAccessibleValue>
{
public:
//===== internal ========================================================
@@ -44,15 +40,6 @@ public:
virtual bool isVisible() 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;
-
///===== XAccessibleComponent
============================================
virtual sal_Int32 SAL_CALL getForeground( ) override;
@@ -99,17 +86,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:
ScAddress maCellAddress;
