[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - winaccessibility/source

[Michael Weghorn (via logerrit)]

 winaccessibility/source/service/AccObject.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit d96eb0b381de5f87534215ef38e1af1b3bdfd0ab
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Jan 5 12:23:23 2022 +0000
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Jan 11 10:01:48 2022 +0100

    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.wegh...@posteo.de>
    Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128252

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();