diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2021-09-09 11:36:57 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2021-09-14 15:33:23 +0200 |
| commit | 6bf771f0a5ba7be9955f05b307c190fb157adb47 (patch) | |
| tree | 7e707429c505835c48703a1d63e368666b85f208 /winaccessibility | |
| parent | 9bb91441b46d677860530d8bf9597c96561a1b0a (diff) | |
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.weghorn@posteo.de>
Diffstat (limited to 'winaccessibility')
| -rw-r--r-- | winaccessibility/inc/AccObjectWinManager.hxx | 6 | ||||
| -rw-r--r-- | winaccessibility/source/service/AccObjectWinManager.cxx | 2 |
2 files changed, 5 insertions, 3 deletions
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); } |