sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 29 --------- sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 18 +----- svx/inc/AccessibleTableShape.hxx | 20 ++---- svx/source/accessibility/AccessibleShape.cxx | 2 svx/source/table/accessibletableshape.cxx | 41 ++------------ 5 files changed, 18 insertions(+), 92 deletions(-)
New commits: commit 29ed2748da57763af5a5560960a1070a274dfa54 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Jan 12 20:19:06 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Jan 13 19:38:51 2026 +0100 svx a11y: Simplify AccessibleContextBase::queryInterface By now, AccessibleContextBase already implements the XAccessibleComponent and XAccessibleExtendedComponent interfaces, so there's no need to do this here. Change-Id: I558af87165a758ab7db7c4fd80a5341eab78c872 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197142 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 1cd04a7d1ff2..87e345158913 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -659,8 +659,6 @@ css::uno::Any SAL_CALL css::uno::Any aReturn = AccessibleContextBase::queryInterface (rType); if ( ! aReturn.hasValue()) aReturn = ::cppu::queryInterface (rType, - static_cast<XAccessibleComponent*>(this), - static_cast<XAccessibleExtendedComponent*>(this), static_cast< css::accessibility::XAccessibleSelection* >(this), static_cast< css::accessibility::XAccessibleExtendedAttributes* >(this), static_cast<document::XShapeEventListener*>(this), commit 59f9abdc4b8afcaf4a6c0962677e094e7c4a37c7 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Jan 12 20:03:54 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Jan 13 19:38:44 2026 +0100 svx a11y: Use ImplInheritanceHelper for all AccessibleTableShape UNO ifaces Make the css::accessibility::XAccessibleTableSelection interface another template param for this ImplInheritanceHelper subclass, instead of having this interface as a direct base class and and reimplementing XInterface methods manually. Change-Id: I16725519fb8e73a92a05d368cbf2840d4db3660b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197141 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx index 1a13ec36e610..9cbd9a9c3447 100644 --- a/svx/inc/AccessibleTableShape.hxx +++ b/svx/inc/AccessibleTableShape.hxx @@ -34,14 +34,13 @@ namespace sdr::table { class SvxTableController; } namespace accessibility { - class AccessibleTableShapeImpl; - class AccessibleCell; - - typedef ::cppu::ImplInheritanceHelper< AccessibleShape, - css::accessibility::XAccessibleTable, - css::view::XSelectionChangeListener - > AccessibleTableShape_Base; -class AccessibleTableShape final : public AccessibleTableShape_Base, public css::accessibility::XAccessibleTableSelection +class AccessibleTableShapeImpl; +class AccessibleCell; + +class AccessibleTableShape final + : public cppu::ImplInheritanceHelper<AccessibleShape, css::accessibility::XAccessibleTable, + css::accessibility::XAccessibleTableSelection, + css::view::XSelectionChangeListener> { sal_Int32 mnPreviousSelectionCount; public: @@ -52,11 +51,6 @@ public: virtual void Init() override; - // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; - virtual void SAL_CALL acquire( ) noexcept override; - virtual void SAL_CALL release( ) noexcept 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/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 56896cd59d40..831b78400760 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -304,10 +304,11 @@ void SAL_CALL AccessibleTableShapeImpl::disposing( const EventObject& /*Source*/ { } -AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo) -: AccessibleTableShape_Base(rShapeInfo, rShapeTreeInfo) -, mnPreviousSelectionCount(0) -, mxImpl( new AccessibleTableShapeImpl( maShapeTreeInfo ) ) +AccessibleTableShape::AccessibleTableShape(const AccessibleShapeInfo& rShapeInfo, + const AccessibleShapeTreeInfo& rShapeTreeInfo) + : ImplInheritanceHelper(rShapeInfo, rShapeTreeInfo) + , mnPreviousSelectionCount(0) + , mxImpl(new AccessibleTableShapeImpl(maShapeTreeInfo)) { } @@ -333,7 +334,7 @@ void AccessibleTableShape::Init() TOOLS_WARN_EXCEPTION("svx.table", ""); } - AccessibleTableShape_Base::Init(); + AccessibleShape::Init(); } @@ -346,36 +347,6 @@ SvxTableController* AccessibleTableShape::getTableController() return nullptr; } - -// XInterface - - -Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType ) -{ - if ( aType == cppu::UnoType<XAccessibleTableSelection>::get()) - { - Reference<XAccessibleTableSelection> xThis( this ); - Any aRet; - aRet <<= xThis; - return aRet; - } - else - return AccessibleTableShape_Base::queryInterface( aType ); -} - - -void SAL_CALL AccessibleTableShape::acquire( ) noexcept -{ - AccessibleTableShape_Base::acquire(); -} - - -void SAL_CALL AccessibleTableShape::release( ) noexcept -{ - AccessibleTableShape_Base::release(); -} - - // XAccessible commit bda06785416531fd689d52ab1410d9c51de068e6 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Jan 12 17:43:12 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Jan 13 19:38:36 2026 +0100 sd a11y: Use ImplInheritanceHelper for AccessibleDrawDocumentView Change-Id: I32217407b5554879a4d633e3942e1f5dbd40c018 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197140 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index ca2965a0f040..ae03eb724a3a 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -83,8 +83,8 @@ AccessibleDrawDocumentView::AccessibleDrawDocumentView ( ::sd::ViewShell* pViewShell, const uno::Reference<frame::XController>& rxController, const uno::Reference<XAccessible>& rxParent) - : AccessibleDocumentViewBase (pSdWindow, pViewShell, rxController, rxParent), - mpSdViewSh( pViewShell ) + : ImplInheritanceHelper(pSdWindow, pViewShell, rxController, rxParent) + , mpSdViewSh(pViewShell) { UpdateAccessibleName(); } @@ -387,31 +387,6 @@ css::uno::Sequence< OUString> SAL_CALL return comphelper::concatSequences(aServiceNames, vals); } -//===== XInterface ========================================================== - -uno::Any SAL_CALL - AccessibleDrawDocumentView::queryInterface (const uno::Type & rType) -{ - uno::Any aReturn = AccessibleDocumentViewBase::queryInterface (rType); - if ( ! aReturn.hasValue()) - aReturn = ::cppu::queryInterface (rType, - static_cast<XAccessibleGroupPosition*>(this) - ); - return aReturn; -} - -void SAL_CALL - AccessibleDrawDocumentView::acquire() - noexcept -{ - AccessibleDocumentViewBase::acquire (); -} -void SAL_CALL - AccessibleDrawDocumentView::release() - noexcept -{ - AccessibleDocumentViewBase::release (); -} //===== XAccessibleGroupPosition ========================================= uno::Sequence< sal_Int32 > SAL_CALL AccessibleDrawDocumentView::getGroupPosition( const uno::Any& rAny ) diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index 588742c57654..f5cc5ec5967e 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -36,9 +36,9 @@ namespace accessibility { Please see the documentation of the base class for further explanations of the individual methods. */ -class AccessibleDrawDocumentView final : - public AccessibleDocumentViewBase - ,public css::accessibility::XAccessibleGroupPosition +class AccessibleDrawDocumentView final + : public cppu::ImplInheritanceHelper<AccessibleDocumentViewBase, + css::accessibility::XAccessibleGroupPosition> { public: @@ -77,18 +77,6 @@ public: virtual void SAL_CALL propertyChange (const css::beans::PropertyChangeEvent& rEventObject) 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; //===== XAccessibleGroupPosition ========================================= virtual css::uno::Sequence< sal_Int32 > SAL_CALL
