[Libreoffice-commits] core.git: winaccessibility/source

[Michael Weghorn (via logerrit)]

 winaccessibility/source/UAccCOM/MAccessible.cxx |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit e523b205364e59f11ae3e735c1440d61427f15d7
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Jan 5 14:29:18 2022 +0000
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Jan 6 10:10:52 2022 +0100

    wina11y: Deduplicate 2 common lines in CMAccessible::get_accRole
    
    Change-Id: I3bd4f26861d46f6a43a4b0edda3dbf628e2da2cd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128010
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

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;
             }