From 4f9b21248ffdf55cef9f3f9d1da76778ee000775 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 2 May 2014 15:42:25 +0200
Subject: simplify ternary conditions "xxx ? yyy : false"

Look for code like:
   xxx ? yyy : false;
Which can be simplified to:
   xxx && yyy

Change-Id: Ia33c0e452aa28af3f0658a5382895aaad0246b4d
---
 toolkit/qa/complex/toolkit/Assert.java                | 2 +-
 toolkit/source/awt/vclxwindow.cxx                     | 2 +-
 toolkit/source/controls/controlmodelcontainerbase.cxx | 4 ++--
 toolkit/source/controls/geometrycontrolmodel.cxx      | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/qa/complex/toolkit/Assert.java b/toolkit/qa/complex/toolkit/Assert.java
index 609befcc3dd6..a413fb8e7ff3 100644
--- a/toolkit/qa/complex/toolkit/Assert.java
+++ b/toolkit/qa/complex/toolkit/Assert.java
@@ -51,7 +51,7 @@ public class Assert
 
         boolean noExceptionAllowed = ( i_expectedExceptionClass == null );
 
-        boolean caughtExpected = noExceptionAllowed ? true : false;
+        boolean caughtExpected = noExceptionAllowed;
         try
         {
             Method method = impl_getMethod( objectClass, i_methodName, i_argClasses );
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index b7e48d50af36..d424479021aa 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -378,7 +378,7 @@ void VCLXWindow::SetWindow( Window* pWindow )
     if ( GetWindow() )
     {
         GetWindow()->AddEventListener( LINK( this, VCLXWindow, WindowEventListener ) );
-        bool bDirectVisible = pWindow ? pWindow->IsVisible() : false;
+        bool bDirectVisible = pWindow && pWindow->IsVisible();
         mpImpl->setDirectVisible( bDirectVisible );
     }
 }
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index b1426faaa8d7..fe33e1ea40c1 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -134,7 +134,7 @@ public:
 
     bool operator()( const ControlModelContainerBase::UnoControlModelHolder& _rCompare )
     {
-        return ( _rCompare.second == m_rName ) ? true : false;
+        return _rCompare.second == m_rName;
     }
 };
 
@@ -172,7 +172,7 @@ public:
 
     bool operator()( const ControlModelContainerBase::UnoControlModelHolder& _rCompare )
     {
-        return ( _rCompare.first.get() == m_xReference.get() ) ? true : false;
+        return _rCompare.first.get() == m_xReference.get();
     }
 };
 
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 786e0b3fcf17..18f470a6240a 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -498,7 +498,7 @@
     {
         bool operator()( const Property& _rLHS, const Property& _rRHS )
         {
-            return _rLHS.Name < _rRHS.Name ? true : false;
+            return _rLHS.Name < _rRHS.Name;
         }
     };
 
@@ -510,7 +510,7 @@
 
         bool operator()( const Property& _rLHS )
         {
-            return _rLHS.Name == m_rCompare ? true : false;
+            return _rLHS.Name == m_rCompare;
         }
     };
 
@@ -593,7 +593,7 @@
 
         bool operator()( sal_Int32 _nLHS )
         {
-            return _nLHS == m_nCompare ? true  : false;
+            return _nLHS == m_nCompare;
         }
     };
 
-- 
cgit