ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

toolkit a11y: Stop declaring support for AccessibleContext service

Browse Source 
The com.sun.star.accessibility.AccessibleContext UNO service
is unnecessary and not really used for implementing a11y support,
apart from some a11y implementations declaring support for it.
What is relevant is the com.sun.star.accessibility.XAccessibleContext
interface instead.

Stop declaring support for the com.sun.star.accessibility.AccessibleContext
service in AccessibleGridControlBase (and drop related
XServiceInfo::getImplementationName overrides in subclasses),
in preparation of dropping the service altogether in an upcoming
commit.

Change-Id: I66e6390ad77e3ff0febfb335c312954815c6581c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/210400
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-09-03 09:20:35 +02:00
parent 2c58101a82
commit bd60022def
12 changed files with 1 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolkit/inc/controls/table/AccessibleGridControl.hxx
-7
View File
@@ -63,13 +63,6 @@ namespace accessibility {
/** Grabs the focus to the Grid Control. */
virtual void SAL_CALL grabFocus() override;
// XServiceInfo -----------------------------------------------------------
/** @return
The name of this class.
*/
virtual OUString SAL_CALL getImplementationName() override;
public:
AccessibleGridControl(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
toolkit/inc/controls/table/AccessibleGridControlBase.hxx
+1 -15
View File
@@ -28,7 +28,6 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
@@ -42,8 +41,7 @@ namespace accessibility {
/** The GridControl accessible objects inherit from this base class. It
implements basic functionality. */
class AccessibleGridControlBase
: public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::lang::XServiceInfo>
class AccessibleGridControlBase : public comphelper::OAccessible
{
public:
/** Constructor.
@@ -115,18 +113,6 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
// XServiceInfo
/** @return Whether the specified service is supported by this class. */
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
/** @return a list of all supported services. */
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
/* Derived classes have to implement:
- getImplementationName. */
// helper methods
/** @return The GridControl object type. */
toolkit/inc/controls/table/AccessibleGridControlHeader.hxx
-5
View File
@@ -106,11 +106,6 @@ public:
/** @return TRUE, if the specified cell is selected. */
virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
// XServiceInfo
/** @return The name of this class. */
virtual OUString SAL_CALL getImplementationName() override;
private:
/** Returns the specified row or column. Uses one of the parameters,
depending on object type.
toolkit/inc/controls/table/AccessibleGridControlHeaderCell.hxx
-5
View File
@@ -44,11 +44,6 @@ namespace accessibility
/** Grabs the focus to the GridControl. */
virtual void SAL_CALL grabFocus() override;
/** @return
The name of this class.
*/
virtual OUString SAL_CALL getImplementationName() override;
/** Return a bitset of states of the current object.
*/
sal_Int64 implCreateStateSet() override;
toolkit/inc/controls/table/AccessibleGridControlTable.hxx
-5
View File
@@ -124,11 +124,6 @@ public:
/** Removes the specified row/column from the selection. */
virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
// XServiceInfo
/** @return The name of this class. */
virtual OUString SAL_CALL getImplementationName() override;
// XComponent
virtual void SAL_CALL dispose() override;
toolkit/inc/controls/table/AccessibleGridControlTableCell.hxx
-5
View File
@@ -78,11 +78,6 @@ public:
/** @return The index of this object among the parent's children. */
virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
/** @return
The name of this class.
*/
virtual OUString SAL_CALL getImplementationName() override;
/** @return
The count of visible children.
*/
toolkit/source/controls/table/AccessibleGridControl.cxx
-6
View File
@@ -167,12 +167,6 @@ void SAL_CALL AccessibleGridControl::grabFocus()
m_aTable.GrabFocus();
}
// XServiceInfo ---------------------------------------------------------------
OUString SAL_CALL AccessibleGridControl::getImplementationName()
{
return u"com.sun.star.accessibility.AccessibleGridControl"_ustr;
}
// internal virtual methods ---------------------------------------------------
AbsoluteScreenPixelRectangle AccessibleGridControl::implGetBoundingBoxOnScreen()
toolkit/source/controls/table/AccessibleGridControlBase.cxx
-12
View File
@@ -124,18 +124,6 @@ lang::Locale SAL_CALL AccessibleGridControlBase::getLocale()
throw IllegalAccessibleComponentStateException();
}
// XServiceInfo
sal_Bool SAL_CALL AccessibleGridControlBase::supportsService(
const OUString& rServiceName )
{
return cppu::supportsService(this, rServiceName);
}
Sequence< OUString > SAL_CALL AccessibleGridControlBase::getSupportedServiceNames()
{
return { u"com.sun.star.accessibility.AccessibleContext"_ustr };
}
// internal virtual methods
bool AccessibleGridControlBase::implIsShowing()
toolkit/source/controls/table/AccessibleGridControlHeader.cxx
-7
View File
@@ -165,13 +165,6 @@ sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleSelected(
return false;
}
// XServiceInfo ---------------------------------------------------------------
OUString SAL_CALL AccessibleGridControlHeader::getImplementationName()
{
return u"com.sun.star.accessibility.AccessibleGridControlHeader"_ustr;
}
// internal virtual methods ---------------------------------------------------
AbsoluteScreenPixelRectangle AccessibleGridControlHeader::implGetBoundingBoxOnScreen()
toolkit/source/controls/table/AccessibleGridControlHeaderCell.cxx
-8
View File
@@ -90,14 +90,6 @@ void SAL_CALL AccessibleGridControlHeaderCell::grabFocus()
{
}
/** @return
The name of this class.
*/
OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName()
{
return u"com.sun.star.accessibility.AccessibleGridControlHeaderCell"_ustr;
}
AbsoluteScreenPixelRectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen()
{
AbsoluteScreenPixelRectangle aGridRect( m_aTable.GetWindowExtentsAbsolute() );
toolkit/source/controls/table/AccessibleGridControlTable.cxx
-7
View File
@@ -270,13 +270,6 @@ void SAL_CALL AccessibleGridControlTable::deselectAccessibleChild(
ensureAlive();
}
// XServiceInfo ---------------------------------------------------------------
OUString SAL_CALL AccessibleGridControlTable::getImplementationName()
{
return u"com.sun.star.accessibility.AccessibleGridControlTable"_ustr;
}
void AccessibleGridControlTable::dispose()
{
for (rtl::Reference<AccessibleGridControlTableCell>& rxCell : m_aCellVector)
toolkit/source/controls/table/AccessibleGridControlTableCell.cxx
-8
View File
@@ -123,14 +123,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableCell::getIndexAtPoint(const css::aw
return m_aTable.GetIndexForPoint(vcl::unohelper::ConvertToVCLPoint(_aPoint));
}
/** @return
The name of this class.
*/
OUString SAL_CALL AccessibleGridControlTableCell::getImplementationName()
{
return u"com.sun.star.accessibility.AccessibleGridControlTableCell"_ustr;
}
/** @return The count of visible children. */
sal_Int64 SAL_CALL AccessibleGridControlTableCell::getAccessibleChildCount() { return 0; }