From 36be1ecdc8cc2ef36ff9db0ba8af78b4aeee774e Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Thu, 16 Sep 2021 14:57:53 +0100 Subject: wina11y: Get rid of more HWND<->sal_Int64 casting ... by changing the first param for AccObjectManagerAgent::SaveTopWindowHandle to HWND. Change-Id: Ia94bd95c49a64e63b1be332bd03e83a288707d80 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122204 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- winaccessibility/inc/AccObjectManagerAgent.hxx | 3 +-- winaccessibility/source/service/AccObjectManagerAgent.cxx | 5 ++--- winaccessibility/source/service/AccTopWindowListener.cxx | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx b/winaccessibility/inc/AccObjectManagerAgent.hxx index c3e1ee78c387..e4e87be3dc3c 100644 --- a/winaccessibility/inc/AccObjectManagerAgent.hxx +++ b/winaccessibility/inc/AccObjectManagerAgent.hxx @@ -85,8 +85,7 @@ public: short GetParentRole(css::accessibility::XAccessible* pXAcc ); bool IsContainer(css::accessibility::XAccessible* pXAcc); - void SaveTopWindowHandle(sal_Int64 hWnd, - css::accessibility::XAccessible* pXAcc); + void SaveTopWindowHandle(HWND hWnd, css::accessibility::XAccessible* pXAcc); void UpdateChildState(css::accessibility::XAccessible* pXAcc); diff --git a/winaccessibility/source/service/AccObjectManagerAgent.cxx b/winaccessibility/source/service/AccObjectManagerAgent.cxx index 1e0c37729f31..ab909d495398 100644 --- a/winaccessibility/source/service/AccObjectManagerAgent.cxx +++ b/winaccessibility/source/service/AccObjectManagerAgent.cxx @@ -157,11 +157,10 @@ bool AccObjectManagerAgent::InsertAccObj( * @return void */ void -AccObjectManagerAgent::SaveTopWindowHandle(sal_Int64 hWnd, XAccessible* pXAcc) +AccObjectManagerAgent::SaveTopWindowHandle(HWND hWnd, XAccessible* pXAcc) { if( pWinManager ) - pWinManager->SaveTopWindowHandle( - static_cast(reinterpret_cast(hWnd)), pXAcc); + pWinManager->SaveTopWindowHandle(hWnd, pXAcc); } diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx index 3c52d3280bd2..6ea78eb57c5b 100644 --- a/winaccessibility/source/service/AccTopWindowListener.cxx +++ b/winaccessibility/source/service/AccTopWindowListener.cxx @@ -65,8 +65,7 @@ void AccTopWindowListener::HandleWindowOpened( css::accessibility::XAccessible* //Only AccessibleContext exist, add all listeners if(pAccessibleContext != nullptr && systemdata != nullptr) { - accManagerAgent.SaveTopWindowHandle( - reinterpret_cast(systemdata->hWnd), pAccessible); + accManagerAgent.SaveTopWindowHandle(systemdata->hWnd, pAccessible); AddAllListeners(pAccessible,nullptr,systemdata->hWnd); -- cgit