From 5a11fe87a6f1507149a0965aa740dcdf4ccef3c3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 19 Nov 2019 15:15:50 +0100 Subject: loplugin:fakebool (clang-cl) ...plus follow-up loplugin:implicitboolconversion and loplugin:redundantcast Change-Id: I9fc9c5cb46fbb50da87ff80af64cb0dfda3e5f90 Reviewed-on: https://gerrit.libreoffice.org/83207 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- winaccessibility/source/UAccCOM/AccRelation.cxx | 2 +- winaccessibility/source/UAccCOM/AccTable.cxx | 2 +- winaccessibility/source/UAccCOM/EnumVariant.cxx | 2 +- winaccessibility/source/UAccCOM/MAccessible.cxx | 12 ++++++------ winaccessibility/source/UAccCOM/MAccessible.h | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'winaccessibility') diff --git a/winaccessibility/source/UAccCOM/AccRelation.cxx b/winaccessibility/source/UAccCOM/AccRelation.cxx index dcfb4b69eafc..e2586ec5c183 100644 --- a/winaccessibility/source/UAccCOM/AccRelation.cxx +++ b/winaccessibility/source/UAccCOM/AccRelation.cxx @@ -118,7 +118,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccRelation::get_target(long targetIndex, IUn Reference xRAcc(xTargets[targetIndex], UNO_QUERY); IAccessible* pRet = nullptr; - BOOL isGet = CMAccessible::get_IAccessibleFromXAccessible(xRAcc.get(), &pRet); + bool isGet = CMAccessible::get_IAccessibleFromXAccessible(xRAcc.get(), &pRet); if(isGet) { *target = /*(IAccessible2 *)*/static_cast(pRet); diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx index fc39dc6d350e..35d1f85718ef 100644 --- a/winaccessibility/source/UAccCOM/AccTable.cxx +++ b/winaccessibility/source/UAccCOM/AccTable.cxx @@ -73,7 +73,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_accessibleAt(long row, long col IAccessible* pRet = nullptr; - BOOL isTRUE = CMAccessible::get_IAccessibleFromXAccessible(pRAcc.get(), &pRet); + bool isTRUE = CMAccessible::get_IAccessibleFromXAccessible(pRAcc.get(), &pRet); if(isTRUE) { *accessible = static_cast(pRet); diff --git a/winaccessibility/source/UAccCOM/EnumVariant.cxx b/winaccessibility/source/UAccCOM/EnumVariant.cxx index 1cbb4513d73f..ffda36a25bcc 100644 --- a/winaccessibility/source/UAccCOM/EnumVariant.cxx +++ b/winaccessibility/source/UAccCOM/EnumVariant.cxx @@ -65,7 +65,7 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Next(ULONG cElements,VARIANT __RPC_FAR * { Reference< XAccessible > pRXAcc = m_pXAccessibleSelection->getSelectedAccessibleChild(l1); IAccessible* pChild = nullptr; - BOOL isGet = CMAccessible::get_IAccessibleFromXAccessible(pRXAcc.get(), + bool isGet = CMAccessible::get_IAccessibleFromXAccessible(pRXAcc.get(), &pChild); if(isGet) { diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index d681c38a793c..7afe11a5bf32 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -1381,7 +1381,7 @@ IMAccessible* CMAccessible::GetChildInterface(long dChildID)//for test IAccessible* pChild = nullptr; Reference< XAccessible > pXChild = pRContext->getAccessibleChild(dChildID-1); - BOOL isGet = get_IAccessibleFromXAccessible(pXChild.get(), &pChild); + bool isGet = get_IAccessibleFromXAccessible(pXChild.get(), &pChild); if(!isGet) { @@ -1405,7 +1405,7 @@ IMAccessible* CMAccessible::GetChildInterface(long dChildID)//for test * need to process specifically when navigate * @return BOOL, if it is descendantmanager, return true. */ -BOOL CMAccessible::IsDescendantManage() +bool CMAccessible::IsDescendantManage() { return (m_iRole==ROLE_SYSTEM_LIST)||(m_iRole==ROLE_SYSTEM_OUTLINE)||(m_iRole==ROLE_SYSTEM_TABLE); @@ -2021,7 +2021,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_groupPosition(long __RPC_FA } int level = 0; - BOOL isFound = FALSE; + bool isFound = FALSE; while( pParentAcc.is() && !isFound) { level++; @@ -2493,7 +2493,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::Put_ActionDescription( const OLE LEAVE_PROTECTED_BLOCK } -BOOL CMAccessible::GetXInterfaceFromXAccessible(XAccessible* pXAcc, XInterface** ppXI, int index) +bool CMAccessible::GetXInterfaceFromXAccessible(XAccessible* pXAcc, XInterface** ppXI, int index) { Reference< XAccessibleContext > pRContext; @@ -2599,7 +2599,7 @@ HRESULT WINAPI CMAccessible::SmartQI(void* /*pv*/, REFIID iid, void** ppvObject) SolarMutexGuard g; XInterface* pXI = nullptr; - BOOL bFound = GetXInterfaceFromXAccessible(m_xAccessible.get(), + bool bFound = GetXInterfaceFromXAccessible(m_xAccessible.get(), &pXI, pMap->XIFIndex); if(!bFound) { @@ -2650,7 +2650,7 @@ CMAccessible::get_IAccessibleFromXAccessible(XAccessible * pXAcc, IAccessible ** { return FALSE; } - BOOL isGet = FALSE; + bool isGet = FALSE; if(g_pAgent) isGet = g_pAgent->GetIAccessibleFromXAccessible(pXAcc, ppIA); diff --git a/winaccessibility/source/UAccCOM/MAccessible.h b/winaccessibility/source/UAccCOM/MAccessible.h index cdbe0e85905d..7ec9e3212d11 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.h +++ b/winaccessibility/source/UAccCOM/MAccessible.h @@ -188,7 +188,7 @@ private: CEnumVariant* m_pEnumVar; // specify if the XAccessible is invalid - BOOL m_isDestroy; + bool m_isDestroy; css::uno::Reference m_xAccessible; // initially m_xAction and m_xContext are the same object @@ -205,7 +205,7 @@ private: HRESULT GetLastChild(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation HRESULT GetNextSibling(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation HRESULT GetPreSibling(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation - BOOL IsDescendantManage();//identify whether the current COM belongs to manage_descendant roles + bool IsDescendantManage();//identify whether the current COM belongs to manage_descendant roles // the following private methods are used to implement accSelect method HRESULT SelectChild(css::accessibility::XAccessible* pItem); @@ -218,7 +218,7 @@ private: css::accessibility::XAccessible* pXAcc); css::uno::Reference GetSelection(); // end accSelect implementation methods - static BOOL GetXInterfaceFromXAccessible(css::accessibility::XAccessible*, + static bool GetXInterfaceFromXAccessible(css::accessibility::XAccessible*, css::uno::XInterface**, int); HRESULT WINAPI SmartQI(void* pv, REFIID iid, void** ppvObject); -- cgit v1.2.3