toolkit/inc/controls/table/AccessibleGridControlTable.hxx | 17 +------
toolkit/source/controls/table/AccessibleGridControlTable.cxx | 25 +----------
2 files changed, 6 insertions(+), 36 deletions(-)
New commits:
commit a8ec21adf255b70bb6eeb0a1717190df303d8b26
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Jan 27 19:20:47 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Jan 27 22:25:11 2025 +0100
uno grid a11y: Use ImplInheritanceHelper
Change-Id: Ie60417bd84f1ed1378da987f012cacad796ea0dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180805
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/toolkit/inc/controls/table/AccessibleGridControlTable.hxx
b/toolkit/inc/controls/table/AccessibleGridControlTable.hxx
index 51a392149311..e9e29fc40e89 100644
--- a/toolkit/inc/controls/table/AccessibleGridControlTable.hxx
+++ b/toolkit/inc/controls/table/AccessibleGridControlTable.hxx
@@ -29,13 +29,11 @@
namespace accessibility {
-
-typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleSelection >
- AccessibleGridControlTableSelectionImplHelper;
/** This class represents the accessible object of the data table of a
Grid control. */
-class AccessibleGridControlTable final : public AccessibleGridControlTableBase,
- public
AccessibleGridControlTableSelectionImplHelper
+class AccessibleGridControlTable final
+ : public cppu::ImplInheritanceHelper<AccessibleGridControlTableBase,
+
css::accessibility::XAccessibleSelection>
{
public:
AccessibleGridControlTable(
@@ -125,16 +123,7 @@ 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/toolkit/source/controls/table/AccessibleGridControlTable.cxx
b/toolkit/source/controls/table/AccessibleGridControlTable.cxx
index 51e8faf8d443..0f4435bf5cf1 100644
--- a/toolkit/source/controls/table/AccessibleGridControlTable.cxx
+++ b/toolkit/source/controls/table/AccessibleGridControlTable.cxx
@@ -38,11 +38,9 @@ using namespace ::vcl;
namespace accessibility {
-
-AccessibleGridControlTable::AccessibleGridControlTable(
- const Reference< XAccessible >& rxParent,
- svt::table::TableControl& rTable) :
- AccessibleGridControlTableBase(rxParent, rTable,
AccessibleTableControlObjType::TABLE)
+AccessibleGridControlTable::AccessibleGridControlTable(const
Reference<XAccessible>& rxParent,
+
svt::table::TableControl& rTable)
+ : ImplInheritanceHelper(rxParent, rTable,
AccessibleTableControlObjType::TABLE)
{
}
@@ -271,24 +269,7 @@ void SAL_CALL
AccessibleGridControlTable::deselectAccessibleChild(
ensureAlive();
}
-// XInterface -----------------------------------------------------------------
-Any SAL_CALL AccessibleGridControlTable::queryInterface( const uno::Type&
rType )
-{
- Any aAny( AccessibleGridControlTableBase::queryInterface( rType ) );
- return aAny.hasValue() ?
- aAny : AccessibleGridControlTableSelectionImplHelper::queryInterface(
rType );
-}
-
-void SAL_CALL AccessibleGridControlTable::acquire() noexcept
-{
- AccessibleGridControlTableBase::acquire();
-}
-
-void SAL_CALL AccessibleGridControlTable::release() noexcept
-{
- AccessibleGridControlTableBase::release();
-}
// XServiceInfo ---------------------------------------------------------------
OUString SAL_CALL AccessibleGridControlTable::getImplementationName()
