comphelper/source/misc/accessiblewrapper.cxx | 9 +-------- include/comphelper/accessiblewrapper.hxx | 6 ------ 2 files changed, 1 insertion(+), 14 deletions(-)
New commits: commit f3288f031a2667a8acc7b3c79744fed1db590845 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Mar 3 18:06:26 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sun Mar 16 04:03:25 2025 +0100 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 <[email protected]> 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<OAccessibleContextWrapper> 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<OAccessibleContextWrapper> createAccessibleContext( - const css::uno::Reference<css::accessibility::XAccessibleContext>& _rxInnerContext); - OAccessibleWrapper( const OAccessibleWrapper& ) = delete; OAccessibleWrapper& operator=( const OAccessibleWrapper& ) = delete; }; commit 11b0139c39123b6cd272f5c3d3eb253b434793d2 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Mar 3 18:05:39 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sun Mar 16 04:03:07 2025 +0100 a11y: Drop now unused OAccessibleWrapper::getParent Drop the protected OAccessibleWrapper::getParent which is unused now after Change-Id: I3b2182ca953056a939670e73687f4568620a4087 Author: Michael Weghorn <[email protected]> Date: Mon Mar 3 17:42:03 2025 +0100 tdf#163989 vcl a11y: Rework toolbar item window a11y Change-Id: I45697411ed202015199d10be58b90e26b86e5d60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182396 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx index 0ee9dc1ff259..ad0a4879c62e 100644 --- a/include/comphelper/accessiblewrapper.hxx +++ b/include/comphelper/accessiblewrapper.hxx @@ -101,9 +101,6 @@ namespace comphelper virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override final; - const css::uno::Reference< css::accessibility::XAccessible >& - getParent() const { return m_xParentAccessible; } - protected: virtual ~OAccessibleWrapper( ) override;
