sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 20 ++------
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 43 ++----------------
sc/source/ui/inc/AccessiblePreviewCell.hxx | 15 +-----
sc/source/ui/inc/AccessiblePreviewTable.hxx | 26 +---------
4 files changed, 19 insertions(+), 85 deletions(-)
New commits:
commit 40f3e28c1dd75d3a3f09ccc66b461400a35ef151
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Jun 5 11:10:58 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Jun 5 15:53:07 2025 +0200
sc a11y: Drop ScAccessiblePreviewCell::getImplementationId
The base class implementation in
ScAccessibleCellBase::getImplementationId does the same
Change-Id: I066c57dbe04dc295436a6c795f2a1cc0b01820e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186206
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index a3bb02e5524a..8d0f8f61c483 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -181,14 +181,6 @@ uno::Sequence<OUString> SAL_CALL
ScAccessiblePreviewCell::getSupportedServiceNam
return
comphelper::concatSequences(ScAccessibleContextBase::getSupportedServiceNames(),
vals);
}
-//===== XTypeProvider =======================================================
-
-uno::Sequence<sal_Int8> SAL_CALL
- ScAccessiblePreviewCell::getImplementationId()
-{
- return css::uno::Sequence<sal_Int8>();
-}
-
//==== internal =========================================================
AbsoluteScreenPixelRectangle ScAccessiblePreviewCell::GetBoundingBoxOnScreen()
diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx
b/sc/source/ui/inc/AccessiblePreviewCell.hxx
index c0911537d195..45b139d14613 100644
--- a/sc/source/ui/inc/AccessiblePreviewCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx
@@ -69,13 +69,6 @@ public:
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
- ///===== XTypeProvider
===================================================
-
- /** Returns an implementation id.
- */
- virtual css::uno::Sequence<sal_Int8> SAL_CALL
- getImplementationId() override;
-
protected:
virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() override;
virtual tools::Rectangle GetBoundingBox() override;
commit 016cb3c311b4bd3bb04793d19531f8fe35ab19b6
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Jun 5 11:05:17 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Jun 5 15:53:00 2025 +0200
sc a11y: Use ImplInheritanceHelper
... and drop custom overrides of XInterface and XTypeProvider methods.
Change-Id: Ic121c2d7fa674cce7e0cf358f41f2ececa4afa27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186205
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index 30acfbbd086e..daa50eede9de 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -44,11 +44,12 @@ using namespace ::com::sun::star::accessibility;
//===== internal ============================================================
-ScAccessiblePreviewTable::ScAccessiblePreviewTable( const
css::uno::Reference<css::accessibility::XAccessible>& rxParent,
- ScPreviewShell* pViewShell, sal_Int32 nIndex ) :
- ScAccessibleContextBase( rxParent, AccessibleRole::TABLE ),
- mpViewShell( pViewShell ),
- mnIndex( nIndex )
+ScAccessiblePreviewTable::ScAccessiblePreviewTable(
+ const css::uno::Reference<css::accessibility::XAccessible>& rxParent,
+ ScPreviewShell* pViewShell, sal_Int32 nIndex)
+ : ImplInheritanceHelper(rxParent, AccessibleRole::TABLE)
+ , mpViewShell(pViewShell)
+ , mnIndex(nIndex)
{
if (mpViewShell)
mpViewShell->AddAccessibilityObject(*this);
@@ -97,26 +98,6 @@ void ScAccessiblePreviewTable::Notify( SfxBroadcaster& rBC,
const SfxHint& rHint
ScAccessibleContextBase::Notify(rBC, rHint);
}
-//===== XInterface =====================================================
-
-uno::Any SAL_CALL ScAccessiblePreviewTable::queryInterface( uno::Type const &
rType )
-{
- uno::Any aAny (ScAccessiblePreviewTableImpl::queryInterface(rType));
- return aAny.hasValue() ? aAny :
ScAccessibleContextBase::queryInterface(rType);
-}
-
-void SAL_CALL ScAccessiblePreviewTable::acquire()
- noexcept
-{
- ScAccessibleContextBase::acquire();
-}
-
-void SAL_CALL ScAccessiblePreviewTable::release()
- noexcept
-{
- ScAccessibleContextBase::release();
-}
-
//===== XAccessibleTable ================================================
sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowCount()
@@ -536,18 +517,6 @@ uno::Sequence<OUString> SAL_CALL
ScAccessiblePreviewTable::getSupportedServiceNa
return aSequence;
}
-//===== XTypeProvider ===================================================
-
-uno::Sequence< uno::Type > SAL_CALL ScAccessiblePreviewTable::getTypes()
-{
- return
comphelper::concatSequences(ScAccessiblePreviewTableImpl::getTypes(),
ScAccessibleContextBase::getTypes());
-}
-
-uno::Sequence<sal_Int8> SAL_CALL
ScAccessiblePreviewTable::getImplementationId()
-{
- return css::uno::Sequence<sal_Int8>();
-}
-
//==== internal =========================================================
OUString ScAccessiblePreviewTable::createAccessibleDescription()
diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx
b/sc/source/ui/inc/AccessiblePreviewTable.hxx
index 49f9b5183c0a..b54d61a33154 100644
--- a/sc/source/ui/inc/AccessiblePreviewTable.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx
@@ -21,17 +21,13 @@
#include "AccessibleContextBase.hxx"
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
-#include <cppuhelper/implbase1.hxx>
class ScPreviewShell;
class ScPreviewTableInfo;
-typedef cppu::ImplHelper1< css::accessibility::XAccessibleTable>
- ScAccessiblePreviewTableImpl;
-
-class ScAccessiblePreviewTable :
- public ScAccessibleContextBase,
- public ScAccessiblePreviewTableImpl
+class ScAccessiblePreviewTable
+ : public cppu::ImplInheritanceHelper<ScAccessibleContextBase,
+ css::accessibility::XAccessibleTable>
{
public:
ScAccessiblePreviewTable( const
css::uno::Reference<css::accessibility::XAccessible>& rxParent,
@@ -50,15 +46,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;
-
//===== XAccessibleTable ================================================
virtual sal_Int32 SAL_CALL getAccessibleRowCount() override;
@@ -105,13 +92,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;
-
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
override;
-
protected:
virtual OUString createAccessibleDescription() override;
virtual OUString createAccessibleName() override;
commit 61ed39eab97ad9204845c3b65a6ca1a63199ebb4
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Jun 5 10:56:58 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Jun 5 15:52:53 2025 +0200
sc a11y: Make clearer ScAccessiblePreviewTable is cell parent
Switch the ScAccessiblePreviewCell ctor param for parent
from the generic XAccessible to ScAccessiblePreviewTable
to make more obvious the the parent is always of that type.
Change-Id: Idfb26e0f99343a23ca7e0659cd88a0871fee43d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186204
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index 6e49a19981c3..a3bb02e5524a 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -40,12 +40,12 @@ using namespace ::com::sun::star::accessibility;
//===== internal ============================================================
-ScAccessiblePreviewCell::ScAccessiblePreviewCell( const
css::uno::Reference<css::accessibility::XAccessible>& rxParent,
- ScPreviewShell* pViewShell,
- const ScAddress& rCellAddress,
- sal_Int32 nIndex ) :
- ScAccessibleCellBase( rxParent, ( pViewShell ? &pViewShell->GetDocument()
: nullptr ), rCellAddress, nIndex ),
- mpViewShell( pViewShell )
+ScAccessiblePreviewCell::ScAccessiblePreviewCell(
+ const rtl::Reference<ScAccessiblePreviewTable>& rParent, ScPreviewShell*
pViewShell,
+ const ScAddress& rCellAddress, sal_Int32 nIndex)
+ : ScAccessibleCellBase(rParent, (pViewShell ? &pViewShell->GetDocument() :
nullptr),
+ rCellAddress, nIndex)
+ , mpViewShell(pViewShell)
{
if (mpViewShell)
mpViewShell->AddAccessibilityObject(*this);
diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx
b/sc/source/ui/inc/AccessiblePreviewCell.hxx
index 9c128c844f4b..c0911537d195 100644
--- a/sc/source/ui/inc/AccessiblePreviewCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx
@@ -20,6 +20,7 @@
#pragma once
#include "AccessibleCellBase.hxx"
+#include "AccessiblePreviewTable.hxx"
class ScPreviewShell;
@@ -31,10 +32,9 @@ namespace accessibility
class ScAccessiblePreviewCell : public ScAccessibleCellBase
{
public:
- //===== internal ========================================================
- ScAccessiblePreviewCell(
- const css::uno::Reference<css::accessibility::XAccessible>& rxParent,
- ScPreviewShell* pViewShell, const ScAddress& rCellAddress, sal_Int32
nIndex );
+ ScAccessiblePreviewCell(const rtl::Reference<ScAccessiblePreviewTable>&
rParent,
+ ScPreviewShell* pViewShell, const ScAddress&
rCellAddress,
+ sal_Int32 nIndex);
protected:
virtual ~ScAccessiblePreviewCell() override;
