diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2023-08-07 09:17:45 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2023-08-08 08:17:52 +0200 |
| commit | e5aab6900f86042e4360bb792bc47690d09eaed7 (patch) | |
| tree | e2c92730ca3be565f6073fc11452920fbf2de623 /winaccessibility | |
| parent | 532078a68b7e491845262524ba5e8338cd42f303 (diff) | |
wina11y: Move GetIAccessibleFromXAccessible logic
Move the logic from AccObjectManagerAgent::GetIAccessibleFromXAccessible
to the new AccObjectWinManager::GetIAccessibleFromXAccessible and just
forward to that one.
This is in preparation of dropping the AccObjectManagerAgent
indirection altogether.
Change-Id: Ic276a04cf7dda3762cee0d3932962e2a0947cfde
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155435
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'winaccessibility')
| -rw-r--r-- | winaccessibility/inc/AccObjectWinManager.hxx | 1 | ||||
| -rw-r--r-- | winaccessibility/source/service/AccObjectManagerAgent.cxx | 5 | ||||
| -rw-r--r-- | winaccessibility/source/service/AccObjectWinManager.cxx | 9 |
3 files changed, 11 insertions, 4 deletions
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx index 86a75c80fad7..55640fd8c6cb 100644 --- a/winaccessibility/inc/AccObjectWinManager.hxx +++ b/winaccessibility/inc/AccObjectWinManager.hxx @@ -123,6 +123,7 @@ public: static bool IsContainer( css::accessibility::XAccessible* pAccessible ); IMAccessible* GetIMAccByXAcc( css::accessibility::XAccessible* pXAcc ); + bool GetIAccessibleFromXAccessible(css::accessibility::XAccessible* pXAcc, IAccessible** ppIA); IMAccessible* GetIAccessibleFromResID(long resID); void NotifyDestroy( css::accessibility::XAccessible* pXAcc ); diff --git a/winaccessibility/source/service/AccObjectManagerAgent.cxx b/winaccessibility/source/service/AccObjectManagerAgent.cxx index 073a5da7f748..eb242c243183 100644 --- a/winaccessibility/source/service/AccObjectManagerAgent.cxx +++ b/winaccessibility/source/service/AccObjectManagerAgent.cxx @@ -258,10 +258,7 @@ bool AccObjectManagerAgent::GetIAccessibleFromXAccessible( XAccessible* pXAcc, IAccessible** ppXI) { assert(pWinManager); - *ppXI = pWinManager->GetIMAccByXAcc(pXAcc); - if(*ppXI) - return true; - return false; + return pWinManager->GetIAccessibleFromXAccessible(pXAcc, ppXI); } XAccessible* AccObjectManagerAgent::GetParentXAccessible( XAccessible* pXAcc ) diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx index c8e5c7ac936b..dfc74f7bd4ef 100644 --- a/winaccessibility/source/service/AccObjectWinManager.cxx +++ b/winaccessibility/source/service/AccObjectWinManager.cxx @@ -1023,6 +1023,15 @@ IMAccessible* AccObjectWinManager::GetIMAccByXAcc(XAccessible* pXAcc) } } +bool AccObjectWinManager::GetIAccessibleFromXAccessible(css::accessibility::XAccessible* pXAcc, + IAccessible** ppIA) +{ + *ppIA = GetIMAccByXAcc(pXAcc); + if (*ppIA) + return true; + return false; +} + /** * Query and get IAccessible interface by child id from list. * @param resID, childID. |