diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 4b9c5fb0b384..42b7914c5cfc 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -489,7 +489,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/awt,\ AccessibleComboBox \ AccessibleList \ AccessibleListBox \ - AccessibleScrollBar \ AccessibleStatusBar \ AccessibleStatusBarItem \ AccessibleWindow \ diff --git a/offapi/com/sun/star/awt/AccessibleScrollBar.idl b/offapi/com/sun/star/awt/AccessibleScrollBar.idl deleted file mode 100644 index ddb035b427dc..000000000000 --- a/offapi/com/sun/star/awt/AccessibleScrollBar.idl +++ /dev/null @@ -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: - - - */ - 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: - - */ - 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: */ diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java index 9e80e3ad883e..aa3d2504c316 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java @@ -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); diff --git a/vcl/inc/accessibility/vclxaccessiblescrollbar.hxx b/vcl/inc/accessibility/vclxaccessiblescrollbar.hxx index edc35abc2306..1075c068513b 100644 --- a/vcl/inc/accessibility/vclxaccessiblescrollbar.hxx +++ b/vcl/inc/accessibility/vclxaccessiblescrollbar.hxx @@ -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; diff --git a/vcl/source/accessibility/vclxaccessiblescrollbar.cxx b/vcl/source/accessibility/vclxaccessiblescrollbar.cxx index 566082449f09..8029a367e6f8 100644 --- a/vcl/source/accessibility/vclxaccessiblescrollbar.cxx +++ b/vcl/source/accessibility/vclxaccessiblescrollbar.cxx @@ -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;