include/svx/AccessibleOLEShape.hxx | 24 ---------- offapi/UnoApi_offapi.mk | 2 offapi/com/sun/star/formula/AccessibleFormulaText.idl | 40 ----------------- offapi/com/sun/star/formula/AccessibleFormulaView.idl | 41 ----------------- svx/source/accessibility/AccessibleOLEShape.cxx | 42 +----------------- 5 files changed, 5 insertions(+), 144 deletions(-)
New commits: commit 7703071d7f6ec9d49b252efed019847fbe63694f Author: Michael Weghorn <[email protected]> AuthorDate: Mon Jan 12 16:01:26 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Jan 13 19:38:29 2026 +0100 svx a11y: Use cppu::ImplInheritanceHelper Change-Id: I34a373f82413e4f0df9959f62992479810481f00 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197124 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx index 8daf8048aa46..c173a34f5b80 100644 --- a/include/svx/AccessibleOLEShape.hxx +++ b/include/svx/AccessibleOLEShape.hxx @@ -23,10 +23,8 @@ #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/Type.hxx> +#include <cppuhelper/implbase.hxx> #include <rtl/ustring.hxx> -#include <sal/types.h> #include <svx/AccessibleShape.hxx> #include <svx/svxdllapi.h> @@ -41,8 +39,7 @@ class AccessibleShapeTreeInfo; XAccessibleAction interface. */ class SVX_DLLPUBLIC AccessibleOLEShape - : public AccessibleShape, - public css::accessibility::XAccessibleAction + : public cppu::ImplInheritanceHelper<AccessibleShape, css::accessibility::XAccessibleAction> { public: AccessibleOLEShape ( @@ -62,23 +59,6 @@ public: css::accessibility::XAccessibleKeyBinding> SAL_CALL getAccessibleActionKeyBinding ( sal_Int32 nIndex) override; - //===== XInterface ====================================================== - - virtual css::uno::Any SAL_CALL - queryInterface (const css::uno::Type & rType) override; - - virtual void SAL_CALL - acquire() - noexcept override; - - virtual void SAL_CALL - release() - noexcept override; - - //===== XTypeProvider =================================================== - - virtual css::uno::Sequence< css::uno::Type> SAL_CALL - getTypes() override; // ====== XAccessibleExtendedAttributes ===================================== virtual OUString SAL_CALL getExtendedAttributes() override; protected: diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 383a1cf0fabd..5c3930ea07ee 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -36,10 +36,9 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; // internal -AccessibleOLEShape::AccessibleOLEShape ( - const AccessibleShapeInfo& rShapeInfo, - const AccessibleShapeTreeInfo& rShapeTreeInfo) - : AccessibleShape (rShapeInfo, rShapeTreeInfo) +AccessibleOLEShape::AccessibleOLEShape(const AccessibleShapeInfo& rShapeInfo, + const AccessibleShapeTreeInfo& rShapeTreeInfo) + : ImplInheritanceHelper(rShapeInfo, rShapeTreeInfo) { } @@ -72,41 +71,6 @@ Reference<XAccessibleKeyBinding> SAL_CALL AccessibleOLEShape::getAccessibleActio throw lang::IndexOutOfBoundsException(); } -// XInterface -css::uno::Any SAL_CALL - AccessibleOLEShape::queryInterface (const css::uno::Type & rType) -{ - css::uno::Any aReturn = AccessibleShape::queryInterface (rType); - if ( ! aReturn.hasValue()) - aReturn = ::cppu::queryInterface (rType, - static_cast<XAccessibleAction*>(this)); - return aReturn; -} - - -void SAL_CALL - AccessibleOLEShape::acquire() - noexcept -{ - AccessibleShape::acquire (); -} - - -void SAL_CALL - AccessibleOLEShape::release() - noexcept -{ - AccessibleShape::release (); -} - -// XTypeProvider -uno::Sequence<uno::Type> SAL_CALL AccessibleOLEShape::getTypes() -{ - // Get list of types from the context base implementation... - return comphelper::concatSequences(AccessibleShape::getTypes(), - uno::Sequence { cppu::UnoType<XAccessibleAction>::get() } ); -} - // XAccessibleExtendedAttributes OUString SAL_CALL AccessibleOLEShape::getExtendedAttributes() { commit a1ed7c743cf80bbc31b2206a23f3ec8320ac6780 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Jan 12 15:49:00 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Jan 13 19:38:22 2026 +0100 [API CHANGE] a11y: Drop com.sun.star.formula.AccessibleFormulaView Drop the unpublished service "com.sun.star.formula.AccessibleFormulaView". It is completely unused and not implemented by anything. A search in Google and on Ask [1] also didn't give any results that would suggest this unpublished service could be relevant for third party code. [1] https://ask.libreoffice.org/ Change-Id: I487a60bc599dd53bd6f07e506e0a7d436d35043a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197123 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 2de6a413759d..eabe9d8a07e7 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -917,7 +917,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/form/validatio ValidatableControlModel \ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/formula,\ - AccessibleFormulaView \ FormulaProperties \ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/frame,\ diff --git a/offapi/com/sun/star/formula/AccessibleFormulaView.idl b/offapi/com/sun/star/formula/AccessibleFormulaView.idl deleted file mode 100644 index 0a2ebfa530aa..000000000000 --- a/offapi/com/sun/star/formula/AccessibleFormulaView.idl +++ /dev/null @@ -1,41 +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 formula { - - -/** The accessible view of a formula documents visual representation. - - @since OOo 1.1.2 - */ -service AccessibleFormulaView -{ - interface ::com::sun::star::accessibility::XAccessible; - interface ::com::sun::star::accessibility::XAccessibleComponent; - interface ::com::sun::star::accessibility::XAccessibleContext; - interface ::com::sun::star::accessibility::XAccessibleText; - interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster; -}; - - -}; }; }; }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit f515f0d8e88b0ae1e5cafdb746aa5666f90ef075 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Jan 12 15:46:16 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Jan 13 19:38:15 2026 +0100 [API CHANGE] a11y: Drop com.sun.star.formula.AccessibleFormulaText Drop the unpublished service "com.sun.star.formula.AccessibleFormulaText". It is completely unused and not implemented by anything. A search in Google and on Ask [1] also didn't give any results that would suggest this unpublished service could be relevant for third party code. [1] https://ask.libreoffice.org/ Change-Id: I95e1632e8f431785dc49f793d21040f828a23aec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197122 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 166bd707675e..2de6a413759d 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -917,7 +917,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/form/validatio ValidatableControlModel \ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/formula,\ - AccessibleFormulaText \ AccessibleFormulaView \ FormulaProperties \ )) diff --git a/offapi/com/sun/star/formula/AccessibleFormulaText.idl b/offapi/com/sun/star/formula/AccessibleFormulaText.idl deleted file mode 100644 index d5e669775cc3..000000000000 --- a/offapi/com/sun/star/formula/AccessibleFormulaText.idl +++ /dev/null @@ -1,40 +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 formula { - - -/** The accessible view of a formula documents command text. - - @since OOo 1.1.2 - */ -service AccessibleFormulaText -{ - interface ::com::sun::star::accessibility::XAccessible; - interface ::com::sun::star::accessibility::XAccessibleComponent; - interface ::com::sun::star::accessibility::XAccessibleContext; - interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster; -}; - - -}; }; }; }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
