dbaccess/source/ui/querydesign/TableWindowAccess.cxx | 3 editeng/source/accessibility/AccessibleContextBase.cxx | 1 offapi/UnoApi_offapi.mk | 1 offapi/com/sun/star/accessibility/Accessible.idl | 46 --------------- sc/source/ui/Accessibility/AccessibleContextBase.cxx | 3 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 1 svx/source/accessibility/GraphCtlAccessibleContext.cxx | 3 sw/source/core/access/acccell.cxx | 5 - sw/source/core/access/acccell.hxx | 3 sw/source/core/access/acccontext.cxx | 5 + sw/source/core/access/acccontext.hxx | 6 - sw/source/core/access/accdoc.cxx | 5 - sw/source/core/access/accdoc.hxx | 3 sw/source/core/access/accembedded.cxx | 5 - sw/source/core/access/accembedded.hxx | 3 sw/source/core/access/accfootnote.cxx | 5 - sw/source/core/access/accfootnote.hxx | 3 sw/source/core/access/accgraphic.cxx | 5 - sw/source/core/access/accgraphic.hxx | 3 sw/source/core/access/accheaderfooter.cxx | 5 - sw/source/core/access/accheaderfooter.hxx | 2 sw/source/core/access/accpage.cxx | 5 - sw/source/core/access/accpage.hxx | 2 sw/source/core/access/accpara.cxx | 5 - sw/source/core/access/accpara.hxx | 3 sw/source/core/access/accpreview.cxx | 5 - sw/source/core/access/accpreview.hxx | 3 sw/source/core/access/acctable.cxx | 5 - sw/source/core/access/acctable.hxx | 3 sw/source/core/access/acctextframe.cxx | 5 - sw/source/core/access/acctextframe.hxx | 3 31 files changed, 11 insertions(+), 144 deletions(-)
New commits: commit 8481f7d925102d551b0b6f97062c85fbde594c89 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Jun 24 10:41:11 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Jun 25 07:40:00 2025 +0200 [API CHANGE]: a11y: Drop com.sun.star.accessibility.Accessible Drop the unpublished service "com.sun.star.accessibility.Accessible" because it's unused internally. As the doc in the IDL file says: > <p>Service <code>Accessible</code> is just a wrapper for the interface > <code>XAccessible</code>. See the interface's documentation for more > information.</p> That wrapper isn't needed. This is one step towards dropping the XServiceInfo implementation from a11y classes, which will also help 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] gave one result that looks relevant/where this service is used: [4] It was originally added in commit [5] commit 3f227e8755954e30abf9eb2cde6e4613514e4958 Author: Zev Spitz <[email protected]> Date: Sun Sep 10 09:20:55 2017 +0200 Type definitions for LibreOffice, via Automation , which doesn't explain whether/why the particular use of the Accessible service was chosen there, i.e. whether this is actually of relevance. I've created an issue/discussion to make developers of that project aware: [6] Stopping to implement XServiceInfo in SwAccessibleContext and subclasses will be done in a separate upcoming commit, now that the only service implemented by them has been dropped. [1] https://gerrit.libreoffice.org/c/core/+/185849/6 [2] https://ci.libreoffice.org/job/gerrit_windows/200107/console [3] https://ask.libreoffice.org/ [4] https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/activex-libreoffice/activex-libreoffice-tests.ts [5] https://github.com/DefinitelyTyped/DefinitelyTyped/commit/3f227e8755954e30abf9eb2cde6e4613514e4958 [6] https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/73096 Change-Id: I7432d4a524ceaf404b1a2673d8bb6cdb142baf25 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186881 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index 63cdb0a3b3a5..1c524c27a82e 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -59,8 +59,7 @@ namespace dbaui } Sequence< OUString > SAL_CALL OTableWindowAccess::getSupportedServiceNames() { - return { u"com.sun.star.accessibility.Accessible"_ustr, - u"com.sun.star.accessibility.AccessibleContext"_ustr }; + return { u"com.sun.star.accessibility.AccessibleContext"_ustr }; } // XAccessibleContext sal_Int64 SAL_CALL OTableWindowAccess::getAccessibleChildCount( ) diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index bd8d689c89d2..e0cb527900bb 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -328,7 +328,6 @@ uno::Sequence< OUString > SAL_CALL AccessibleContextBase::getSupportedServiceNames() { return { - u"com.sun.star.accessibility.Accessible"_ustr, u"com.sun.star.accessibility.AccessibleContext"_ustr}; } diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index b381d2be328f..cba7d7cac539 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -479,7 +479,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/xml/xslt,\ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/accessibility,\ - Accessible \ AccessibleContext \ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/awt,\ diff --git a/offapi/com/sun/star/accessibility/Accessible.idl b/offapi/com/sun/star/accessibility/Accessible.idl deleted file mode 100644 index 84e693724af3..000000000000 --- a/offapi/com/sun/star/accessibility/Accessible.idl +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -module com { module sun { module star { module accessibility { - - interface XAccessible; - -/** Every class has to support this service in order to be accessible. - - <p>It provides the means to derive a XAccessibleContext - object--which may but usually is not the same object as the object that - supports the XAccessible interface--that provides the - actual information that is needed to make it accessible.</p> - - <p>Service <code>Accessible</code> is just a wrapper for the interface - <code>XAccessible</code>. See the interface's documentation for more - information.</p> - - @see XAccessible - - @since OOo 1.1.2 -*/ -service Accessible -{ - interface XAccessible; -}; - -}; }; }; }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index f38b50b2e577..e15462ee4494 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -251,8 +251,7 @@ sal_Bool SAL_CALL ScAccessibleContextBase::supportsService(const OUString& sServ uno::Sequence< OUString> SAL_CALL ScAccessibleContextBase::getSupportedServiceNames() { - return {u"com.sun.star.accessibility.Accessible"_ustr, - u"com.sun.star.accessibility.AccessibleContext"_ustr}; + return {u"com.sun.star.accessibility.AccessibleContext"_ustr}; } OUString diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index fe6021702f94..85211a36f243 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -470,7 +470,6 @@ uno::Sequence< OUString> SAL_CALL ThrowIfDisposed (); return uno::Sequence<OUString> { - u"com.sun.star.accessibility.Accessible"_ustr, u"com.sun.star.accessibility.AccessibleContext"_ustr, u"com.sun.star.drawing.AccessibleSlideSorterView"_ustr }; diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index a2caebbf22ff..edf079cb8caa 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -322,8 +322,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames() { - return { u"com.sun.star.accessibility.Accessible"_ustr, - u"com.sun.star.accessibility.AccessibleContext"_ustr, + return { u"com.sun.star.accessibility.AccessibleContext"_ustr, u"com.sun.star.drawing.AccessibleGraphControl"_ustr }; } diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index e108b64ef82a..b30bea0cdebd 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -976,7 +976,7 @@ sal_Int32 SAL_CALL SwAccessibleContext::getBackground() uno::Sequence<OUString> SAL_CALL SwAccessibleContext::getSupportedServiceNames() { - return { u"com.sun.star.accessibility.Accessible"_ustr }; + return {}; } sal_Bool SAL_CALL SwAccessibleContext::supportsService (const OUString& ServiceName) commit c4a4867f1899c16bb19d000d02ba8fdb2b378a17 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Jun 24 10:33:44 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Jun 25 07:39:52 2025 +0200 sw a11y: Implement XServiceInfo::getSupportedServiceNames in base class By now, all the Writer accessibility classes only implement the "com.sun.star.accessibility.Accessible" service. Implement XServiceInfo::getSupportedServiceNames in SwAccessibleContext to return that service name there, instead of implementing the same logic in each of the subclasses. Change-Id: I4e1f2bb47790e830384b04821680dc261af087b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186880 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 bfb6fcbce066..a4875bf923e5 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -233,11 +233,6 @@ OUString SAL_CALL SwAccessibleCell::getImplementationName() return u"com.sun.star.comp.Writer.SwAccessibleCellView"_ustr; } -uno::Sequence< OUString > SAL_CALL SwAccessibleCell::getSupportedServiceNames() -{ - return { sAccessibleServiceName }; -} - 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 a288a54d1b37..41afe8ac8167 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -71,9 +71,6 @@ public: virtual OUString SAL_CALL getImplementationName() override; - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() 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 66a9bbd07124..e108b64ef82a 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -974,6 +974,11 @@ sal_Int32 SAL_CALL SwAccessibleContext::getBackground() return sal_Int32(COL_WHITE); } +uno::Sequence<OUString> SAL_CALL SwAccessibleContext::getSupportedServiceNames() +{ + return { u"com.sun.star.accessibility.Accessible"_ustr }; +} + sal_Bool SAL_CALL SwAccessibleContext::supportsService (const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 1c66bf72a84d..0386f87fe38d 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -39,8 +39,6 @@ namespace accessibility { class AccessibleShape; } -inline constexpr OUString sAccessibleServiceName = u"com.sun.star.accessibility.Accessible"_ustr; - class SwAccessibleContext : public ::cppu::WeakImplHelper< css::accessibility::XAccessible, @@ -279,7 +277,9 @@ public: // XServiceInfo - // getImplementationName() and getSupportedServiceNames are abstract + // 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 diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index c93b5eed5552..fb22ad61bd42 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -363,11 +363,6 @@ OUString SAL_CALL SwAccessibleDocument::getImplementationName() return u"com.sun.star.comp.Writer.SwAccessibleDocumentView"_ustr; } -uno::Sequence< OUString > SAL_CALL SwAccessibleDocument::getSupportedServiceNames() -{ - return { sAccessibleServiceName }; -} - // XAccessibleSelection void SwAccessibleDocument::selectAccessibleChild( diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index 2d494bf7fb88..45953d0c1ff0 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -104,9 +104,6 @@ public: virtual OUString SAL_CALL getImplementationName() override; - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() override; - // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index 6ba2822a9140..ebf9c26a0e0e 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -71,11 +71,6 @@ OUString SAL_CALL SwAccessibleEmbeddedObject::getImplementationName() return u"com.sun.star.comp.Writer.SwAccessibleEmbeddedObject"_ustr; } -uno::Sequence< OUString > SAL_CALL SwAccessibleEmbeddedObject::getSupportedServiceNames() -{ - return { sAccessibleServiceName }; -} - // XAccessibleExtendedAttributes OUString SAL_CALL SwAccessibleEmbeddedObject::getExtendedAttributes() { diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx index deaba8f72a26..07ec87cbf93c 100644 --- a/sw/source/core/access/accembedded.hxx +++ b/sw/source/core/access/accembedded.hxx @@ -53,9 +53,6 @@ public: virtual OUString SAL_CALL getImplementationName() override; - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() 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 21c8c2736c0a..c655554fc5b4 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -89,11 +89,6 @@ OUString SAL_CALL SwAccessibleFootnote::getImplementationName() return u"com.sun.star.comp.Writer.SwAccessibleFootnoteView"_ustr; } -Sequence< OUString > SAL_CALL SwAccessibleFootnote::getSupportedServiceNames() -{ - return { sAccessibleServiceName }; -} - 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 2bb323cc42d5..756e82db8c6d 100644 --- a/sw/source/core/access/accfootnote.hxx +++ b/sw/source/core/access/accfootnote.hxx @@ -47,9 +47,6 @@ public: virtual OUString SAL_CALL getImplementationName() override; - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() override; - static bool IsEndnote( const SwFootnoteFrame *pFrame ); }; diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx index 101f11221297..03bf9a82c896 100644 --- a/sw/source/core/access/accgraphic.cxx +++ b/sw/source/core/access/accgraphic.cxx @@ -44,11 +44,6 @@ OUString SAL_CALL SwAccessibleGraphic::getImplementationName() return u"com.sun.star.comp.Writer.SwAccessibleGraphic"_ustr; } -Sequence< OUString > SAL_CALL SwAccessibleGraphic::getSupportedServiceNames() -{ - return { sAccessibleServiceName }; -} - // 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 24bee9fd52b2..295f6b57729d 100644 --- a/sw/source/core/access/accgraphic.hxx +++ b/sw/source/core/access/accgraphic.hxx @@ -37,9 +37,6 @@ public: virtual OUString SAL_CALL getImplementationName() override; - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() 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 9d185ec4cd6a..d96c584b12bc 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -78,11 +78,6 @@ OUString SAL_CALL SwAccessibleHeaderFooter::getImplementationName() return sImplementationNameFooter; } -Sequence< OUString > SAL_CALL SwAccessibleHeaderFooter::getSupportedServiceNames() -{ - return { sAccessibleServiceName }; -} - 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 2c10a1b1dd09..aab044045d6f 100644 --- a/sw/source/core/access/accheaderfooter.hxx +++ b/sw/source/core/access/accheaderfooter.hxx @@ -46,8 +46,6 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() 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 f57cde7a28b0..63caa62dddde 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -132,11 +132,6 @@ OUString SwAccessiblePage::getImplementationName( ) return sImplementationName; } -Sequence<OUString> SwAccessiblePage::getSupportedServiceNames( ) -{ - return { sAccessibleServiceName }; -} - OUString SwAccessiblePage::getAccessibleDescription( ) { ThrowIfDisposed(); diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index 18b6dbaa48d6..6938b125a7b4 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -61,8 +61,6 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() 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 fa62e4f46e60..4d3a3791b324 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -791,11 +791,6 @@ OUString SAL_CALL SwAccessibleParagraph::getImplementationName() return sImplementationName; } -uno::Sequence< OUString > SAL_CALL SwAccessibleParagraph::getSupportedServiceNames() -{ - return { sAccessibleServiceName }; -} - 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 d5ede357190b..2bfbed652966 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -264,9 +264,6 @@ public: virtual OUString SAL_CALL getImplementationName() override; - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() 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 10584b170a75..2399284e6556 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -41,11 +41,6 @@ OUString SwAccessiblePreview::getImplementationName( ) return sImplementationName; } -Sequence<OUString> SwAccessiblePreview::getSupportedServiceNames( ) -{ - return { sAccessibleServiceName }; -} - 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 ae5846947a33..09f1a42d22b5 100644 --- a/sw/source/core/access/accpreview.hxx +++ b/sw/source/core/access/accpreview.hxx @@ -44,9 +44,6 @@ public: virtual OUString SAL_CALL getImplementationName() override; - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() 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 63c40f393650..c49999f747df 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -1064,11 +1064,6 @@ OUString SAL_CALL SwAccessibleTable::getImplementationName() return u"com.sun.star.comp.Writer.SwAccessibleTableView"_ustr; } -uno::Sequence< OUString > SAL_CALL SwAccessibleTable::getSupportedServiceNames() -{ - return { sAccessibleServiceName }; -} - void SwAccessibleTable::InvalidatePosOrSize( const SwRect& rOldBox ) { SolarMutexGuard aGuard; diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 1cad6d986f01..8fb85fbec1a6 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -149,9 +149,6 @@ public: virtual OUString SAL_CALL getImplementationName() override; - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() override; - // C++ interface // The object has been moved by the layout diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index 17aeed85c911..1fa5381cf817 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -231,11 +231,6 @@ OUString SAL_CALL SwAccessibleTextFrame::getImplementationName() return u"com.sun.star.comp.Writer.SwAccessibleTextFrameView"_ustr; } -uno::Sequence< OUString > SAL_CALL SwAccessibleTextFrame::getSupportedServiceNames() -{ - return { sAccessibleServiceName }; -} - // XAccessibleRelationSet SwFlyFrame* SwAccessibleTextFrame::getFlyFrame() const diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx index cf2734a36205..599db7cc26e5 100644 --- a/sw/source/core/access/acctextframe.hxx +++ b/sw/source/core/access/acctextframe.hxx @@ -80,9 +80,6 @@ public: virtual OUString SAL_CALL getImplementationName() override; - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() override; - // XAccessibleContext::getAccessibleRelationSet // text frame may have accessible relations to their
