basctl/source/accessibility/accessibledialogcontrolshape.cxx | 17 - basctl/source/inc/accessibledialogcontrolshape.hxx | 7 include/svx/AccessibleGraphicShape.hxx | 10 include/svx/AccessibleOLEShape.hxx | 8 include/svx/AccessibleShape.hxx | 11 offapi/UnoApi_offapi.mk | 3 offapi/com/sun/star/accessibility/AccessibleRole.idl | 2 offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl | 5 offapi/com/sun/star/drawing/AccessibleGraphicShape.idl | 75 ---- offapi/com/sun/star/drawing/AccessibleOLEShape.idl | 65 ---- offapi/com/sun/star/drawing/AccessibleShape.idl | 178 ----------- svx/source/accessibility/AccessibleGraphicShape.cxx | 16 svx/source/accessibility/AccessibleOLEShape.cxx | 16 svx/source/accessibility/AccessibleShape.cxx | 16 14 files changed, 2 insertions(+), 427 deletions(-)
New commits: commit e7b29ce17606b84587ee3cab4d737a3138f3677d Author: Michael Weghorn <[email protected]> AuthorDate: Mon Jan 12 14:51:41 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Jan 13 19:38:08 2026 +0100 [API CHANGE] a11y: Drop com.sun.star.drawing.AccessibleShape Drop the unpublished service "com.sun.star.drawing.AccessibleShape" because it's unused. (The IDL file only documents some internal implementation details of the a11y classes implementing the 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 of the service couldn't be created by external code anyway.) [1] https://ask.libreoffice.org/ Change-Id: Ib9cc4143bb5e5f32a149bda63d6ac6b72c1a099f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197116 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 53f0f62c2361..04a83949c2c9 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <cppuhelper/supportsservice.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/accessiblecontexthelper.hxx> @@ -274,22 +273,6 @@ void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEv } } -// XServiceInfo -OUString AccessibleDialogControlShape::getImplementationName() -{ - return u"com.sun.star.comp.basctl.AccessibleShape"_ustr; -} - -sal_Bool AccessibleDialogControlShape::supportsService( const OUString& rServiceName ) -{ - return cppu::supportsService(this, rServiceName); -} - -Sequence< OUString > AccessibleDialogControlShape::getSupportedServiceNames() -{ - return { u"com.sun.star.drawing.AccessibleShape"_ustr }; -} - // XAccessibleContext sal_Int64 AccessibleDialogControlShape::getAccessibleChildCount() { diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index b513742ed1e7..5639df8a6737 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -34,7 +34,7 @@ class DlgEdObj; class DialogWindow; class AccessibleDialogControlShape final - : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::lang::XServiceInfo, + : public cppu::ImplInheritanceHelper<comphelper::OAccessible, css::beans::XPropertyChangeListener> { friend class AccessibleDialogWindow; @@ -79,11 +79,6 @@ public: // XPropertyChangeListener virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& rEvent ) override; - // XServiceInfo - virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - // XAccessibleContext virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override; diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index e50652ee18c1..36d19b8c5292 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -276,17 +276,6 @@ public: release() noexcept override; - - //===== XServiceInfo ==================================================== - - /** Returns an identifier for the implementation of this object. - */ - virtual OUString SAL_CALL - getImplementationName() override; - - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() override; - //===== XTypeProvider =================================================== virtual css::uno::Sequence< css::uno::Type> SAL_CALL diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 1ed583c8b912..166bd707675e 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -751,7 +751,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/drawing,\ AccessibleDrawDocumentView \ AccessibleGraphControl \ AccessibleImageBullet \ - AccessibleShape \ AppletShape \ Background \ BitmapTable \ diff --git a/offapi/com/sun/star/accessibility/AccessibleRole.idl b/offapi/com/sun/star/accessibility/AccessibleRole.idl index 9d38189b682a..549af0b06699 100644 --- a/offapi/com/sun/star/accessibility/AccessibleRole.idl +++ b/offapi/com/sun/star/accessibility/AccessibleRole.idl @@ -432,8 +432,6 @@ constants AccessibleRole /** Object with graphical representation used to represent content on draw pages. - - @see com::sun::star::drawing::AccessibleShape */ const short SHAPE = 52; diff --git a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl index 44b4369cab18..7c88a13385c0 100644 --- a/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl +++ b/offapi/com/sun/star/drawing/AccessibleDrawDocumentView.idl @@ -105,10 +105,7 @@ service AccessibleDrawDocumentView of the currently visible area and to let the user find children (i.e. shapes) that cover a given test point. The more interesting part of the graphical representation of a draw page lies in its - children. See the AccessibleShape service for more - information about shapes.</p> - - @see AccessibleShape + children.</p> */ interface ::com::sun::star::accessibility::XAccessibleComponent; }; diff --git a/offapi/com/sun/star/drawing/AccessibleShape.idl b/offapi/com/sun/star/drawing/AccessibleShape.idl deleted file mode 100644 index d0be9222e678..000000000000 --- a/offapi/com/sun/star/drawing/AccessibleShape.idl +++ /dev/null @@ -1,171 +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 drawing { - -/** The AccessibleShape service is implemented by UNO shapes to - provide accessibility information that describe the shape's features. - A UNO shape is any object that implements the - ::com::sun::star::drawing::XShape interface. - - <p>The content of a draw page is modelled as tree of accessible shapes - and accessible text paragraphs. The root of this (sub-)tree is the - accessible draw document view. - See the section Children in the description of the - ::com::sun::star::accessibility::XAccessibleContext - interface support for more details.</p> - - <p>A shape object is either fully or partially visible on the screen or - has set the ::com::sun::star::accessibility::AccessibleStateType::DEFUNC - state to indicate that it is no longer - actively supported by its parent.</p> - - <p>Each shape object that has not set the DEFUNC state has a valid - parent. That is either the containing draw page or a group shape or a - 3D scene object.</p> - - @since OOo 1.1.2 -*/ -service AccessibleShape -{ - /** 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 shape. - - <p>You can access the following information for the shape being made - accessible: - <ul> - <li>Role: The role of all shapes is - com::sun::star::accessibility::AccessibleRole::SHAPE.</li> - <li>Name: The name of a shape is its localized type name.</li> - <li>Description: Descriptions are localized and start with the - shape's type and style. After that follow some properties that - differ from the defaults with respect to the style. - <li>Children: The children of a shape are either other accessible - shapes or accessible text paragraphs. Only group shapes, 3D scene - shapes, and OLE shapes may contain other shapes as children. - Some of the shapes may have text paragraphs as (additional) - children.</li> - <li>Parent: The parent is either the document view as represented by - AccessibleDrawDocumentView or a group shape, 3D - scene shape, or OLE shape.</li> - <li>Relations: Are set and maintained from the outside. See the - service description of the object that has accessible shapes as - children for details.</li> - <li>States: The states supported by this service are: - <ul> - <li><p>com::sun::star::accessibility::AccessibleStateType::DEFUNC - is set if an accessible - shape is not visible but still existent for some reason. - This should not really happen and is a sign that someone, - e.g. an AT-Tool holds references to such a shape. The - reason for this is that either the owner of the accessible - shape did not remove it from its list of children or that - the AT-Tool does not care for the events indicating - this.</p> - <p>Usually an object that has the - com::sun::star::accessibility::AccessibleStateType::DEFUNC - state set has already - been disposed and subsequent calls to this object result in - ::com::sun::star::lang::DisposedException - exceptions.</p> - <p>If this state is set then no other of the states below is - set. This is also true for the states that are otherwise - always set (which makes "always" more of a sort of - "normally").</p></li> - <li>com::sun::star::accessibility::AccessibleStateType::EDITABLE - is always set. - This state is interpreted to mean that not only text but - also other, graphical, properties of a shape can be modified. - </li> - <li>com::sun::star::accessibility::AccessibleStateType::ENABLED - is always set.</li> - <li>com::sun::star::accessibility::AccessibleStateType::FOCUSABLE - is always set.</li> - <li>com::sun::star::accessibility::AccessibleStateType::FOCUSED - is set according to - whether the shape currently has the focus.</li> - <li>com::sun::star::accessibility::AccessibleStateType::MULTI_LINE - is set if a shape supports the - ::com::sun::star::accessibility::XAccessibleText interface.</li> - <li>com::sun::star::accessibility::AccessibleStateType::OPAQUE - is set for certain shapes - with certain attributes like for a filled rectangle.</li> - <li>com::sun::star::accessibility::AccessibleStateType::RESIZABLE - is always set.</li> - <li>com::sun::star::accessibility::AccessibleStateType::SELECTABLE - is always set.</li> - <li>com::sun::star::accessibility::AccessibleStateType::SELECTED - is set according to - whether the shape is currently selected.</li> - <li>com::sun::star::accessibility::AccessibleStateType::SHOWING - is always set.</li> - <li>com::sun::star::accessibility::AccessibleStateType::VISIBLE - is always set.</li> - </ul> - <li>Locale: The shape returns the locale of its parent.</li> - <li>Property change listeners: Property change listeners that are - registered with a shape are informed of the usual events.</li> - </ul> - */ - interface ::com::sun::star::accessibility::XAccessibleContext; - - /** Give access to the graphical representation of a shape. - - <p>The bounding box returned by the - ::com::sun::star::accessibility::XAccessibleComponent::getBounds() - function returns the - shape's bounding box clipped at its parent's bounding box</p> - - <p>An accessible shape tries as best as it can to return proper - values for calls to the - ::com::sun::star::accessibility::XAccessibleExtendedComponent::getForeground() - and - ::com::sun::star::accessibility::XAccessibleExtendedComponent::getBackground() - functions. - If the shape is painted with a uniform and non-transparent color - then the returned colors may differ from the ones visible on the - screen.</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 shape. - - <p>The functions - ::com::sun::star::accessibility::XAccessibleExtendedComponent::getTitledBorderText(), and - ::com::sun::star::accessibility::XAccessibleExtendedComponent::getToolTipText() - are not supported and return empty references respectively empty - strings.</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: */ diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 53da36fa2eae..1cd04a7d1ff2 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -778,22 +778,6 @@ OUString SAL_CALL AccessibleShape::getExtendedAttributes() return OUString(); } -// XServiceInfo -OUString SAL_CALL - AccessibleShape::getImplementationName() -{ - return u"AccessibleShape"_ustr; -} - - -uno::Sequence<OUString> SAL_CALL - AccessibleShape::getSupportedServiceNames() -{ - ensureAlive(); - const css::uno::Sequence<OUString> vals { u"com.sun.star.drawing.AccessibleShape"_ustr }; - return comphelper::concatSequences(AccessibleContextBase::getSupportedServiceNames(), vals); -} - // XTypeProvider uno::Sequence<uno::Type> SAL_CALL AccessibleShape::getTypes() commit 1dc9655668e1a8dbe44137ad8cee2a86cde6ebf1 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Jan 12 14:40:10 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Jan 13 19:38:02 2026 +0100 [API CHANGE] a11y: Drop com.sun.star.drawing.AccessibleGraphicShape Drop the unpublished service "com.sun.star.drawing.AccessibleGraphicShape" because it's unused. (The IDL file only documents some internal implementation details of the a11y class implementing the 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 of the service couldn't be created by external code anyway.) [1] https://ask.libreoffice.org/ Change-Id: I96c693f8307e1815b0dc2d79cae77e4a671285db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197115 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx index ab1c579717ac..472198366bae 100644 --- a/include/svx/AccessibleGraphicShape.hxx +++ b/include/svx/AccessibleGraphicShape.hxx @@ -71,16 +71,6 @@ public: release() noexcept override; - //===== XServiceInfo ==================================================== - - /** Returns an identifier for the implementation of this object. - */ - virtual OUString SAL_CALL - getImplementationName() override; - - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() override; - //===== XTypeProvider =================================================== virtual css::uno::Sequence< css::uno::Type> SAL_CALL diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 9a71c4cde471..1ed583c8b912 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -750,7 +750,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/document,\ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/drawing,\ AccessibleDrawDocumentView \ AccessibleGraphControl \ - AccessibleGraphicShape \ AccessibleImageBullet \ AccessibleShape \ AppletShape \ diff --git a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl b/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl deleted file mode 100644 index 00137542cdea..000000000000 --- a/offapi/com/sun/star/drawing/AccessibleGraphicShape.idl +++ /dev/null @@ -1,75 +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 drawing { - -/** The AccessibleGraphicShape service is implemented by the - graphic object shapes shapes com.sun.star.drawing.GraphicObjectShape and - com.sun.star.presentation.GraphicObjectShape. - - <p>It differs from the included AccessibleShape "base" - service by the additional support of the - ::com::sun::star::accessibility::XAccessibleImage - interface.</p> - - @since OOo 1.1.2 -*/ -service AccessibleGraphicShape -{ - /** Give access to information of generic shapes. - - <p>See AccessibleShape for documentation and support of - the interfaces - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleContext, - and - ::com::sun::star::accessibility::XAccessibleComponent.</p> - - @see AccessibleShape - */ - service AccessibleShape; - - /** Give access to image specific information. - - <p>The support of the - ::com::sun::star::accessibility::XAccessibleImage interface - requires the shape to provide a description of the displayed image - and the image's size in the screen coordinate system (pixel). At - the time being this interface does not provide information that is - not available through the AccessibleShape service: - the size returned by the - ::com::sun::star::accessibility::XAccessibleImage::getAccessibleImageWidth() and - ::com::sun::star::accessibility::XAccessibleImage::getAccessibleImageHeight() - functions is the same as that returned by the - ::com::sun::star::accessibility::XAccessibleComponent::getSize() - function; the description returned by - ::com::sun::star::accessibility::XAccessibleImage::getAccessibleImageDescription() - function is the same as the one returned by the - ::com::sun::star::accessibility::XAccessibleContext::getAccessibleDescription() - function. - This makes the additional interface for - the time being basically an indicator of graphic shapes. This may - change in the future.</p> - */ - interface ::com::sun::star::accessibility::XAccessibleImage; -}; - -}; }; }; }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/drawing/AccessibleShape.idl b/offapi/com/sun/star/drawing/AccessibleShape.idl index 40effbf0448e..d0be9222e678 100644 --- a/offapi/com/sun/star/drawing/AccessibleShape.idl +++ b/offapi/com/sun/star/drawing/AccessibleShape.idl @@ -26,17 +26,11 @@ module com { module sun { module star { module drawing { <p>The content of a draw page is modelled as tree of accessible shapes and accessible text paragraphs. The root of this (sub-)tree is the - accessible draw document view. An accessible shape implements either - this service or the "derived" service - AccessibleGraphicShape. + accessible draw document view. See the section Children in the description of the ::com::sun::star::accessibility::XAccessibleContext interface support for more details.</p> - <p>The AccessibleGraphicShape service extends this one and - provides an additional interface. - See there for details.</p> - <p>A shape object is either fully or partially visible on the screen or has set the ::com::sun::star::accessibility::AccessibleStateType::DEFUNC state to indicate that it is no longer diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index e9222887b997..1b45a24cc5e8 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -92,22 +92,6 @@ void SAL_CALL AccessibleShape::release (); } -// XServiceInfo -OUString SAL_CALL - AccessibleGraphicShape::getImplementationName() -{ - return u"AccessibleGraphicShape"_ustr; -} - - -css::uno::Sequence< OUString> SAL_CALL - AccessibleGraphicShape::getSupportedServiceNames() -{ - ensureAlive(); - const css::uno::Sequence<OUString> vals { u"com.sun.star.drawing.AccessibleGraphicShape"_ustr }; - return comphelper::concatSequences(AccessibleShape::getSupportedServiceNames(), vals); -} - // XTypeProvider uno::Sequence<uno::Type> SAL_CALL AccessibleGraphicShape::getTypes() commit aac0a5570eb55d554bfaac3db06f514261a51bdb Author: Michael Weghorn <[email protected]> AuthorDate: Mon Jan 12 14:23:16 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Jan 13 19:37:55 2026 +0100 [API CHANGE] a11y: Drop com.sun.star.drawing.AccessibleOLEShape Drop the unpublished service "com.sun.star.drawing.AccessibleOLEShape" because it's unused. (The IDL file only documents some internal implementation details of the a11y class implementing the 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 of the service couldn't be created by external code anyway.) [1] https://ask.libreoffice.org/ Change-Id: Id078b38399715ed0f014ef18d45aeeca8e44486b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197114 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx index 9548a9c9e852..8daf8048aa46 100644 --- a/include/svx/AccessibleOLEShape.hxx +++ b/include/svx/AccessibleOLEShape.hxx @@ -75,14 +75,6 @@ public: release() noexcept override; - //===== XServiceInfo ==================================================== - - virtual OUString SAL_CALL - getImplementationName() override; - - virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() override; - //===== XTypeProvider =================================================== virtual css::uno::Sequence< css::uno::Type> SAL_CALL diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index b200f0e02541..9a71c4cde471 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -752,7 +752,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/drawing,\ AccessibleGraphControl \ AccessibleGraphicShape \ AccessibleImageBullet \ - AccessibleOLEShape \ AccessibleShape \ AppletShape \ Background \ diff --git a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl b/offapi/com/sun/star/drawing/AccessibleOLEShape.idl deleted file mode 100644 index b58c3f29fc2b..000000000000 --- a/offapi/com/sun/star/drawing/AccessibleOLEShape.idl +++ /dev/null @@ -1,65 +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 drawing { - -/** The AccessibleOLEShape service is implemented by - OLE shapes. - - <p>This includes generic OLE shapes, frames, plug-ins, and applets.</p> - - <p>This service supports the additional - ::com::sun::star::accessibility::XAccessibleAction - interface.</p> - - <p>OLE objects are handled as place holders. While not activated the - accessible OLE shape is the only indicator of the OLE object's - existence. When an OLE object has been activated then the accessibility - tree representing it (as far as that is available) is included directly - under the accessible document view and not under the OLE object. This - is due to underlying implementation constraints and may change in the - future.</p> - - - - @since OOo 1.1.2 -*/ -service AccessibleOLEShape -{ - /** Give access to information of generic shapes. - - <p>See AccessibleShape for basic documentation and - support of the ::com::sun::star::accessibility::XAccessibleContext, and - ::com::sun::star::accessibility::XAccessibleComponent interfaces. - - @see AccessibleShape - */ - service AccessibleShape; - - /** The intended purpose of the support of this interface is the - activation of the accessible OLE object. This, however, is not - realized at the moment. It therefore serves solely as indicator of - accessible OLE objects. - */ - interface ::com::sun::star::accessibility::XAccessibleAction; -}; - -}; }; }; }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/drawing/AccessibleShape.idl b/offapi/com/sun/star/drawing/AccessibleShape.idl index 7530f9d9c504..40effbf0448e 100644 --- a/offapi/com/sun/star/drawing/AccessibleShape.idl +++ b/offapi/com/sun/star/drawing/AccessibleShape.idl @@ -27,15 +27,14 @@ module com { module sun { module star { module drawing { <p>The content of a draw page is modelled as tree of accessible shapes and accessible text paragraphs. The root of this (sub-)tree is the accessible draw document view. An accessible shape implements either - this service or one of the "derived" services - AccessibleGraphicShape or AccessibleOLEShape. + this service or the "derived" service + AccessibleGraphicShape. See the section Children in the description of the ::com::sun::star::accessibility::XAccessibleContext interface support for more details.</p> - <p>There are two services that extend this one: the - AccessibleGraphicShape and the - AccessibleOLEShape services provide additional interfaces. + <p>The AccessibleGraphicShape service extends this one and + provides an additional interface. See there for details.</p> <p>A shape object is either fully or partially visible on the screen or diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 89edf4315b46..383a1cf0fabd 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -99,22 +99,6 @@ void SAL_CALL AccessibleShape::release (); } -// XServiceInfo -OUString SAL_CALL - AccessibleOLEShape::getImplementationName() -{ - return u"AccessibleOLEShape"_ustr; -} - - -css::uno::Sequence< OUString> SAL_CALL - AccessibleOLEShape::getSupportedServiceNames() -{ - ensureAlive(); - const css::uno::Sequence<OUString> vals { u"com.sun.star.drawing.AccessibleOLEShape"_ustr }; - return comphelper::concatSequences(AccessibleShape::getSupportedServiceNames(), vals); -} - // XTypeProvider uno::Sequence<uno::Type> SAL_CALL AccessibleOLEShape::getTypes() {
