winaccessibility/inc/AccObjectWinManager.hxx | 6 ++++-- winaccessibility/source/service/AccObjectWinManager.cxx | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit 6bf771f0a5ba7be9955f05b307c190fb157adb47 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Thu Sep 9 11:36:57 2021 +0100 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Tue Sep 14 15:33:23 2021 +0200 wina11y: Use XAccessible* instead of void* Change-Id: If52de3a71af63697815e4ec6a19f9139d5a6973d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122085 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx index bf812c10f47f..dafe01d93219 100644 --- a/winaccessibility/inc/AccObjectWinManager.hxx +++ b/winaccessibility/inc/AccObjectWinManager.hxx @@ -37,6 +37,8 @@ #pragma clang diagnostic pop #endif +#include <com/sun/star/accessibility/XAccessible.hpp> + class ResIDGenerator; class AccObjectManagerAgent; class AccEventListener; @@ -55,8 +57,8 @@ class AccObjectWinManager friend class AccObjectManagerAgent; private: - typedef std::map<void*, AccObject> XIdToAccObjHash; - typedef std::map<HWND, void*> XHWNDToXAccHash; + typedef std::map<com::sun::star::accessibility::XAccessible*, AccObject> XIdToAccObjHash; + typedef std::map<HWND, com::sun::star::accessibility::XAccessible*> XHWNDToXAccHash; typedef std::map<const long, AccObject*> XResIdToAccObjHash; typedef std::map<const HWND, css::accessibility::XAccessible* > diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx index 4022a700eca1..0f73d0ad9bf9 100644 --- a/winaccessibility/source/service/AccObjectWinManager.cxx +++ b/winaccessibility/source/service/AccObjectWinManager.cxx @@ -145,7 +145,7 @@ AccObject* AccObjectWinManager::GetTopWindowAccObj(HWND hWnd) XHWNDToXAccHash::iterator iterResult =HwndXAcc.find(hWnd); if(iterResult == HwndXAcc.end()) return nullptr; - XAccessible* pXAcc = static_cast<XAccessible*>(iterResult->second); + XAccessible* pXAcc = iterResult->second; return GetAccObjByXAcc(pXAcc); }