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

[Michael Weghorn (via logerrit)]

 winaccessibility/source/UAccCOM/MAccessible.cxx |   13 +++----------
 winaccessibility/source/UAccCOM/MAccessible.h   |    2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

New commits:
commit 8ea154ed94578cc3fa6533afa70e67e5a34e9d9a
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Mon Sep 6 15:25:24 2021 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Tue Sep 7 08:17:51 2021 +0200

    wina11y: Let CMAccessible::get_IAccessibleFromXAccessible return bool
    
    ... instead of BOOL (from minwindef.h).
    All callers already assign the result to bool anyway.
    
    Change-Id: Ica29df7218815b00346474b679e7dbb180e96a85
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121728
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index b5210180d5a9..d7e19374d8f2 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -2628,27 +2628,20 @@ HRESULT WINAPI CMAccessible::SmartQI(void* /*pv*/, REFIID iid, void** ppvObject)
     LEAVE_PROTECTED_BLOCK
 }
 
-BOOL
-CMAccessible::get_IAccessibleFromXAccessible(XAccessible * pXAcc, IAccessible **ppIA)
+bool CMAccessible::get_IAccessibleFromXAccessible(XAccessible* pXAcc, IAccessible** ppIA)
 {
-
     try
     {
-
         // #CHECK#
         if(ppIA == nullptr)
         {
-            return FALSE;
+            return false;
         }
         bool isGet = false;
         if(g_pAgent)
             isGet = g_pAgent->GetIAccessibleFromXAccessible(pXAcc, ppIA);
 
-        if(isGet)
-            return TRUE;
-        else
-            return FALSE;
-
+        return isGet;
     }
     catch(...)
     {
diff --git a/winaccessibility/source/UAccCOM/MAccessible.h b/winaccessibility/source/UAccCOM/MAccessible.h
index f7e1471c6adc..4ad335579cce 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.h
+++ b/winaccessibility/source/UAccCOM/MAccessible.h
@@ -234,7 +234,7 @@ public:
     // implement some specific MSAA methods,such as accSelection,accNavigate
     static AccObjectManagerAgent* g_pAgent;
 
-    static BOOL get_IAccessibleFromXAccessible(
+    static bool get_IAccessibleFromXAccessible(
             css::accessibility::XAccessible * pXAcc, IAccessible** ppIA);
     XGUIDToComObjHash m_containedObjects;