simplify ternary conditions "xxx ? yyy : false"

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

Change-Id: Ia33c0e452aa28af3f0658a5382895aaad0246b4d

5 files changed, 5 insertions, 5 deletions

diff --git a/dbaccess/qa/complex/dbaccess/TestCase.java b/dbaccess/qa/complex/dbaccess/TestCase.java
index 7a37f5d4890c..b30bf7c2a3c1 100644
--- a/dbaccess/qa/complex/dbaccess/TestCase.java
+++ b/dbaccess/qa/complex/dbaccess/TestCase.java
@@ -124,7 +124,7 @@ public abstract class TestCase
 
         boolean noExceptionAllowed = ( _expectedExceptionClass == null );
 
-        boolean caughtExpected = noExceptionAllowed ? true : false;
+        boolean caughtExpected = noExceptionAllowed;
         try
         {
             Method method = objectClass.getMethod( _methodName, _argClasses );
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index dd7d6f800222..dc5c00d8e59a 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -946,7 +946,7 @@ bool OGenericUnoController::isUserDefinedFeature( const OUString& _rFeatureURL )
     OSL_PRECOND( pos != m_aSupportedFeatures.end(),
         "OGenericUnoController::isUserDefinedFeature: this is no supported feature at all!" );
 
-    return ( pos != m_aSupportedFeatures.end() ) ? isUserDefinedFeature( pos->second.nFeatureId ) : false;
+    return ( pos != m_aSupportedFeatures.end() ) && isUserDefinedFeature( pos->second.nFeatureId );
 }
 
 sal_Bool SAL_CALL OGenericUnoController::supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception)
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 9a326fcb2214..ccfb06a50471 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -554,7 +554,7 @@ OUString ODbDataSourceAdministrationHelper::getConnectionURL() const
 struct PropertyValueLess
 {
     bool operator() (const PropertyValue& x, const PropertyValue& y) const
-        { return x.Name < y.Name ? true : false; }      // construct prevents a MSVC6 warning
+        { return x.Name < y.Name; }      // construct prevents a MSVC6 warning
 };
 
 typedef std::set<PropertyValue, PropertyValueLess> PropertyValueSet;
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 62178173e65c..49b9497e118c 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -45,7 +45,7 @@ namespace dbaui
 {
     struct SbaURLCompare : public ::std::binary_function< ::com::sun::star::util::URL, ::com::sun::star::util::URL, bool>
     {
-        bool operator() (const ::com::sun::star::util::URL& x, const ::com::sun::star::util::URL& y) const {return x.Complete == y.Complete ? true : false;}
+        bool operator() (const ::com::sun::star::util::URL& x, const ::com::sun::star::util::URL& y) const { return x.Complete == y.Complete; }
     };
 
     class SbaXStatusMultiplexer;
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index ae0adfa4697a..4d97d18297d9 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -176,7 +176,7 @@ void OQueryViewSwitch::impl_forceSQLView()
     OAddTableDlg* pAddTabDialog( getAddTableDialog() );
 
     // hide the "Add Table" dialog
-    m_bAddTableDialogWasVisible = pAddTabDialog ? pAddTabDialog->IsVisible() : false;
+    m_bAddTableDialogWasVisible = pAddTabDialog && pAddTabDialog->IsVisible();
     if ( m_bAddTableDialogWasVisible )
         pAddTabDialog->Hide();