From 7cc9ebcaeee2a2f34a12b1e6817d8d1ef506ded1 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 16 Jul 2015 13:49:48 +0200
Subject: loplugin:simplifybool

Change-Id: Ifaae5adf238dd24438cc321202271e898fd01543
---
 dbaccess/source/filter/xml/xmlDataSource.cxx | 18 +++++++++---------
 dbaccess/source/filter/xml/xmlLogin.cxx      |  4 ++--
 dbaccess/source/ui/misc/DExport.cxx          |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'dbaccess')

diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index c84b0288172a..f1bff587e2cf 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -83,7 +83,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
             case XML_TOK_SUPPRESS_VERSION_COLUMNS:
                 try
                 {
-                    xDataSource->setPropertyValue(PROPERTY_SUPPRESSVERSIONCL,makeAny(sValue == s_sTRUE ? sal_True : sal_False));
+                    xDataSource->setPropertyValue(PROPERTY_SUPPRESSVERSIONCL,makeAny(sValue == s_sTRUE));
                     bFoundSuppressVersionColumns = true;
                 }
                 catch(const Exception&)
@@ -99,15 +99,15 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
                 break;
             case XML_TOK_IS_FIRST_ROW_HEADER_LINE:
                 aProperty.Name = INFO_TEXTFILEHEADER;
-                aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False);
+                aProperty.Value <<= (sValue == s_sTRUE);
                 break;
             case XML_TOK_SHOW_DELETED:
                 aProperty.Name = INFO_SHOWDELETEDROWS;
-                aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False);
+                aProperty.Value <<= (sValue == s_sTRUE);
                 break;
             case XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED:
                 aProperty.Name = INFO_ALLOWLONGTABLENAMES;
-                aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False);
+                aProperty.Value <<= (sValue == s_sTRUE);
                 bFoundTableNameLengthLimited = true;
                 break;
             case XML_TOK_SYSTEM_DRIVER_SETTINGS:
@@ -115,21 +115,21 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
                 break;
             case XML_TOK_ENABLE_SQL92_CHECK:
                 aProperty.Name = PROPERTY_ENABLESQL92CHECK;
-                aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False);
+                aProperty.Value <<= (sValue == s_sTRUE);
                 break;
             case XML_TOK_APPEND_TABLE_ALIAS_NAME:
                 aProperty.Name = INFO_APPEND_TABLE_ALIAS;
-                aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False);
+                aProperty.Value <<= (sValue == s_sTRUE);
                 bFoundAppendTableAliasName = true;
                 break;
             case XML_TOK_PARAMETER_NAME_SUBSTITUTION:
                 aProperty.Name = INFO_PARAMETERNAMESUBST;
-                aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False);
+                aProperty.Value <<= (sValue == s_sTRUE);
                 bFoundParamNameSubstitution = true;
                 break;
             case XML_TOK_IGNORE_DRIVER_PRIVILEGES:
                 aProperty.Name = INFO_IGNOREDRIVER_PRIV;
-                aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False);
+                aProperty.Value <<= (sValue == s_sTRUE);
                 break;
             case XML_TOK_BOOLEAN_COMPARISON_MODE:
                 aProperty.Name = PROPERTY_BOOLEANCOMPARISONMODE;
@@ -144,7 +144,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
                 break;
             case XML_TOK_USE_CATALOG:
                 aProperty.Name = INFO_USECATALOG;
-                aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False);
+                aProperty.Value <<= (sValue == s_sTRUE);
                 break;
             case XML_TOK_BASE_DN:
                 aProperty.Name = INFO_CONN_LDAP_BASEDN;
diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx
index b35e18755d43..bad2b885b03b 100644
--- a/dbaccess/source/filter/xml/xmlLogin.cxx
+++ b/dbaccess/source/filter/xml/xmlLogin.cxx
@@ -78,7 +78,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
                 case XML_TOK_IS_PASSWORD_REQUIRED:
                     try
                     {
-                        xDataSource->setPropertyValue(PROPERTY_ISPASSWORDREQUIRED,makeAny((sValue == s_sTRUE ? sal_True : sal_False)));
+                        xDataSource->setPropertyValue(PROPERTY_ISPASSWORDREQUIRED,makeAny(sValue == s_sTRUE));
                     }
                     catch(const Exception&)
                     {
@@ -91,7 +91,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
                         bUserFound = true;
                         PropertyValue aProperty;
                         aProperty.Name = "UseSystemUser";
-                        aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False);
+                        aProperty.Value <<= (sValue == s_sTRUE);
                         rImport.addInfo(aProperty);
                     }
                     break;
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index bc949e7998a4..fbdeab6659f2 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -143,7 +143,7 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection,
                                  const TColumnVector* pList,
                                  const OTypeInfoMap* _pInfoMap,
                                  SvStream& _rInputStream)
-    :m_aDestColumns(_rxConnection->getMetaData().is() && _rxConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers() == sal_True)
+    :m_aDestColumns(_rxConnection->getMetaData().is() && _rxConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers())
     ,m_xConnection(_rxConnection)
     ,m_xFormatter(_rxNumberF)
     ,m_xContext(_rxContext)
-- 
cgit