[API CHANGE] a11y: Drop com.sun.star.awt.AccessibleScrollBar
Drop the unpublished service "com.sun.star.awt.AccessibleScrollBar" because it's unnecessary. (The IDL file only documents some internal implementation details of the a11y class implementing the service.) Also drop VCLXAccessibleScrollBar::getImplementationName as there is no need to report a different implementation name than the base class implementation. The only place that would use the implementation name is for a special handling in the _XAccessibleValue Java unit test logic, but that one is apparently not/no more necessary as the a11y tests pass just fine without the special handling. Therefore, drop that, too. Change-Id: Idbbb77740085d349afa394fb1eec1c5a5eb6809b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/210328 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
@@ -489,7 +489,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/awt,\
|
||||
AccessibleComboBox \
|
||||
AccessibleList \
|
||||
AccessibleListBox \
|
||||
AccessibleScrollBar \
|
||||
AccessibleStatusBar \
|
||||
AccessibleStatusBarItem \
|
||||
AccessibleWindow \
|
||||
|
||||
@@ -1,92 +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 awt {
|
||||
|
||||
/** specifies accessibility support for a scroll bar.
|
||||
|
||||
@since OOo 1.1.2
|
||||
*/
|
||||
service AccessibleScrollBar
|
||||
{
|
||||
/** This interface gives access to the structural information of a
|
||||
scroll bar:
|
||||
|
||||
<ul>
|
||||
<li>Role: The role of a scroll bar is
|
||||
com::sun::star::accessibility::AccessibleRole::SCROLL_BAR.</li>
|
||||
<li>Name: There is no name.</li>
|
||||
<li>Description: The description of a scroll bar is its localized
|
||||
help text.</li>
|
||||
<li>Children: There are no children.</li>
|
||||
<li>Parent: The parent is the window that contains the scroll bar.</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::FOCUSABLE
|
||||
is always set.</li>
|
||||
<li>com::sun::star::accessibility::AccessibleStateType::FOCUSED
|
||||
is set if the object currently has the keyboard focus.</li>
|
||||
<li>com::sun::star::accessibility::AccessibleStateType::HORIZONTAL
|
||||
is set if the orientation of the object is horizontal.</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::VERTICAL
|
||||
is set if the orientation of the object is vertical.</li>
|
||||
<li>com::sun::star::accessibility::AccessibleStateType::VISIBLE
|
||||
is always set.</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
*/
|
||||
interface ::com::sun::star::accessibility::XAccessibleContext;
|
||||
|
||||
interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
|
||||
|
||||
interface ::com::sun::star::accessibility::XAccessibleComponent;
|
||||
|
||||
interface ::com::sun::star::accessibility::XAccessibleExtendedComponent;
|
||||
|
||||
/** This interface gives access to the actions that can be executed for
|
||||
a scroll bar. The supported actions for a scroll bar are:
|
||||
<ul>
|
||||
<li>decrementLine</li>
|
||||
<li>incrementLine</li>
|
||||
<li>decrementBlock</li>
|
||||
<li>incrementBlock</li>
|
||||
</ul>
|
||||
*/
|
||||
interface ::com::sun::star::accessibility::XAccessibleAction;
|
||||
|
||||
/** This interface gives access to the numerical value of a scroll bar,
|
||||
which is related to the position of the scroll bar thumb.
|
||||
*/
|
||||
interface ::com::sun::star::accessibility::XAccessibleValue;
|
||||
};
|
||||
|
||||
}; }; }; };
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
@@ -124,8 +124,6 @@ public class _XAccessibleValue extends MultiMethodTest {
|
||||
|
||||
boolean result = true ;
|
||||
boolean partResult=true;
|
||||
String noMax = "com.sun.star.comp.toolkit.AccessibleScrollBar";
|
||||
String implName = util.utils.getImplName(oObj);
|
||||
|
||||
if (anotherFromGroup == null) {
|
||||
double newVal = curVal + 1;
|
||||
@@ -162,14 +160,6 @@ public class _XAccessibleValue extends MultiMethodTest {
|
||||
log.println("Result max value is " + resVal);
|
||||
partResult = Math.abs(maxVal - resVal) < 0.00001;
|
||||
|
||||
if (implName.equals(noMax)) {
|
||||
log.println("If one sets the maximum value of a scroll bar with XScrollBar::setMaximum(),"+
|
||||
"then XScrollBar::getValue() returns the maximum value minus the visible size of"+
|
||||
"the thumb");
|
||||
//using arbitrary Value, since we can't determine the resulting value
|
||||
partResult = resVal > 10;
|
||||
}
|
||||
|
||||
result &=partResult;
|
||||
log.println("\t works: "+partResult);
|
||||
|
||||
@@ -186,13 +176,6 @@ public class _XAccessibleValue extends MultiMethodTest {
|
||||
resVal = getDoubleValue(oObj.getCurrentValue());
|
||||
log.println("Result max value is " + resVal);
|
||||
partResult = Math.abs(maxVal - resVal) < 0.00001;
|
||||
if (implName.equals(noMax)) {
|
||||
log.println("If one sets the maximum value of a scroll bar with XScrollBar::setMaximum(),"+
|
||||
"then XScrollBar::getValue() returns the maximum value minus the visible size of"+
|
||||
"the thumb");
|
||||
//using arbitrary Value, since we can't determine the resulting value
|
||||
partResult = resVal > 10;
|
||||
}
|
||||
|
||||
result &=partResult;
|
||||
log.println("\t works: "+partResult);
|
||||
|
||||
@@ -41,10 +41,6 @@ public:
|
||||
VCLXAccessibleScrollBar(ScrollBar* pScrollBar)
|
||||
: ImplInheritanceHelper(pScrollBar) {}
|
||||
|
||||
// XServiceInfo
|
||||
virtual OUString SAL_CALL getImplementationName() override;
|
||||
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
|
||||
|
||||
// XAccessibleAction
|
||||
virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override;
|
||||
virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
|
||||
|
||||
@@ -64,21 +64,6 @@ void VCLXAccessibleScrollBar::FillAccessibleStateSet( sal_Int64& rStateSet )
|
||||
rStateSet |= GetOrientationState();
|
||||
}
|
||||
|
||||
|
||||
// XServiceInfo
|
||||
|
||||
|
||||
OUString VCLXAccessibleScrollBar::getImplementationName()
|
||||
{
|
||||
return u"com.sun.star.comp.toolkit.AccessibleScrollBar"_ustr;
|
||||
}
|
||||
|
||||
|
||||
Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames()
|
||||
{
|
||||
return { u"com.sun.star.awt.AccessibleScrollBar"_ustr };
|
||||
}
|
||||
|
||||
// XAccessibleAction
|
||||
|
||||
constexpr sal_Int32 ACCESSIBLE_ACTION_COUNT=4;
|
||||
|
||||
Reference in New Issue
Block a user