summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2022-01-05 12:23:23 +0000
committerXisco Fauli <xiscofauli@libreoffice.org>2022-01-11 10:01:48 +0100
commitd96eb0b381de5f87534215ef38e1af1b3bdfd0ab (patch)
tree516d96830acf4021940691731e95e9a35eccee64
parent6b32bda33bee7b56d43f34adb23bcd60d8a1b1b9 (diff)
wina11y: Use existing method to update description
The accessible description and the accessibile *action* description are two different things. 'AccObject::UpdateActionDesc' was (IMHO somewhat confusingly) handling both. Drop the handling of the accessible description from there and call the already existing 'AccObject::UpdateDescription' at the only call site of 'AccObject::UpdateActionDesc' in addition, which does exactly the same thing. Change-Id: I220df676f128a5db69ab4cebe7772d92f6b9b0ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128005 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128252
-rw-r--r--winaccessibility/source/service/AccObject.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx
index b69507486e25..e9ca101207fe 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -747,12 +747,8 @@ AccObject* AccObject::NextChild()
void AccObject::UpdateActionDesc()
{
if (!m_pIMAcc)
- {
return;
- }
- OUString pXString = m_xAccContextRef->getAccessibleDescription();
- m_pIMAcc->Put_XAccDescription(o3tl::toW(pXString.getStr()));
long Role = m_accRole;
if( Role == PUSH_BUTTON || Role == RADIO_BUTTON || Role == MENU_ITEM ||
@@ -1027,6 +1023,8 @@ bool AccObject:: UpdateAccessibleInfoFromUnoToMSAA ( )
UpdateValue();
+ UpdateDescription();
+
UpdateActionDesc();
UpdateRole();