From f3288f031a2667a8acc7b3c79744fed1db590845 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Mon, 3 Mar 2025 18:06:26 +0100 Subject: [PATCH] a11y: Merge OAccessibleWrapper::createAccessibleContext into only caller Change-Id: I648aa804409fb81152c9136743465cff565eefdb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182397 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- comphelper/source/misc/accessiblewrapper.cxx | 9 +-------- include/comphelper/accessiblewrapper.hxx | 3 --- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 3e356f434faa..8d56245740dd 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -305,13 +305,6 @@ namespace comphelper return m_aContext; } - - rtl::Reference OAccessibleWrapper::createAccessibleContext( const Reference< XAccessibleContext >& _rxInnerContext ) - { - return new OAccessibleContextWrapper( getComponentContext(), _rxInnerContext, this, m_xParentAccessible ); - } - - Reference< XAccessibleContext > SAL_CALL OAccessibleWrapper::getAccessibleContext( ) { // see if the context is still alive (we cache it) @@ -322,7 +315,7 @@ namespace comphelper Reference< XAccessibleContext > xInnerContext = m_xInnerAccessible->getAccessibleContext( ); if ( xInnerContext.is() ) { - xContext = createAccessibleContext( xInnerContext ); + xContext = new OAccessibleContextWrapper(getComponentContext(), xInnerContext, this, m_xParentAccessible); // cache it m_aContext = WeakReference< XAccessibleContext >( xContext ); } diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx index ad0a4879c62e..7c1ae896ed9d 100644 --- a/include/comphelper/accessiblewrapper.hxx +++ b/include/comphelper/accessiblewrapper.hxx @@ -105,9 +105,6 @@ namespace comphelper virtual ~OAccessibleWrapper( ) override; private: - rtl::Reference createAccessibleContext( - const css::uno::Reference& _rxInnerContext); - OAccessibleWrapper( const OAccessibleWrapper& ) = delete; OAccessibleWrapper& operator=( const OAccessibleWrapper& ) = delete; };