winaccessibility/source/service/AccTopWindowListener.cxx |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

New commits:
commit 353436b265d5e734a3f1a7d5e08d73c88dafb03d
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Aug 20 13:31:06 2024 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Aug 21 07:47:12 2024 +0200

    wina11y: Drop duplicate check for a11y context
    
    The first thing that
    `AccTopWindowListener::AddAllListeners` does is to
    retrieve the accessible context and it returns if
    it's not valid, so there's no need to do check that
    already before calling the method.
    
    Change-Id: Ie825a9694b5c94bc9f9f2917ba5ae85e50670a66
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172120
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx 
b/winaccessibility/source/service/AccTopWindowListener.cxx
index 902fb24c71c1..0f403f3969d6 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -165,12 +165,7 @@ void 
AccTopWindowListener::AddAllListeners(css::accessibility::XAccessible* pAcc
             = pAccessibleContext->getAccessibleChild(i);
 
         if (xAccessible.is())
-        {
-            Reference<css::accessibility::XAccessibleContext> 
xAccessibleContext
-                = xAccessible->getAccessibleContext();
-            if (xAccessibleContext.is())
-                AddAllListeners(xAccessible.get(), pAccessible, pWND);
-        }
+            AddAllListeners(xAccessible.get(), pAccessible, pWND);
     }
 }
 
commit 04b526f17ac60cbd4a3b743be335606ee4e7994e
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Aug 20 13:29:01 2024 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Aug 21 07:47:06 2024 +0200

    wina11y: Drop extra pointer vars, just use the ref
    
    Change-Id: If373619e6b8203d2f2f88fac4d834d44cb6e346d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172119
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx 
b/winaccessibility/source/service/AccTopWindowListener.cxx
index 0e2a623c9fd0..902fb24c71c1 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -164,14 +164,12 @@ void 
AccTopWindowListener::AddAllListeners(css::accessibility::XAccessible* pAcc
         Reference<css::accessibility::XAccessible> xAccessible
             = pAccessibleContext->getAccessibleChild(i);
 
-        css::accessibility::XAccessible* mpAccessible = xAccessible.get();
-        if(mpAccessible != nullptr)
+        if (xAccessible.is())
         {
             Reference<css::accessibility::XAccessibleContext> 
xAccessibleContext
-                = mpAccessible->getAccessibleContext();
-            css::accessibility::XAccessibleContext* mpContext = 
xAccessibleContext.get();
-            if(mpContext != nullptr)
-                AddAllListeners( mpAccessible, pAccessible, pWND);
+                = xAccessible->getAccessibleContext();
+            if (xAccessibleContext.is())
+                AddAllListeners(xAccessible.get(), pAccessible, pWND);
         }
     }
 }
commit 59c7678a52dcbc9b6413784ba5e8078f9e304b30
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Aug 20 13:22:32 2024 +0100
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Aug 21 07:46:59 2024 +0200

    wina11y: Don't use "m" prefix for local vars
    
    The "m" prefix is for class members. Using it for
    local variable names is misleading.
    
    Change-Id: I79d62f59ac1093fcd9160ea4d8ae097d32eb40d8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172118
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
    Tested-by: Jenkins

diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx 
b/winaccessibility/source/service/AccTopWindowListener.cxx
index 12cb20f85a08..0e2a623c9fd0 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -161,15 +161,15 @@ void 
AccTopWindowListener::AddAllListeners(css::accessibility::XAccessible* pAcc
     sal_Int64 nCount = pAccessibleContext->getAccessibleChildCount();
     for (sal_Int64 i = 0; i < nCount; i++)
     {
-        Reference<css::accessibility::XAccessible> mxAccessible
-        = pAccessibleContext->getAccessibleChild(i);
+        Reference<css::accessibility::XAccessible> xAccessible
+            = pAccessibleContext->getAccessibleChild(i);
 
-        css::accessibility::XAccessible* mpAccessible = mxAccessible.get();
+        css::accessibility::XAccessible* mpAccessible = xAccessible.get();
         if(mpAccessible != nullptr)
         {
-            Reference<css::accessibility::XAccessibleContext> 
mxAccessibleContext
-            = mpAccessible->getAccessibleContext();
-            css::accessibility::XAccessibleContext* mpContext = 
mxAccessibleContext.get();
+            Reference<css::accessibility::XAccessibleContext> 
xAccessibleContext
+                = mpAccessible->getAccessibleContext();
+            css::accessibility::XAccessibleContext* mpContext = 
xAccessibleContext.get();
             if(mpContext != nullptr)
                 AddAllListeners( mpAccessible, pAccessible, pWND);
         }

Reply via email to