From 9b2789b9cbe662f3df9204b3d6f7e1d6cc9a84c3 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Wed, 30 Jul 2025 16:46:58 +0100 Subject: [PATCH] wina11y: Simplify AccessBridgeUpdateOldTopWindows Use an OAccessible var instead of an XAccessible one, which drops the need to query for the XAccessibleConetxt interface. Change-Id: I331890f6d2b1d507ad72108a10538fabb1372cfb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188606 Reviewed-by: Michael Weghorn Tested-by: Jenkins --- .../source/service/msaaservice_impl.cxx | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx index e142a2710cf5..b6247737b75f 100644 --- a/winaccessibility/source/service/msaaservice_impl.cxx +++ b/winaccessibility/source/service/msaaservice_impl.cxx @@ -149,16 +149,9 @@ static void AccessBridgeUpdateOldTopWindows( const Reference< XMSAAService > &xA for (tools::Long i = 0; i < nTopWindowCount; i++) { vcl::Window* pTopWindow = Application::GetTopWindow( i ); - css::uno::Reference< css::accessibility::XAccessible > xAccessible = pTopWindow->GetAccessible(); - if ( xAccessible.is() ) - { - css::uno::Reference< css::accessibility::XAccessibleContext > xAC( xAccessible->getAccessibleContext() ); - if ( xAC.is()) - { - if ( !xAC->getAccessibleName().isEmpty() ) - xAccMgr->handleWindowOpened(reinterpret_cast(pTopWindow)); - } - } + rtl::Reference pAccessible = pTopWindow->GetAccessible(); + if (pAccessible.is() && !pAccessible->getAccessibleName().isEmpty()) + xAccMgr->handleWindowOpened(reinterpret_cast(pTopWindow)); } }