qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java | 2 - sc/source/ui/Accessibility/AccessibleCellBase.cxx | 7 --- sc/source/ui/Accessibility/AccessibleContextBase.cxx | 17 -------- sc/source/ui/Accessibility/AccessibleDocument.cxx | 8 ---- sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 7 --- sc/source/ui/Accessibility/AccessibleEditObject.cxx | 7 --- sc/source/ui/Accessibility/AccessiblePageHeader.cxx | 7 --- sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 8 ---- sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 7 --- sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 7 --- sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 7 --- sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 7 --- sc/source/ui/Accessibility/AccessibleTableBase.cxx | 7 --- sc/source/ui/inc/AccessibleCellBase.hxx | 7 --- sc/source/ui/inc/AccessibleContextBase.hxx | 21 ----------- sc/source/ui/inc/AccessibleDocument.hxx | 7 --- sc/source/ui/inc/AccessibleDocumentPagePreview.hxx | 6 --- sc/source/ui/inc/AccessibleEditObject.hxx | 7 --- sc/source/ui/inc/AccessiblePageHeader.hxx | 4 -- sc/source/ui/inc/AccessiblePageHeaderArea.hxx | 7 --- sc/source/ui/inc/AccessiblePreviewCell.hxx | 4 -- sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx | 4 -- sc/source/ui/inc/AccessiblePreviewTable.hxx | 4 -- sc/source/ui/inc/AccessibleSpreadsheet.hxx | 7 --- sc/source/ui/inc/AccessibleTableBase.hxx | 7 --- sw/source/core/access/acccell.cxx | 5 -- sw/source/core/access/acccell.hxx | 6 --- sw/source/core/access/acccontext.cxx | 10 ----- sw/source/core/access/acccontext.hxx | 15 ------- sw/source/core/access/accdoc.cxx | 5 -- sw/source/core/access/accdoc.hxx | 6 --- sw/source/core/access/accembedded.cxx | 5 -- sw/source/core/access/accembedded.hxx | 6 --- sw/source/core/access/accfootnote.cxx | 8 ---- sw/source/core/access/accfootnote.hxx | 6 --- sw/source/core/access/accgraphic.cxx | 5 -- sw/source/core/access/accgraphic.hxx | 6 --- sw/source/core/access/accheaderfooter.cxx | 13 ------ sw/source/core/access/accheaderfooter.hxx | 5 -- sw/source/core/access/accpage.cxx | 7 --- sw/source/core/access/accpage.hxx | 4 -- sw/source/core/access/accpara.cxx | 7 --- sw/source/core/access/accpara.hxx | 6 --- sw/source/core/access/accpreview.cxx | 8 ---- sw/source/core/access/accpreview.hxx | 7 --- sw/source/core/access/acctable.cxx | 14 ------- sw/source/core/access/acctable.hxx | 14 ------- sw/source/core/access/acctextframe.cxx | 5 -- sw/source/core/access/acctextframe.hxx | 7 --- 49 files changed, 2 insertions(+), 361 deletions(-)
New commits: commit e5494f0b56a4835a45591bd381d8ed13ef540db7 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Jun 24 12:50:23 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Jun 25 07:40:23 2025 +0200 sc a11y: Stop implementing XServiceInfo The only service that was implemented in Calc a11y classes was "com.sun.star.accessibility.AccessibleContext". However, that service isn't actually relevant for any of the Calc a11y classes, because all information is provided by (and accessed via) the XAccessibleContext interface, not the service. Therefore, stop explicitly reporting that service as supported and stop implementing the XServiceInfo interface. The implementation names that were used also aren't relevant. (For some a11y classes in other modules, the Java a11y tests currently still rely on particular implementation names being used, but that's irrelevant for sc.) No longer implementing XServiceInfo also helps avoid linker issues seen 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]). A search in Google and on Ask [3] didn't give any results that would suggest explicitly reporting this unpublished service as supported in Calc a11y classes could be relevant for third party code. [1] https://gerrit.libreoffice.org/c/core/+/185849/6 [2] https://ci.libreoffice.org/job/gerrit_windows/200107/console [3] https://ask.libreoffice.org/ Change-Id: I22a469ff6b86c01307255677ad6f645750a0f9c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186889 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 45b6cd6808f8..dce3ff27ab62 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -240,13 +240,6 @@ uno::Any SAL_CALL return uno::Any(); } - //===== XServiceInfo ==================================================== - -OUString SAL_CALL ScAccessibleCellBase::getImplementationName() -{ - return u"ScAccessibleCellBase"_ustr; -} - bool ScAccessibleCellBase::IsEditable(sal_Int64 nParentStates) { bool bEditable = nParentStates & AccessibleStateType::EDITABLE; diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index e15462ee4494..b6620e59f063 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -237,23 +237,6 @@ lang::Locale SAL_CALL throw IllegalAccessibleComponentStateException (); } -// XServiceInfo -OUString SAL_CALL ScAccessibleContextBase::getImplementationName() -{ - return u"ScAccessibleContextBase"_ustr; -} - -sal_Bool SAL_CALL ScAccessibleContextBase::supportsService(const OUString& sServiceName) -{ - return cppu::supportsService(this, sServiceName); -} - -uno::Sequence< OUString> SAL_CALL - ScAccessibleContextBase::getSupportedServiceNames() -{ - return {u"com.sun.star.accessibility.AccessibleContext"_ustr}; -} - OUString ScAccessibleContextBase::createAccessibleDescription() { diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index e57bff6285a6..08419e24281d 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1878,14 +1878,6 @@ void SAL_CALL mpViewShell->Unmark(); } - //===== XServiceInfo ==================================================== - -OUString SAL_CALL - ScAccessibleDocument::getImplementationName() -{ - return u"ScAccessibleDocument"_ustr; -} - ///===== IAccessibleViewForwarder ======================================== tools::Rectangle ScAccessibleDocument::GetVisibleArea_Impl() diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index d1de425b7d44..e6bbd996a15c 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1420,13 +1420,6 @@ sal_Int64 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleStateSet() return nStateSet; } - //===== XServiceInfo ==================================================== - -OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName() -{ - return u"ScAccessibleDocumentPagePreview"_ustr; -} - OUString ScAccessibleDocumentPagePreview::createAccessibleDescription() { return STR_ACC_PREVIEWDOC_DESCR; diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index c51cebe64516..f0b377e82b8a 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -298,13 +298,6 @@ void SAL_CALL ScAccessibleContextBase::removeAccessibleEventListener(xListener); } - //===== XServiceInfo ==================================================== - -OUString SAL_CALL ScAccessibleEditObject::getImplementationName() -{ - return u"ScAccessibleEditObject"_ustr; -} - bool ScAccessibleEditObject::IsDefunc(sal_Int64 nParentStates) { return ScAccessibleContextBase::IsDefunc() || !getAccessibleParent().is() || diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index ee2c54098c26..d11b2a564a53 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -263,13 +263,6 @@ sal_Int64 SAL_CALL ScAccessiblePageHeader::getAccessibleStateSet() return nStateSet; } -//===== XServiceInfo ==================================================== - -OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() -{ - return u"ScAccessiblePageHeader"_ustr; -} - OUString ScAccessiblePageHeader::createAccessibleDescription() { OUString sDesc(mbHeader ? STR_ACC_HEADER_DESCR : STR_ACC_FOOTER_DESCR); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 46642865e45d..4e48a323470c 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -151,14 +151,6 @@ sal_Int64 SAL_CALL ScAccessiblePageHeaderArea::getAccessibleStateSet() return nStateSet; } -// XServiceInfo - -OUString SAL_CALL - ScAccessiblePageHeaderArea::getImplementationName() -{ - return u"ScAccessiblePageHeaderArea"_ustr; -} - OUString ScAccessiblePageHeaderArea::createAccessibleDescription() { OUString sDesc; diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 4c5a14167399..f1a9fa76ed34 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -166,13 +166,6 @@ sal_Int64 SAL_CALL ScAccessiblePreviewCell::getAccessibleStateSet() return nStateSet; } -//===== XServiceInfo ==================================================== - -OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() -{ - return u"ScAccessiblePreviewCell"_ustr; -} - AbsoluteScreenPixelRectangle ScAccessiblePreviewCell::GetBoundingBoxOnScreen() { tools::Rectangle aCellRect; diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index bf3aafc8da2e..2605c250c7b9 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -233,13 +233,6 @@ sal_Int64 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleStateSet() return nStateSet; } -//===== XServiceInfo ==================================================== - -OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() -{ - return u"ScAccessiblePreviewHeaderCell"_ustr; -} - AbsoluteScreenPixelRectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() { tools::Rectangle aCellRect; diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index d367e09406bf..0682320d4cf9 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -497,13 +497,6 @@ sal_Int64 SAL_CALL ScAccessiblePreviewTable::getAccessibleStateSet() return nStateSet; } -//===== XServiceInfo ==================================================== - -OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() -{ - return u"ScAccessiblePreviewTable"_ustr; -} - OUString ScAccessiblePreviewTable::createAccessibleDescription() { return STR_ACC_TABLE_DESCR; diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 39f6ee36bc4e..29afdde4284b 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -1292,13 +1292,6 @@ void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange) } }*/ - //===== XServiceInfo ==================================================== - -OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName() -{ - return u"ScAccessibleSpreadsheet"_ustr; -} - AbsoluteScreenPixelRectangle ScAccessibleSpreadsheet::GetBoundingBoxOnScreen() { AbsoluteScreenPixelRectangle aRect; diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index 5652cd3977c4..1075d0fd17aa 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -374,13 +374,6 @@ void SAL_CALL ScAccessibleTableBase::deselectAccessibleChild( sal_Int64 /* nSele { } - //===== XServiceInfo ==================================================== - -OUString SAL_CALL ScAccessibleTableBase::getImplementationName() -{ - return u"ScAccessibleTableBase"_ustr; -} - void ScAccessibleTableBase::CommitTableModelChange(sal_Int32 nStartRow, sal_Int32 nStartCol, sal_Int32 nEndRow, sal_Int32 nEndCol, sal_uInt16 nId) { AccessibleTableModelChange aModelChange; diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 8e9470cc9158..c14d3f644d89 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -78,13 +78,6 @@ public: virtual css::uno::Any SAL_CALL getMinimumIncrement( ) override; - ///===== XServiceInfo ==================================================== - - /** Returns an identifier for the implementation of this object. - */ - virtual OUString SAL_CALL - getImplementationName() override; - protected: ScAddress maCellAddress; diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 56aabd2bd15c..0824eba867e0 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/accessiblecomponenthelper.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> @@ -37,7 +36,7 @@ class AbsoluteScreenPixelRectangle; class ScAccessibleContextBase : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, - css::accessibility::XAccessible, css::lang::XServiceInfo>, + css::accessibility::XAccessible>, public SfxListener { @@ -112,24 +111,6 @@ public: virtual css::lang::Locale SAL_CALL getLocale() override; - ///===== XServiceInfo ==================================================== - - /** Returns an identifier for the implementation of this object. - */ - virtual OUString SAL_CALL - getImplementationName() override; - - /** Return whether the specified service is supported by this class. - */ - virtual sal_Bool SAL_CALL - supportsService(const OUString& sServiceName) override; - - /** Returns a list of all supported services. In this case that is just - the AccessibleContext and Accessible service. - */ - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() override; - protected: /// Return this object's description. /// diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index 1d6b6213ab92..3f2be1c51751 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -124,13 +124,6 @@ public: virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; - ///===== XServiceInfo =================================================== - - /** Returns an identifier for the implementation of this object. - */ - virtual OUString SAL_CALL - getImplementationName() override; - ///===== IAccessibleViewForwarder ======================================== /** Returns the area of the underlying document that is visible in the diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index a228a4d04b44..cad1b49a80f4 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -73,12 +73,6 @@ public: virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; virtual OUString SAL_CALL getAccessibleName() override; - ///===== XServiceInfo ==================================================== - - /** Returns an identifier for the implementation of this object. - */ - virtual OUString SAL_CALL - getImplementationName() override; protected: /// Return this object's description. diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 9dae9219ac2a..b996a533b7c0 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -146,13 +146,6 @@ public: removeAccessibleEventListener( const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener) override; - ///===== XServiceInfo ==================================================== - - /** Returns an identifier for the implementation of this object. - */ - virtual OUString SAL_CALL - getImplementationName() override; - private: std::unique_ptr<accessibility::AccessibleTextHelper> mpTextHelper; EditView* mpEditView; diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index f13cf00ca491..12f2f842cc3d 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -60,10 +60,6 @@ public: virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; - //===== XServiceInfo ==================================================== - - virtual OUString SAL_CALL getImplementationName() override; - protected: virtual OUString createAccessibleDescription() override; virtual OUString createAccessibleName() override; diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index 4be94b020ffe..00fd1f1677b4 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -72,13 +72,6 @@ public: virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; - ///===== XServiceInfo ==================================================== - - /** Returns an identifier for the implementation of this object. - */ - virtual OUString SAL_CALL - getImplementationName() override; - protected: virtual OUString createAccessibleDescription() override; virtual OUString createAccessibleName() override; diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index 304f71f80707..62bf70bd3632 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -64,10 +64,6 @@ public: virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; - //===== XServiceInfo ==================================================== - - virtual OUString SAL_CALL getImplementationName() override; - protected: virtual AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen() override; virtual tools::Rectangle GetBoundingBox() override; diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index bf8867117f10..2a903644983d 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -75,10 +75,6 @@ public: virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; - //===== XServiceInfo ==================================================== - - virtual OUString SAL_CALL getImplementationName() override; - protected: virtual OUString createAccessibleDescription() override; virtual OUString createAccessibleName() override; diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index 014fe8be6b91..3cb5eb3c5e72 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -87,10 +87,6 @@ public: virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; - //===== XServiceInfo ==================================================== - - virtual OUString SAL_CALL getImplementationName() override; - protected: virtual OUString createAccessibleDescription() override; virtual OUString createAccessibleName() override; diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 48bca8633a3c..5fddc2e324de 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -179,13 +179,6 @@ private: virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nChildIndex ) override; - ///===== XServiceInfo ==================================================== - - /** Returns an identifier for the implementation of this object. - */ - virtual OUString SAL_CALL - getImplementationName() override; - //===== XAccessibleTableSelection ============================================ virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) override; diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index bca85765909a..96196718ded0 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -185,13 +185,6 @@ public: virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; - ///===== XServiceInfo =================================================== - - /** Returns an identifier for the implementation of this object. - */ - virtual OUString SAL_CALL - getImplementationName() override; - protected: /// contains the range of the table, because it could be a subrange of the complete table ScRange maRange; commit b555ea5f8b42a48a1a3e37e927fa6a548bd3d082 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Jun 24 11:56:06 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Jun 25 07:40:16 2025 +0200 java a11y test: Drop unnecessary AccessibilityTools call The result is ignored anyway. Change-Id: Ia7cfeb448cfeb88dbe6c19e81c83dacdb016766d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186888 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java index 8f55793f09e5..cf87899db051 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java @@ -77,8 +77,6 @@ public class AccessibleControlShape extends TestCase { XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE); - AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "Button"); commit 568d94e6a95d2c39e298f1b77dfdf799b4dc45a6 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Jun 24 11:24:42 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Jun 25 07:40:07 2025 +0200 sw a11y: Stop implementing XServiceInfo Now that the only service that was implemented by Writer a11y classes was dropped in previous commit Change-Id: I7432d4a524ceaf404b1a2673d8bb6cdb142baf25 Author: Michael Weghorn <[email protected]> Date: Tue Jun 24 10:41:11 2025 +0200 [API CHANGE]: a11y: Drop com.sun.star.accessibility.Accessible , also stop implementing XServiceInfo. The implementation names aren't used anywhere. Change-Id: I9d265e54cfe30f2eca43fa1aaa40c05195269d90 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186883 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index a4875bf923e5..956aa625d086 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -228,11 +228,6 @@ OUString SAL_CALL SwAccessibleCell::getAccessibleDescription() return GetName(); } -OUString SAL_CALL SwAccessibleCell::getImplementationName() -{ - return u"com.sun.star.comp.Writer.SwAccessibleCellView"_ustr; -} - void SwAccessibleCell::Dispose(bool bRecursive, bool bCanSkipInvisible) { const SwFrame *pParent = GetParent( SwAccessibleChild(GetFrame()), IsInPagePreview() ); diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index 41afe8ac8167..aae9827d0f99 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -65,12 +65,6 @@ public: virtual OUString SAL_CALL getAccessibleDescription() override; - // XServiceInfo - - // Returns an identifier for the implementation of this object. - virtual OUString SAL_CALL - getImplementationName() override; - virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override; virtual void InvalidatePosOrSize( const SwRect& rFrame ) override; diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index b30bea0cdebd..55a5d9159bb6 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -974,16 +974,6 @@ sal_Int32 SAL_CALL SwAccessibleContext::getBackground() return sal_Int32(COL_WHITE); } -uno::Sequence<OUString> SAL_CALL SwAccessibleContext::getSupportedServiceNames() -{ - return {}; -} - -sal_Bool SAL_CALL SwAccessibleContext::supportsService (const OUString& ServiceName) -{ - return cppu::supportsService(this, ServiceName); -} - void SwAccessibleContext::DisposeShape( const SdrObject *pObj, ::accessibility::AccessibleShape *pAccImpl ) { diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 0386f87fe38d..911598414425 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <com/sun/star/accessibility/XAccessibleContext3.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase.hxx> #include <unotools/resmgr.hxx> @@ -45,9 +44,7 @@ class SwAccessibleContext : css::accessibility::XAccessibleContext, css::accessibility::XAccessibleContext3, css::accessibility::XAccessibleComponent, - css::accessibility::XAccessibleEventBroadcaster, - css::lang::XServiceInfo - >, + css::accessibility::XAccessibleEventBroadcaster>, public SwAccessibleFrame { // The implements for the XAccessibleSelection interface has been @@ -275,16 +272,6 @@ public: virtual sal_Int32 SAL_CALL getForeground() override; virtual sal_Int32 SAL_CALL getBackground() override; - // XServiceInfo - - // getImplementationName() is abstract - - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; - - /** Return whether the specified service is supported by this class. */ - virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) override; - // thread safe C++ interface // The object is not visible any longer and should be destroyed diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index fb22ad61bd42..867b653728c7 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -358,11 +358,6 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve } } -OUString SAL_CALL SwAccessibleDocument::getImplementationName() -{ - return u"com.sun.star.comp.Writer.SwAccessibleDocumentView"_ustr; -} - // XAccessibleSelection void SwAccessibleDocument::selectAccessibleChild( diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index 45953d0c1ff0..88b647d0b5f5 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -98,12 +98,6 @@ public: DECL_LINK( WindowChildEventListener, VclWindowEvent&, void ); - // XServiceInfo - - // Returns an identifier for the implementation of this object. - virtual OUString SAL_CALL - getImplementationName() override; - // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index ebf9c26a0e0e..4ba8a40cc236 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -66,11 +66,6 @@ void SAL_CALL SwAccessibleNoTextFrame::release (); } -OUString SAL_CALL SwAccessibleEmbeddedObject::getImplementationName() -{ - return u"com.sun.star.comp.Writer.SwAccessibleEmbeddedObject"_ustr; -} - // XAccessibleExtendedAttributes OUString SAL_CALL SwAccessibleEmbeddedObject::getExtendedAttributes() { diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx index 07ec87cbf93c..c60ea4cc7447 100644 --- a/sw/source/core/access/accembedded.hxx +++ b/sw/source/core/access/accembedded.hxx @@ -47,12 +47,6 @@ public: release() noexcept override; - // XServiceInfo - - // Returns an identifier for the implementation of this object. - virtual OUString SAL_CALL - getImplementationName() override; - // XAccessibleExtendedAttributes virtual OUString SAL_CALL getExtendedAttributes() override; }; diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index c655554fc5b4..b95f4441fc4d 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -81,14 +81,6 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription() return GetResource(pResId, &sArg); } -OUString SAL_CALL SwAccessibleFootnote::getImplementationName() -{ - if( AccessibleRole::END_NOTE == GetRole() ) - return u"com.sun.star.comp.Writer.SwAccessibleEndnoteView"_ustr; - else - return u"com.sun.star.comp.Writer.SwAccessibleFootnoteView"_ustr; -} - bool SwAccessibleFootnote::IsEndnote( const SwFootnoteFrame *pFootnoteFrame ) { const SwTextFootnote *pTextFootnote = pFootnoteFrame ->GetAttr(); diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx index 756e82db8c6d..494b09bddd30 100644 --- a/sw/source/core/access/accfootnote.hxx +++ b/sw/source/core/access/accfootnote.hxx @@ -41,12 +41,6 @@ public: virtual OUString SAL_CALL getAccessibleDescription() override; - // XServiceInfo - - /** Returns an identifier for the implementation of this object. */ - virtual OUString SAL_CALL - getImplementationName() override; - static bool IsEndnote( const SwFootnoteFrame *pFrame ); }; diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx index 03bf9a82c896..782b40bcef77 100644 --- a/sw/source/core/access/accgraphic.cxx +++ b/sw/source/core/access/accgraphic.cxx @@ -39,11 +39,6 @@ SwAccessibleGraphic::~SwAccessibleGraphic() { } -OUString SAL_CALL SwAccessibleGraphic::getImplementationName() -{ - return u"com.sun.star.comp.Writer.SwAccessibleGraphic"_ustr; -} - // Return this object's role. sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole() { diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx index 295f6b57729d..814a3c93d0dc 100644 --- a/sw/source/core/access/accgraphic.hxx +++ b/sw/source/core/access/accgraphic.hxx @@ -31,12 +31,6 @@ public: SwAccessibleGraphic(std::shared_ptr<SwAccessibleMap> const& pInitMap, const SwFlyFrame *pFlyFrame ); - // XServiceInfo - - /** Returns an identifier for the implementation of this object. */ - virtual OUString SAL_CALL - getImplementationName() override; - /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole() override; }; diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index d96c584b12bc..8cd80e4d9289 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -28,11 +28,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; -constexpr OUStringLiteral sImplementationNameHeader - = u"com.sun.star.comp.Writer.SwAccessibleHeaderView"; -constexpr OUStringLiteral sImplementationNameFooter - = u"com.sun.star.comp.Writer.SwAccessibleFooterView"; - SwAccessibleHeaderFooter::SwAccessibleHeaderFooter( std::shared_ptr<SwAccessibleMap> const& pInitMap, const SwHeaderFrame* pHdFrame ) : @@ -70,14 +65,6 @@ OUString SAL_CALL SwAccessibleHeaderFooter::getAccessibleDescription() return GetResource(pResId, &sArg); } -OUString SAL_CALL SwAccessibleHeaderFooter::getImplementationName() -{ - if( AccessibleRole::HEADER == GetRole() ) - return sImplementationNameHeader; - else - return sImplementationNameFooter; -} - sal_Int32 SAL_CALL SwAccessibleHeaderFooter::getBackground() { Reference< XAccessible > xParent = getAccessibleParent(); diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx index aab044045d6f..7528e7710315 100644 --- a/sw/source/core/access/accheaderfooter.hxx +++ b/sw/source/core/access/accheaderfooter.hxx @@ -41,11 +41,6 @@ public: /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription() override; - // XServiceInfo - - /** Returns an identifier for the implementation of this object. */ - virtual OUString SAL_CALL getImplementationName() override; - // XAccessibleComponent sal_Int32 SAL_CALL getBackground() override; }; diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index 63caa62dddde..6b1b17d6af7d 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -31,8 +31,6 @@ using namespace ::com::sun::star::accessibility; using uno::Sequence; -constexpr OUStringLiteral sImplementationName = u"com.sun.star.comp.Writer.SwAccessiblePageView"; - bool SwAccessiblePage::IsSelected() { return GetMap()->IsPageSelected( static_cast < const SwPageFrame * >( GetFrame() ) ); @@ -127,11 +125,6 @@ bool SwAccessiblePage::HasCursor() return m_bIsSelected; } -OUString SwAccessiblePage::getImplementationName( ) -{ - return sImplementationName; -} - OUString SwAccessiblePage::getAccessibleDescription( ) { ThrowIfDisposed(); diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index 6938b125a7b4..a9f7d98a88b4 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -58,10 +58,6 @@ public: virtual OUString SAL_CALL getAccessibleDescription() override; - // XServiceInfo - - virtual OUString SAL_CALL getImplementationName() override; - virtual bool HasCursor() override; // required by map to remember that object }; diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 4d3a3791b324..df7fdd5edce4 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -106,8 +106,6 @@ namespace com::sun::star::text { class XText; } -constexpr OUStringLiteral sImplementationName = u"com.sun.star.comp.Writer.SwAccessibleParagraphView"; - const SwTextFrame* SwAccessibleParagraph::GetTextFrame() const { const SwFrame* pFrame = GetFrame(); @@ -786,11 +784,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getBackground() return SwAccessibleContext::getBackground(); } -OUString SAL_CALL SwAccessibleParagraph::getImplementationName() -{ - return sImplementationName; -} - static uno::Sequence< OUString > const & getAttributeNames() { static uno::Sequence< OUString > const aNames diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index 2bfbed652966..035504fbc1e3 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -258,12 +258,6 @@ public: virtual sal_Int32 SAL_CALL getForeground() override; virtual sal_Int32 SAL_CALL getBackground() override; - // XServiceInfo - - // Returns an identifier for the implementation of this object. - virtual OUString SAL_CALL - getImplementationName() override; - // XAccessibleText virtual sal_Int32 SAL_CALL getCaretPosition() override; virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index 2399284e6556..d2f48af72229 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -21,9 +21,6 @@ #include <strings.hrc> #include "accpreview.hxx" -constexpr OUStringLiteral sImplementationName - = u"com.sun.star.comp.Writer.SwAccessibleDocumentPageView"; - using ::com::sun::star::uno::Sequence; SwAccessiblePreview::SwAccessiblePreview(std::shared_ptr<SwAccessibleMap> const& pMap) @@ -36,11 +33,6 @@ SwAccessiblePreview::~SwAccessiblePreview() { } -OUString SwAccessiblePreview::getImplementationName( ) -{ - return sImplementationName; -} - OUString SAL_CALL SwAccessiblePreview::getAccessibleDescription() { return GetResource( STR_ACCESS_PREVIEW_DOC_NAME ); diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx index 09f1a42d22b5..2b9fbabeb880 100644 --- a/sw/source/core/access/accpreview.hxx +++ b/sw/source/core/access/accpreview.hxx @@ -37,13 +37,6 @@ class SwAccessiblePreview : public SwAccessibleDocumentBase public: SwAccessiblePreview(std::shared_ptr<SwAccessibleMap> const& pMap); - // XServiceInfo - - /** Returns an identifier for the implementation of this object. - */ - virtual OUString SAL_CALL - getImplementationName() override; - OUString SAL_CALL getAccessibleDescription() override; OUString SAL_CALL getAccessibleName() override; virtual void InvalidateFocus_() override; diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index c49999f747df..4d7bdfbe6872 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -1059,11 +1059,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn( return nRet; } -OUString SAL_CALL SwAccessibleTable::getImplementationName() -{ - return u"com.sun.star.comp.Writer.SwAccessibleTableView"_ustr; -} - void SwAccessibleTable::InvalidatePosOrSize( const SwRect& rOldBox ) { SolarMutexGuard aGuard; @@ -1601,13 +1596,4 @@ uno::Reference< XAccessibleTable > return uno::Reference< XAccessibleTable >(); } -// XServiceInfo - -OUString SAL_CALL SwAccessibleTableColHeaders::getImplementationName() -{ - static constexpr OUStringLiteral sImplName - = u"com.sun.star.comp.Writer.SwAccessibleTableColumnHeadersView"; - return sImplName; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 8fb85fbec1a6..7a7cda419b3e 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -142,12 +142,6 @@ public: virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) override ; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) override; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) override; - // XServiceInfo - - /** Returns an identifier for the implementation of this object. - */ - virtual OUString SAL_CALL - getImplementationName() override; // C++ interface @@ -228,14 +222,6 @@ public: virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) override; - - // XServiceInfo - - /** Returns an identifier for the implementation of this object. - */ - virtual OUString SAL_CALL - getImplementationName() override; - }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index 1fa5381cf817..d231401e2c3b 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -226,11 +226,6 @@ OUString SAL_CALL SwAccessibleTextFrame::getAccessibleDescription() } -OUString SAL_CALL SwAccessibleTextFrame::getImplementationName() -{ - return u"com.sun.star.comp.Writer.SwAccessibleTextFrameView"_ustr; -} - // XAccessibleRelationSet SwFlyFrame* SwAccessibleTextFrame::getFlyFrame() const diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx index 599db7cc26e5..6e8d6ea0f026 100644 --- a/sw/source/core/access/acctextframe.hxx +++ b/sw/source/core/access/acctextframe.hxx @@ -73,13 +73,6 @@ public: virtual OUString SAL_CALL getAccessibleDescription() override; - // XServiceInfo - - /** Returns an identifier for the implementation of this object. - */ - virtual OUString SAL_CALL - getImplementationName() override; - // XAccessibleContext::getAccessibleRelationSet // text frame may have accessible relations to their
