offapi/UnoApi_offapi.mk | 1 offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl | 2 offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl | 87 ----------- vcl/source/accessibility/accessibleiconchoicectrlentry.cxx | 4 4 files changed, 1 insertion(+), 93 deletions(-)
New commits: commit 51092034855f33fbdbdc2c09e3997310d3cb2905 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Mar 4 15:41:54 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Mar 5 11:15:57 2026 +0100 vcl a11y: Drop commented AccessibleIconChoiceCtrlEntry::getAccessibleRole code Leftover from commit efb23f29983f87104a684e7fab00b84fc59d131d Date: Mon Nov 25 15:24:55 2013 +0000 Integrate branch of IAccessible2 Change-Id: I2a51f3f322fc3fbe75874bb242a85a8f744a9bdf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200956 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx b/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx index 2ccf4c9b0510..cbc872f367c2 100644 --- a/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx +++ b/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx @@ -224,7 +224,6 @@ sal_Int64 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleIndexInParent( ) sal_Int16 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRole( ) { - //return AccessibleRole::LABEL; return AccessibleRole::LIST_ITEM; } commit 507f5142ae1f353956a4c22d96f351f96b814733 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Mar 4 15:37:36 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Mar 5 11:15:45 2026 +0100 [API CHANGE] Drop a11y: com.sun.star.awt.AccessibleIconChoiceControlEntry Drop the unpublished service "com.sun.star.drawing.AccessibleGraphControl" because it's unused. (The IDL file only documents some internal implementation details of the a11y class implementing the service and that documentation is outdated, e.g. it claims the role is AccessibleRole::LABEL, but AccessibleIconChoiceCtrlEntry::getAccessibleRole actually returns AccessibleRole::LIST_ITEM.) Change-Id: I8d6eff6e7ba5023ecaa731a4c55b4db3e7223aa0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200955 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 97eec6b88a30..1386076b0e24 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -491,7 +491,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/awt,\ AccessibleEdit \ AccessibleFixedText \ AccessibleIconChoiceControl \ - AccessibleIconChoiceControlEntry \ AccessibleList \ AccessibleListBox \ AccessibleListBoxList \ diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl index 38bb1552e4fe..afe72ebda2fd 100644 --- a/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl +++ b/offapi/com/sun/star/awt/AccessibleIconChoiceControl.idl @@ -44,8 +44,6 @@ service AccessibleIconChoiceControl <li>Name: The name of an icon choice control is IconChoiceControl.</li> <li>Description: The description of an icon choice control is its localized help text.</li> - <li>Children: There exists children of type com::sun::star::awt::AccessibleIconChoiceControlEntry. - </li> <li>Parent: The parent is the window that contains the icon choice control.</li> <li>Relations: There are no relations.</li> <li>States: The states supported by this service are diff --git a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl b/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl deleted file mode 100644 index 4fcd24e2a016..000000000000 --- a/offapi/com/sun/star/awt/AccessibleIconChoiceControlEntry.idl +++ /dev/null @@ -1,87 +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 XAccessibleText; - interface XAccessibleComponent; - -}; }; }; }; - -module com { module sun { module star { module awt { - -/** specifies accessibility support for an icon choice control entry. - - @see com::sun::star::accessibility::AccessibleContext - - @see com::sun::star::accessibility::XAccessibleComponent - @see com::sun::star::accessibility::XAccessibleText - - @since OOo 1.1.2 -*/ -service AccessibleIconChoiceControlEntry -{ - /** This interface gives access to the structural information of an icon choice control entry: - - <ul> - <li>Role: The role of an icon choice control entry is - com::sun::star::accessibility::AccessibleRole::LABEL.</li> - <li>Name: The name of an icon choice control entry is it's text.</li> - <li>Description: The description of an icon choice control entry is empty.</li> - <li>Children: There exist no children. - </li> - <li>Parent: The parent is either the com::sun::star::awt::AccessibleIconChoiceControl.</li> - <li>Relations: There are no relations.</li> - <li>States: The states supported by this service are - <ul> - <li>com::sun::star::accessibility::AccessibleStateType::DEFUNC - is set if the object has already been disposed - and subsequent calls to this object result in - com::sun::star::lang::DisposedException - exceptions.</li> - <li>com::sun::star::accessibility::AccessibleStateType::ENABLED - is set if the object is enabled.</li> - <li>com::sun::star::accessibility::AccessibleStateType::SHOWING - is set if the object is displayed on the screen.</li> - <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE - is always set.</li> - <li>com::sun::star::accessibility::AccessibleStateType::TRANSIENT - is always set.</li> - <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE - is always set.</li> - <li>com::sun::star::accessibility::AccessibleStateType::SELECTED - is set when it is selected.</li> - </ul> - </li> - </ul> - */ - service com::sun::star::accessibility::AccessibleContext; - - interface com::sun::star::accessibility::XAccessibleComponent; - - /** This interface gives read-only access to the text representation - of an icon choice control entry. - */ - interface com::sun::star::accessibility::XAccessibleText; -}; - -}; }; }; }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx b/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx index 9af81cee34d1..2ccf4c9b0510 100644 --- a/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx +++ b/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx @@ -189,8 +189,7 @@ OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getImplementationName() Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrlEntry::getSupportedServiceNames() { - return {u"com.sun.star.accessibility.AccessibleContext"_ustr, - u"com.sun.star.awt.AccessibleIconChoiceControlEntry"_ustr}; + return {u"com.sun.star.accessibility.AccessibleContext"_ustr}; } sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::supportsService( const OUString& _rServiceName )
