From 5f19287a9cd4167e3be937e3df820446f2e30518 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 27 May 2020 14:49:41 +0200 Subject: loplugin:simplifybool in accessibility..basic Change-Id: Ibf6cef4baa2d3d400d953ac8bc97a66b5901def9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94972 Tested-by: Jenkins Reviewed-by: Noel Grandin --- accessibility/source/extended/accessibletabbarpagelist.cxx | 6 +++--- accessibility/source/standard/accessiblemenubasecomponent.cxx | 2 +- accessibility/source/standard/vclxaccessiblestatusbar.cxx | 8 ++++---- accessibility/source/standard/vclxaccessibletabcontrol.cxx | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'accessibility') diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index 680e0e70ba97..7fd901037c07 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -88,7 +88,7 @@ namespace accessibility void AccessibleTabBarPageList::UpdatePageText( sal_Int32 i ) { - if ( !(i >= 0 && i < static_cast(m_aAccessibleChildren.size())) ) + if ( i < 0 || i >= static_cast(m_aAccessibleChildren.size()) ) return; Reference< XAccessible > xChild( m_aAccessibleChildren[i] ); @@ -106,7 +106,7 @@ namespace accessibility void AccessibleTabBarPageList::InsertChild( sal_Int32 i ) { - if ( !(i >= 0 && i <= static_cast(m_aAccessibleChildren.size())) ) + if ( i < 0 || i > static_cast(m_aAccessibleChildren.size()) ) return; // insert entry in child list @@ -125,7 +125,7 @@ namespace accessibility void AccessibleTabBarPageList::RemoveChild( sal_Int32 i ) { - if ( !(i >= 0 && i < static_cast(m_aAccessibleChildren.size())) ) + if ( i < 0 || i >= static_cast(m_aAccessibleChildren.size()) ) return; // get the accessible of the removed page diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index d3070d1bacb6..3c5cdd53c71f 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -409,7 +409,7 @@ void OAccessibleMenuBaseComponent::InsertChild( sal_Int32 i ) void OAccessibleMenuBaseComponent::RemoveChild( sal_Int32 i ) { - if ( !(i >= 0 && i < static_cast(m_aAccessibleChildren.size())) ) + if ( i < 0 || i >= static_cast(m_aAccessibleChildren.size()) ) return; // keep the accessible of the removed item diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index ff6351c6bd7c..e84825ea0b3f 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -62,7 +62,7 @@ void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i, bool bShowing ) void VCLXAccessibleStatusBar::UpdateItemName( sal_Int32 i ) { - if ( !(i >= 0 && i < static_cast(m_aAccessibleChildren.size())) ) + if ( i < 0 || i >= static_cast(m_aAccessibleChildren.size()) ) return; Reference< XAccessible > xChild( m_aAccessibleChildren[i] ); @@ -80,7 +80,7 @@ void VCLXAccessibleStatusBar::UpdateItemName( sal_Int32 i ) void VCLXAccessibleStatusBar::UpdateItemText( sal_Int32 i ) { - if ( !(i >= 0 && i < static_cast(m_aAccessibleChildren.size())) ) + if ( i < 0 || i >= static_cast(m_aAccessibleChildren.size()) ) return; Reference< XAccessible > xChild( m_aAccessibleChildren[i] ); @@ -98,7 +98,7 @@ void VCLXAccessibleStatusBar::UpdateItemText( sal_Int32 i ) void VCLXAccessibleStatusBar::InsertChild( sal_Int32 i ) { - if ( !(i >= 0 && i <= static_cast(m_aAccessibleChildren.size())) ) + if ( i < 0 || i > static_cast(m_aAccessibleChildren.size()) ) return; // insert entry in child list @@ -117,7 +117,7 @@ void VCLXAccessibleStatusBar::InsertChild( sal_Int32 i ) void VCLXAccessibleStatusBar::RemoveChild( sal_Int32 i ) { - if ( !(i >= 0 && i < static_cast(m_aAccessibleChildren.size())) ) + if ( i < 0 || i >= static_cast(m_aAccessibleChildren.size()) ) return; // get the accessible of the removed page diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index 4842e43b2c6c..29fea97781a6 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -116,7 +116,7 @@ void VCLXAccessibleTabControl::UpdateTabPage( sal_Int32 i, bool bNew ) void VCLXAccessibleTabControl::InsertChild( sal_Int32 i ) { - if ( !(i >= 0 && i <= static_cast(m_aAccessibleChildren.size())) ) + if ( i < 0 || i > static_cast(m_aAccessibleChildren.size()) ) return; // insert entry in child list @@ -135,7 +135,7 @@ void VCLXAccessibleTabControl::InsertChild( sal_Int32 i ) void VCLXAccessibleTabControl::RemoveChild( sal_Int32 i ) { - if ( !(i >= 0 && i < static_cast(m_aAccessibleChildren.size())) ) + if ( i < 0 || i >= static_cast(m_aAccessibleChildren.size()) ) return; // get the accessible of the removed page -- cgit