diff options
| -rw-r--r-- | winaccessibility/source/UAccCOM/MAccessible.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index 0e3de1af1b53..c905cc82b875 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -505,18 +505,14 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_accRole(VARIANT varChild, VA if(varChild.lVal == CHILDID_SELF) { - if( m_iRole < IA2_ROLE_CAPTION ) - { - VariantInit(pvarRole); - pvarRole->vt = VT_I4; + VariantInit(pvarRole); + pvarRole->vt = VT_I4; + + if (m_iRole < IA2_ROLE_CAPTION) pvarRole->lVal = m_iRole; - } else - { - VariantInit(pvarRole); - pvarRole->vt = VT_I4; pvarRole->lVal = ROLE_SYSTEM_CLIENT; - } + return S_OK; } |