diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2024-08-21 11:10:47 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2024-08-21 18:49:54 +0200 |
| commit | 2acf6f42533146888920e2e70ed80fd01b8048dc (patch) | |
| tree | fb5a82453d329b150f2b6c6fd16cfd5963b50c45 /winaccessibility/inc | |
| parent | e6c471dd7b2738b6575ac533daad33af2d6bbaa7 (diff) | |
wina11y: Query XAccessibleAction iface on demand
Despite the
// initially m_xAction and m_xContext are the same object
// but they may be different once AccObject::UpdateAction() is called?
comment in winaccessibility/source/UAccCOM/MAccessible.h,
`MAccessible::m_xAction` is supposed to point to the same
underlying object as `MAccessible::m_xContext`, see
`AccObject::UpdateAction` (which queries for the
`XAccessibleAction` interface and sets that).
Simplify this by just querying `MAccessible::m_xContext`
for the `XAccessibleAction` iface on demand in those
places where it's needed.
Change-Id: Id3d89213937c2c72a936947da69ca7fddc8f1b09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172205
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'winaccessibility/inc')
| -rw-r--r-- | winaccessibility/inc/AccObject.hxx | 2 | ||||
| -rw-r--r-- | winaccessibility/inc/AccObjectWinManager.hxx | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/winaccessibility/inc/AccObject.hxx b/winaccessibility/inc/AccObject.hxx index 9810e7a42d72..cb9f0ceaf711 100644 --- a/winaccessibility/inc/AccObject.hxx +++ b/winaccessibility/inc/AccObject.hxx @@ -56,7 +56,6 @@ private: ::rtl::Reference<AccEventListener> m_pListener; css::uno::Reference < css::accessibility::XAccessible > m_xAccRef; - css::uno::Reference < css::accessibility::XAccessibleAction > m_xAccActionRef; css::uno::Reference < css::accessibility::XAccessibleContext > m_xAccContextRef; void UpdateRole(); @@ -105,7 +104,6 @@ public: void UpdateState(); void UpdateValue(); - void UpdateAction(); void UpdateValidWindow(); void setFocus(); diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx index 9a6b9f0fe243..e03fa8a1c7bf 100644 --- a/winaccessibility/inc/AccObjectWinManager.hxx +++ b/winaccessibility/inc/AccObjectWinManager.hxx @@ -114,7 +114,6 @@ public: void UpdateValue( css::accessibility::XAccessible* pXAcc ); void UpdateAccFocus( css::accessibility::XAccessible* newFocus ); - void UpdateAction( css::accessibility::XAccessible* pXAcc ); static bool IsContainer( css::accessibility::XAccessible* pAccessible ); |