chart2/source/controller/accessibility/AccessibleBase.cxx | 19 - chart2/source/controller/accessibility/AccessibleChartElement.cxx | 6 chart2/source/controller/accessibility/AccessibleChartElement.hxx | 3 chart2/source/controller/accessibility/AccessibleChartShape.cxx | 6 chart2/source/controller/accessibility/AccessibleChartShape.hxx | 3 chart2/source/controller/inc/AccessibleBase.hxx | 9 offapi/UnoApi_offapi.mk | 1 offapi/com/sun/star/chart/AccessibleChartElement.idl | 174 ---------- sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 23 - sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 20 - 10 files changed, 2 insertions(+), 262 deletions(-)
New commits: commit 23621ef302bf2e6a4dfae827ce83f31be2cd6056 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jun 20 12:06:08 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jun 20 21:23:04 2025 +0200 sd a11y: Drop XServiceInfo impl for AccessibleSlideSorterObject This is the AccessibleSlideSorterObject version of Change-Id: Id306320710a1718ff10536127427f3a5daf68559 Author: Michael Weghorn <[email protected]> Date: Fri Jun 20 11:14:19 2025 +0200 svtools ruler a11y: No longer implement XServiceInfo , see that commit's message for background. Change-Id: I24070a4e59e4fd15a6140a84aec147d1a742787f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186759 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index 4c6538f35ed8..c0e38926221b 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -247,29 +247,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground() return sal_Int32(nColor); } -// XServiceInfo -OUString SAL_CALL - AccessibleSlideSorterObject::getImplementationName() -{ - return u"AccessibleSlideSorterObject"_ustr; -} - -sal_Bool SAL_CALL AccessibleSlideSorterObject::supportsService (const OUString& sServiceName) -{ - return cppu::supportsService(this, sServiceName); -} - -uno::Sequence< OUString> SAL_CALL - AccessibleSlideSorterObject::getSupportedServiceNames() -{ - ensureAlive(); - - return uno::Sequence<OUString> { - u"com.sun.star.accessibility.Accessible"_ustr, - u"com.sun.star.accessibility.AccessibleContext"_ustr - }; -} - SdPage* AccessibleSlideSorterObject::GetPage() const { ::sd::slidesorter::model::SharedPageDescriptor pDescriptor( diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 464472f33686..c5e535f989f3 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -23,7 +23,6 @@ #include <comphelper/compbase.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <rtl/ref.hxx> class SdPage; @@ -35,7 +34,7 @@ namespace accessibility { */ class AccessibleSlideSorterObject final : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, - css::accessibility::XAccessible, css::lang::XServiceInfo> + css::accessibility::XAccessible> { public: /** Create a new object that represents a page object in the slide @@ -117,23 +116,6 @@ public: virtual sal_Int32 SAL_CALL getBackground() 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. - */ - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() override; - private: rtl::Reference<AccessibleSlideSorterView> mxParent; sal_uInt16 mnPageNumber; commit 6c4abe2cb1afc39417ad23455696c9f416464ee5 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jun 20 11:52:15 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jun 20 21:22:56 2025 +0200 [API CHANGE]: Drop AccessibleChartElement service Stop implementing the XServiceInfo interface in chart2 a11y implementations as the info provided by that interface isn't needed anywhere, see also Change-Id: Id306320710a1718ff10536127427f3a5daf68559 Author: Michael Weghorn <[email protected]> Date: Fri Jun 20 11:14:19 2025 +0200 svtools ruler a11y: No longer implement XServiceInfo for more background. Related to that, drop the unpublished AccessibleChartElement service. A search in Google and on Ask [1] didn't give any results that would suggest this unpublished service could be relevant for third party code. (Instances. couldn't be created by external code anyway.) [1] https://ask.libreoffice.org/ Change-Id: I97056996bc433940c262e9b1060eb37a24a0b00e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186758 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 1665c18bc88b..954860d95276 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -684,25 +684,6 @@ Color AccessibleBase::getColor( eColorType eColType ) return nResult; } -// ________ AccessibleBase::XServiceInfo ________ -OUString SAL_CALL AccessibleBase::getImplementationName() -{ - return u"AccessibleBase"_ustr; -} - -sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString& ServiceName ) -{ - return cppu::supportsService( this, ServiceName ); -} - -uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames() -{ - return { - u"com.sun.star.accessibility.Accessible"_ustr, - u"com.sun.star.accessibility.AccessibleContext"_ustr - }; -} - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index 00d59a712632..b935193abdb1 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -118,12 +118,6 @@ sal_Int64 AccessibleChartElement::ImplGetAccessibleChildCount() const return AccessibleBase::ImplGetAccessibleChildCount(); } -// ________ XServiceInfo ________ -OUString SAL_CALL AccessibleChartElement::getImplementationName() -{ - return u"AccessibleChartElement"_ustr; -} - // ________ AccessibleChartElement::XAccessibleContext (override) ________ OUString SAL_CALL AccessibleChartElement::getAccessibleName() { diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx index 64b39f97b86a..4594a240bcb3 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -60,9 +60,6 @@ public: // ________ XAccessibleExtendedComponent ________ virtual OUString SAL_CALL getToolTipText() override; - // ________ XServiceInfo ________ - virtual OUString SAL_CALL getImplementationName() override; - private: bool m_bHasText; rtl::Reference< ::chart::AccessibleTextHelper > diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index 194f3f47bc7f..7deb39b447e5 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -71,12 +71,6 @@ AccessibleChartShape::~AccessibleChartShape() } } -// ________ XServiceInfo ________ -OUString AccessibleChartShape::getImplementationName() -{ - return u"AccessibleChartShape"_ustr; -} - // ________ XAccessibleContext ________ sal_Int64 AccessibleChartShape::getAccessibleChildCount() { diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index feb1777e7407..9952ad9312d7 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -37,9 +37,6 @@ public: explicit AccessibleChartShape( const AccessibleElementInfo& rAccInfo ); virtual ~AccessibleChartShape() override; - // ________ XServiceInfo ________ - virtual OUString SAL_CALL getImplementationName() override; - // ________ XAccessibleContext ________ virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 596a5577c510..f3f2baa0c879 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleComponent.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/accessiblecomponenthelper.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> @@ -75,7 +74,7 @@ struct AccessibleElementInfo */ class AccessibleBase : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, - css::accessibility::XAccessible, css::lang::XServiceInfo> + css::accessibility::XAccessible> { public: enum class EventType @@ -224,12 +223,6 @@ protected: virtual sal_Int32 SAL_CALL getForeground() override; virtual sal_Int32 SAL_CALL getBackground() override; - // ________ XServiceInfo ________ - virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( - const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - private: enum eColorType { diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 451b2ba25794..6eb94a272cb4 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -589,7 +589,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/awt/tree,\ TreeControlModel \ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/chart,\ - AccessibleChartElement \ AreaDiagram \ BarDiagram \ BubbleDiagram \ diff --git a/offapi/com/sun/star/chart/AccessibleChartElement.idl b/offapi/com/sun/star/chart/AccessibleChartElement.idl deleted file mode 100644 index 3fb023fe8f68..000000000000 --- a/offapi/com/sun/star/chart/AccessibleChartElement.idl +++ /dev/null @@ -1,174 +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 chart { - -/** This service is supported by all components that are contained in - the view of a chart document that are controlled by the chart. - Shapes added by a user via the clipboard are not treated as chart - elements. - - <p>The list of objects that implement this service is - ::com::sun::star::chart::ChartTitle, - ::com::sun::star::chart::ChartLegend, - ::com::sun::star::chart::Diagram, - ::com::sun::star::chart::ChartAxis, - ::com::sun::star::chart::ChartDataRowProperties, - ::com::sun::star::chart::ChartDataPointProperties. - </p> - - <p>The - ::com::sun::star::accessibility::XAccessibleExtendedComponent - is supported by all chart elements.</p> - - @since OOo 1.1.2 -*/ -service AccessibleChartElement -{ - /** Base interface for being accessible. It gives access to the - ::com::sun::star::accessibility::XAccessibleContext - interface. - */ - interface ::com::sun::star::accessibility::XAccessible; - - /** Give access to the structural information of a chart element. - - <p>You can access the following information for the shapes of the above listed types: - <dl> - <dt>Role</dt> - <dd>All chart elements have the role - ::com::sun::star::accessibility::AccessibleRole::SHAPE. - </dd> - <dt>Name</dt> - <dd>For unique elements you get fixed names. The unique - elements are the titles, legend, diagram and axes. The - names you get for them are "main-title", "sub-title", - "(x|y|z)-axis-title", "legend", "diagram", "(x|y|z)-axis" - and "second-(x|y)-axis", respectively.</dd> - <dt>Description</dt> - <dd>Descriptions contain a list of selected - attributes. These attributes are, if applicable: - foreground and background color, line width, font name and - size. The purpose of these attributes is to give a rough - description of the more simple geometric shapes. The list - is very restricted in order to avoid overwhelming or - confusing the user.</dd> - <dt>Children</dt> - <dd>The ::com::sun::star::chart::Diagram and - the ::com::sun::star::chart::ChartLegend - contain children, all other objects in a chart do not, i.e., are - leaves in the document representation tree.</dd> - <dt>Parent</dt> - <dd>Because the <code>setParent</code> method from the JAVA has - been removed, the reference to the parent has to be provided in an - implementation specific way.</dd> - <dt>Relations</dt> - <dd>They are not used at the moment.</dd> - - <dt>States</dt> - <dd>The states supported by this service are: - <ul> - - <li>::com::sun::star::accessibility::AccessibleStateType::DEFUNC - is set if an object was removed. This indicates that the user - should release all references to the accessible object. If - this state is set then no other of the states below is set. - </li> - <li>::com::sun::star::accessibility::AccessibleStateType::EDITABLE</li> - <li>::com::sun::star::accessibility::AccessibleStateType::ENABLED - is always set.<sup>*</sup></li> - <li>::com::sun::star::accessibility::AccessibleStateType::MULTI_LINE - is set for all titles.</li> - <li>::com::sun::star::accessibility::AccessibleStateType::OPAQUE - is set for all elements that do have a transparency - attributes set to 0% and no transparency gradient.</li> - <li>::com::sun::star::accessibility::AccessibleStateType::RESIZABLE - Is set for the diagram object only. All other chart elements may not be resized.</li> - <li>::com::sun::star::accessibility::AccessibleStateType::SELECTABLE</li> - <li>::com::sun::star::accessibility::AccessibleStateType::SELECTED</li> - <li>::com::sun::star::accessibility::AccessibleStateType::SHOWING - is always set.<sup>*</sup></li> - <li>::com::sun::star::accessibility::AccessibleStateType::VISIBLE - is always set.<sup>*</sup></li> - </ul> - <sup>*</sup>always, except if the state - ::com::sun::star::accessibility::AccessibleStateType::DEFUNC - is set.</dd> - <dt>Locale</dt> - <dd>is supported.</dd> - <dt>Property change listeners</dt> - <dd>Property change listeners that are registered with a chart - element are informed if the size or position or an attribute - changed. The last point needs a short explanation: An attribute - change is signaled even if that attribute is not part of the - shape's description and is therefore not explicitly represented by - the UAA.</dd> - </dl> - */ - interface ::com::sun::star::accessibility::XAccessibleContext; - - /** Give access to the graphical representation of a chart element. - - <p>The coordinate oriented methods <code>contains</code>, - <code>getAccessibleAt</code>, <code>getBounds</code>, - <code>getLocation</code>, <code>getLocationOnScreen</code>, and - <code>getSize</code> work on pixel coordinates. (To transform between - the internal 100th of mm and pixels a chart element has to have access - to information that allows it to do so. This information is the - enclosing window's size in pixel, 100th of mm, and its own relative - position in one or the other coordinate system).</p> - - <p>Focus handling depends on support of the - ::com::sun::star::accessibility::XAccessibleText and - ::com::sun::star::accessibility::XAccessibleEditableText - interfaces.</p> - - <p>Key bindings are not supported at the moment</p> - */ - interface ::com::sun::star::accessibility::XAccessibleComponent; - - /** Give extended access to the graphical representation of a chart element. - - <p>This interface is used primarily to provide the predominant - foreground and background colors and—if applicable, i.e. the - ::com::sun::star::accessibility::XAccessibleText - interface is supported—information about the font used to display - text.</p> - - <p>The foreground and background colors may in some cases be directly - taken from the object. In other cases, for example when a gradient or a - texture is used, they have to be interpolated. The color returned may - not be appropriate in all cases.</p> - - <p>Specifying the font used for displaying text depends on the - transformation of UNO API font information into the Java™ format. - However, if the UAA is used directly, this is of course not an - issue.</p> - - <p>The support of this interface is optional to reduce overhead in case - that no text is displayed and color information can not be determined - with an acceptable cost.</p> - */ - [optional] interface ::com::sun::star::accessibility::XAccessibleExtendedComponent; -}; - -}; }; }; }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
