svtools/source/control/accessibleruler.cxx | 16 ---------------- svtools/source/control/accessibleruler.hxx | 14 +------------- toolkit/inc/controls/table/AccessibleGridControl.hxx | 1 - 3 files changed, 1 insertion(+), 30 deletions(-)
New commits: commit 6af782556d2ada88d4e80e097bc11e9732a7aaae Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jun 20 11:14:19 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jun 20 21:22:30 2025 +0200 svtools ruler a11y: No longer implement XServiceInfo Nothing depends on the information provided by the interface and SvtRulerAccessible instances are created by directly calling the class ctor so there is no need to implement the XServiceInfo interface. Dropping the implementation also helps avoid a linker error on Windows related to multiple classes subclassing cppu::ImplInheritanceHelper<class comphelper::OAccessibleComponentHelper,class com::sun::star::lang::XServiceInfo> seen with upcoming commit Change-Id: Ib56a9ddb1c36356943c2dfd7a5705351ee43e9d9 Author: Michael Weghorn <[email protected]> Date: Mon May 26 12:24:52 2025 +0200 vcl a11y: Let OAccessibleComponentHelper implement XAccessible (Gerrit change [1], Windows CI log: [2]). [1] https://gerrit.libreoffice.org/c/core/+/185849/6 [2] https://ci.libreoffice.org/job/gerrit_windows/200107/console Change-Id: Id306320710a1718ff10536127427f3a5daf68559 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186755 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index 08240f4586a0..457debe1ae47 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -182,22 +182,6 @@ sal_Int32 SvtRulerAccessible::getBackground( ) return sal_Int32(mpRepr->GetControlBackground()); } -// XServiceInfo -OUString SAL_CALL SvtRulerAccessible::getImplementationName() -{ - return u"com.sun.star.comp.ui.SvtRulerAccessible"_ustr; -} - -sal_Bool SAL_CALL SvtRulerAccessible::supportsService( const OUString& sServiceName ) -{ - return cppu::supportsService( this, sServiceName ); -} - -Sequence< OUString > SAL_CALL SvtRulerAccessible::getSupportedServiceNames() -{ - return { u"com.sun.star.accessibility.AccessibleContext"_ustr }; -} - void SAL_CALL SvtRulerAccessible::disposing() { mpRepr = nullptr; // object dies with representation diff --git a/svtools/source/control/accessibleruler.hxx b/svtools/source/control/accessibleruler.hxx index 80ba155bc2a5..66079615c6b5 100644 --- a/svtools/source/control/accessibleruler.hxx +++ b/svtools/source/control/accessibleruler.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/interfacecontainer.h> #include <comphelper/accessiblecomponenthelper.hxx> #include <comphelper/compbase.hxx> @@ -35,7 +34,7 @@ class Ruler; class SvtRulerAccessible final : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, - css::accessibility::XAccessible, css::lang::XServiceInfo> + css::accessibility::XAccessible> { public: SvtRulerAccessible( @@ -88,17 +87,6 @@ public: virtual css::lang::Locale SAL_CALL getLocale() override; - //===== XServiceInfo ==================================================== - - virtual OUString SAL_CALL - getImplementationName() override; - - virtual sal_Bool SAL_CALL - supportsService( const OUString& sServiceName ) override; - - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() override; - protected: virtual css::awt::Rectangle implGetBounds() override; commit b368258526727d74f6815c2b2f7741f2aca9fb06 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jun 20 11:10:21 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jun 20 21:22:23 2025 +0200 grid control a11y: Drop misleading comment AccessibleGridControl::getAccessibleRole returns AccessibleRole::PANEL, not AccessibleRole::TABLE. Drop the misleading /** @return The role of this object (a table). */ comment. Change-Id: Ic9a2e9810fd10caf2e54d7aca2f26556a33634e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186754 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/toolkit/inc/controls/table/AccessibleGridControl.hxx b/toolkit/inc/controls/table/AccessibleGridControl.hxx index 47bbd611e0f0..034d0b730528 100644 --- a/toolkit/inc/controls/table/AccessibleGridControl.hxx +++ b/toolkit/inc/controls/table/AccessibleGridControl.hxx @@ -49,7 +49,6 @@ namespace accessibility { virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 nChildIndex ) override; - /** @return The role of this object (a table). */ virtual sal_Int16 SAL_CALL getAccessibleRole() override; // XAccessibleComponent ---------------------------------------------------
