From ed95e1c5619e2cb2a8f6d93a1b7c45f36f1524dd Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 12 Sep 2014 13:11:40 +0200 Subject: connectivity: sal_Bool -> bool Change-Id: Id9458a3aa0928eedc87aec39f305b206e2638e67 --- .../source/drivers/evoab2/NDatabaseMetaData.cxx | 10 ++-- connectivity/source/drivers/evoab2/NDriver.cxx | 2 +- connectivity/source/drivers/evoab2/NDriver.hxx | 2 +- connectivity/source/drivers/evoab2/NResultSet.cxx | 2 +- connectivity/source/drivers/evoab2/NServices.cxx | 2 +- connectivity/source/drivers/evoab2/NStatement.cxx | 2 +- connectivity/source/drivers/evoab2/NStatement.hxx | 2 +- .../source/drivers/kab/KDatabaseMetaData.cxx | 10 ++-- .../source/drivers/kab/KDatabaseMetaData.hxx | 2 +- connectivity/source/drivers/kab/KDriver.cxx | 4 +- .../source/drivers/kab/KPreparedStatement.cxx | 2 +- .../source/drivers/kab/KPreparedStatement.hxx | 2 +- connectivity/source/drivers/kab/KResultSet.cxx | 2 +- connectivity/source/drivers/kab/KResultSet.hxx | 2 +- connectivity/source/drivers/kab/KServices.cxx | 2 +- connectivity/source/drivers/kab/KStatement.cxx | 12 ++-- connectivity/source/drivers/kab/KStatement.hxx | 2 +- connectivity/source/drivers/kab/kcondition.cxx | 64 +++++++++++----------- connectivity/source/drivers/kab/kcondition.hxx | 42 +++++++------- connectivity/source/drivers/kab/korder.cxx | 2 +- connectivity/source/drivers/kab/korder.hxx | 4 +- .../source/drivers/mork/MPreparedStatement.cxx | 2 +- .../source/drivers/mork/MPreparedStatement.hxx | 2 +- connectivity/source/drivers/mork/MStatement.cxx | 4 +- connectivity/source/drivers/mork/MStatement.hxx | 2 +- connectivity/source/drivers/odbc/OStatement.cxx | 4 +- .../source/drivers/postgresql/pq_baseresultset.cxx | 18 +++--- .../source/drivers/postgresql/pq_baseresultset.hxx | 2 +- connectivity/source/inc/odbc/OStatement.hxx | 2 +- connectivity/source/simpledbt/staticdbtools_s.cxx | 4 +- connectivity/source/simpledbt/staticdbtools_s.hxx | 4 +- 31 files changed, 109 insertions(+), 109 deletions(-) (limited to 'connectivity') diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index 12605cb3878b..c53523b5d479 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -176,7 +176,7 @@ namespace connectivity guint findEvoabField(const OUString& aColName) { guint nRet = (guint)-1; - sal_Bool bFound = sal_False; + bool bFound = false; initFields(); for (guint i=0;(i < nFields) && !bFound;i++) { @@ -184,7 +184,7 @@ namespace connectivity if (aName == aColName) { nRet = i; - bFound = sal_True; + bFound = true; } } return nRet; @@ -1105,11 +1105,11 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( const OUString aTable("TABLE"); - sal_Bool bTableFound = sal_True; + bool bTableFound = true; sal_Int32 nLength = types.getLength(); if(nLength) { - bTableFound = sal_False; + bTableFound = false; const OUString* pBegin = types.getConstArray(); const OUString* pEnd = pBegin + nLength; @@ -1117,7 +1117,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( { if(*pBegin == aTable) { - bTableFound = sal_True; + bTableFound = true; break; } } diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index acb2955c014c..b46eac9828ff 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.cxx @@ -165,7 +165,7 @@ sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion( ) throw(RuntimeException, std return 0; } -sal_Bool OEvoabDriver::acceptsURL_Stat( const OUString& url ) +bool OEvoabDriver::acceptsURL_Stat( const OUString& url ) { return ( url == "sdbc:address:evolution:local" || url == "sdbc:address:evolution:groupwise" || url == "sdbc:address:evolution:ldap" ) && EApiInit(); } diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index ba71a4b236a7..9b8fe33bb922 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -85,7 +85,7 @@ namespace connectivity getComponentContext( ) const { return comphelper::getComponentContext( m_xFactory ); } // static methods - static sal_Bool acceptsURL_Stat( const OUString& url ); + static bool acceptsURL_Stat( const OUString& url ); }; } diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 81f3bb85d637..bbf643c78a7e 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -766,7 +766,7 @@ sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) throw(SQLE { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - sal_Bool bResult = sal_False; + bool bResult = false; if ( m_xMetaData.is()) { diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx index f66e9166fc4f..5113311e3c5f 100644 --- a/connectivity/source/drivers/evoab2/NServices.cxx +++ b/connectivity/source/drivers/evoab2/NServices.cxx @@ -53,7 +53,7 @@ struct ProviderRequest } inline - sal_Bool CREATE_PROVIDER( + bool CREATE_PROVIDER( const OUString& Implname, const Sequence< OUString > & Services, ::cppu::ComponentInstantiation Factory, diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 4d7ad92e496c..95b2efe09ef5 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -64,7 +64,7 @@ OCommonStatement::OCommonStatement(OEvoabConnection* _pConnection) , m_nResultSetType(ResultSetType::FORWARD_ONLY) , m_nFetchDirection(FetchDirection::FORWARD) , m_nResultSetConcurrency(ResultSetConcurrency::UPDATABLE) - , m_bEscapeProcessing(sal_True) + , m_bEscapeProcessing(true) { m_pConnection->acquire(); diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index 0a499aadd255..bc6467c41167 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -161,7 +161,7 @@ namespace connectivity sal_Int32 m_nResultSetType; sal_Int32 m_nFetchDirection; sal_Int32 m_nResultSetConcurrency; - sal_Bool m_bEscapeProcessing; + bool m_bEscapeProcessing; // protected: diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx index 5e4b2fbaaf40..a50529ce700a 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx @@ -36,7 +36,7 @@ using namespace com::sun::star::sdbc; KabDatabaseMetaData::KabDatabaseMetaData(KabConnection* _pCon) : m_xConnection(_pCon), - m_bUseCatalog(sal_True) + m_bUseCatalog(true) { OSL_ENSURE(_pCon,"KabDatabaseMetaData::KabDatabaseMetaData: No connection set!"); @@ -226,7 +226,7 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsDifferentTableCorrelationNames( sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart( ) throw(SQLException, RuntimeException, std::exception) { - sal_Bool bValue = sal_False; + bool bValue = false; if (m_bUseCatalog) { } @@ -931,19 +931,19 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( // for the moment, we answer only the "TABLE" table type // when no types are given at all, we return all the tables static const OUString aTable("TABLE"); - sal_Bool bTableFound = sal_False; + bool bTableFound = false; const OUString* p = types.getConstArray(), * pEnd = p + types.getLength(); if (p == pEnd) { - bTableFound = sal_True; + bTableFound = true; } else while (p < pEnd) { if (match(*p, aTable, '\0')) { - bTableFound = sal_True; + bTableFound = true; break; } p++; diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx index 33cad87d0c31..d3de2e4307d2 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx @@ -37,7 +37,7 @@ namespace connectivity class KabDatabaseMetaData : public KabDatabaseMetaData_BASE { ::com::sun::star::uno::Reference< KabConnection > m_xConnection; - sal_Bool m_bUseCatalog; + bool m_bUseCatalog; public: diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx index 23ec9cd85806..94a890edad5a 100644 --- a/connectivity/source/drivers/kab/KDriver.cxx +++ b/connectivity/source/drivers/kab/KDriver.cxx @@ -194,10 +194,10 @@ bool KabImplModule::impl_doAllowNewKDEVersion() aCreationArgs ), UNO_QUERY_THROW ); - sal_Bool bDisableCheck = sal_False; + bool bDisableCheck = false; xSettings->getPropertyValue("DisableKDEMaximumVersionCheck") >>= bDisableCheck; - return bDisableCheck != sal_False; + return bDisableCheck; } catch( const Exception& ) { diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx index e97298e265b8..300bd261e5ca 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.cxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx @@ -87,7 +87,7 @@ KabPreparedStatement::KabPreparedStatement( const OUString& sql) : KabPreparedStatement_BASE(_pConnection), m_sSqlStatement(sql), - m_bPrepared(sal_False), + m_bPrepared(false), m_nParameterIndex(0), m_aParameterRow() { diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx index f55454fff06b..a9ba3de46293 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.hxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx @@ -43,7 +43,7 @@ namespace connectivity OUString m_sSqlStatement; ::rtl::Reference< KabResultSetMetaData > m_xMetaData; - sal_Bool m_bPrepared; + bool m_bPrepared; mutable sal_Int32 m_nParameterIndex; OValueRow m_aParameterRow; diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx index 2e8cb8d4ad66..ab79cfcd795f 100644 --- a/connectivity/source/drivers/kab/KResultSet.cxx +++ b/connectivity/source/drivers/kab/KResultSet.cxx @@ -51,7 +51,7 @@ KabResultSet::KabResultSet(KabCommonStatement* pStmt) m_xMetaData(NULL), m_aKabAddressees(), m_nRowPos(-1), - m_bWasNull(sal_True) + m_bWasNull(true) { } diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx index 6a41a30902d9..4e453ec0c332 100644 --- a/connectivity/source/drivers/kab/KResultSet.hxx +++ b/connectivity/source/drivers/kab/KResultSet.hxx @@ -62,7 +62,7 @@ namespace connectivity ::rtl::Reference< KabResultSetMetaData > m_xMetaData; // the description of the columns in this result set ::KABC::Addressee::List m_aKabAddressees; // address book entries matching the query sal_Int32 m_nRowPos; // the current row within the result set - sal_Bool m_bWasNull; // last entry retrieved from this result set was NULL + bool m_bWasNull; // last entry retrieved from this result set was NULL // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx index dc99bce6e61f..fb0c2dd43892 100644 --- a/connectivity/source/drivers/kab/KServices.cxx +++ b/connectivity/source/drivers/kab/KServices.cxx @@ -53,7 +53,7 @@ struct ProviderRequest } inline - sal_Bool CREATE_PROVIDER( + bool CREATE_PROVIDER( const OUString& Implname, const Sequence< OUString > & Services, ::cppu::ComponentInstantiation Factory, diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index 65dcb06d1b45..2721a7da0b95 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.cxx @@ -269,7 +269,7 @@ KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNo { OUString sColumnName = pColumnRef->getChild(0)->getTokenValue(); - sal_Bool bAscending = + bool bAscending = SQL_ISTOKEN(pAscendingDescending, DESC)? sal_False: sal_True; @@ -285,17 +285,17 @@ KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNo return 0; } -sal_Bool KabCommonStatement::isTableKnown(KabResultSet *pResult) const +bool KabCommonStatement::isTableKnown(KabResultSet *pResult) const { // can handle requests like SELECT * FROM addresses addresses // but cannot handle requests like SELECT * FROM addresses persons if (m_aSQLIterator.getTables().size() != 1) - return sal_False; + return false; if (m_aSQLIterator.getTables().begin()->first != pResult->getMetaData()->getTableName(0)) - return sal_False; + return false; - return sal_True; + return true; } void KabCommonStatement::setKabFields(KabResultSet *pResult) const throw(SQLException) @@ -515,7 +515,7 @@ sal_Bool KabCommonStatement::convertFastPropertyValue( sal_Int32, const Any&) throw (::com::sun::star::lang::IllegalArgumentException) { - sal_Bool bConverted = sal_False; + bool bConverted = false; // here we have to try to convert return bConverted; } diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx index a1455fd80e9e..9c45ea1fa380 100644 --- a/connectivity/source/drivers/kab/KStatement.hxx +++ b/connectivity/source/drivers/kab/KStatement.hxx @@ -63,7 +63,7 @@ namespace connectivity const OSQLParseNode *pParseNode) const throw(::com::sun::star::sdbc::SQLException); class KabOrder *analyseOrderByClause( const OSQLParseNode *pParseNode) const throw(::com::sun::star::sdbc::SQLException); - sal_Bool isTableKnown(class KabResultSet *pResult) const; + bool isTableKnown(class KabResultSet *pResult) const; void setKabFields(class KabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); void selectAddressees(KabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); void sortAddressees(KabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); diff --git a/connectivity/source/drivers/kab/kcondition.cxx b/connectivity/source/drivers/kab/kcondition.cxx index 52fa34e60f76..c5b6879b3f8e 100644 --- a/connectivity/source/drivers/kab/kcondition.cxx +++ b/connectivity/source/drivers/kab/kcondition.cxx @@ -29,23 +29,23 @@ KabCondition::~KabCondition() { } -KabConditionConstant::KabConditionConstant(const sal_Bool bValue) +KabConditionConstant::KabConditionConstant(const bool bValue) : KabCondition(), m_bValue(bValue) { } -sal_Bool KabConditionConstant::isAlwaysTrue() const +bool KabConditionConstant::isAlwaysTrue() const { return m_bValue; } -sal_Bool KabConditionConstant::isAlwaysFalse() const +bool KabConditionConstant::isAlwaysFalse() const { return !m_bValue; } -sal_Bool KabConditionConstant::eval(const ::KABC::Addressee &) const +bool KabConditionConstant::eval(const ::KABC::Addressee &) const { return m_bValue; } @@ -56,16 +56,16 @@ KabConditionColumn::KabConditionColumn(const OUString &sColumnName) throw(SQLExc { } -sal_Bool KabConditionColumn::isAlwaysTrue() const +bool KabConditionColumn::isAlwaysTrue() const { // Sometimes true, sometimes false - return sal_False; + return false; } -sal_Bool KabConditionColumn::isAlwaysFalse() const +bool KabConditionColumn::isAlwaysFalse() const { // Sometimes true, sometimes false - return sal_False; + return false; } KabConditionNull::KabConditionNull(const OUString &sColumnName) throw(SQLException) @@ -73,7 +73,7 @@ KabConditionNull::KabConditionNull(const OUString &sColumnName) throw(SQLExcepti { } -sal_Bool KabConditionNull::eval(const ::KABC::Addressee &aAddressee) const +bool KabConditionNull::eval(const ::KABC::Addressee &aAddressee) const { QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber); @@ -87,7 +87,7 @@ KabConditionNotNull::KabConditionNotNull(const OUString &sColumnName) throw(SQLE { } -sal_Bool KabConditionNotNull::eval(const ::KABC::Addressee &aAddressee) const +bool KabConditionNotNull::eval(const ::KABC::Addressee &aAddressee) const { QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber); @@ -107,7 +107,7 @@ KabConditionEqual::KabConditionEqual(const OUString &sColumnName, const OUString { } -sal_Bool KabConditionEqual::eval(const ::KABC::Addressee &aAddressee) const +bool KabConditionEqual::eval(const ::KABC::Addressee &aAddressee) const { QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber); // Timestamps should not be compared according to their string value @@ -115,7 +115,7 @@ sal_Bool KabConditionEqual::eval(const ::KABC::Addressee &aAddressee) const // {ts '2004-03-29 12:55:00.000000'} // They should also support operators like '<' or '>=' - if (aQtName.isNull()) return sal_False; + if (aQtName.isNull()) return false; OUString sValue((const sal_Unicode *) aQtName.ucs2()); return sValue == m_sMatchString; @@ -126,11 +126,11 @@ KabConditionDifferent::KabConditionDifferent(const OUString &sColumnName, const { } -sal_Bool KabConditionDifferent::eval(const ::KABC::Addressee &aAddressee) const +bool KabConditionDifferent::eval(const ::KABC::Addressee &aAddressee) const { QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber); - if (aQtName.isNull()) return sal_False; + if (aQtName.isNull()) return false; OUString sValue((const sal_Unicode *) aQtName.ucs2()); return sValue != m_sMatchString; @@ -141,11 +141,11 @@ KabConditionSimilar::KabConditionSimilar(const OUString &sColumnName, const OUSt { } -sal_Bool KabConditionSimilar::eval(const ::KABC::Addressee &aAddressee) const +bool KabConditionSimilar::eval(const ::KABC::Addressee &aAddressee) const { QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber); - if (aQtName.isNull()) return sal_False; + if (aQtName.isNull()) return false; OUString sValue((const sal_Unicode *) aQtName.ucs2()); return match(m_sMatchString, sValue, '\0'); @@ -169,26 +169,26 @@ KabConditionOr::KabConditionOr(KabCondition *pLeft, KabCondition *pRight) { } -sal_Bool KabConditionOr::isAlwaysTrue() const +bool KabConditionOr::isAlwaysTrue() const { return m_pLeft->isAlwaysTrue() || m_pRight->isAlwaysTrue(); } -sal_Bool KabConditionOr::isAlwaysFalse() const +bool KabConditionOr::isAlwaysFalse() const { return m_pLeft->isAlwaysFalse() && m_pRight->isAlwaysFalse(); } -sal_Bool KabConditionOr::eval(const ::KABC::Addressee &aAddressee) const +bool KabConditionOr::eval(const ::KABC::Addressee &aAddressee) const { // We avoid evaluating terms as much as we can - if (m_pLeft->isAlwaysTrue() || m_pRight->isAlwaysTrue()) return sal_True; - if (m_pLeft->isAlwaysFalse() && m_pRight->isAlwaysFalse()) return sal_False; + if (m_pLeft->isAlwaysTrue() || m_pRight->isAlwaysTrue()) return true; + if (m_pLeft->isAlwaysFalse() && m_pRight->isAlwaysFalse()) return false; - if (m_pLeft->eval(aAddressee)) return sal_True; - if (m_pRight->eval(aAddressee)) return sal_True; + if (m_pLeft->eval(aAddressee)) return true; + if (m_pRight->eval(aAddressee)) return true; - return sal_False; + return false; } KabConditionAnd::KabConditionAnd(KabCondition *pLeft, KabCondition *pRight) @@ -196,26 +196,26 @@ KabConditionAnd::KabConditionAnd(KabCondition *pLeft, KabCondition *pRight) { } -sal_Bool KabConditionAnd::isAlwaysTrue() const +bool KabConditionAnd::isAlwaysTrue() const { return m_pLeft->isAlwaysTrue() && m_pRight->isAlwaysTrue(); } -sal_Bool KabConditionAnd::isAlwaysFalse() const +bool KabConditionAnd::isAlwaysFalse() const { return m_pLeft->isAlwaysFalse() || m_pRight->isAlwaysFalse(); } -sal_Bool KabConditionAnd::eval(const ::KABC::Addressee &aAddressee) const +bool KabConditionAnd::eval(const ::KABC::Addressee &aAddressee) const { // We avoid evaluating terms as much as we can - if (m_pLeft->isAlwaysFalse() || m_pRight->isAlwaysFalse()) return sal_False; - if (m_pLeft->isAlwaysTrue() && m_pRight->isAlwaysTrue()) return sal_True; + if (m_pLeft->isAlwaysFalse() || m_pRight->isAlwaysFalse()) return false; + if (m_pLeft->isAlwaysTrue() && m_pRight->isAlwaysTrue()) return true; - if (!m_pLeft->eval(aAddressee)) return sal_False; - if (!m_pRight->eval(aAddressee)) return sal_False; + if (!m_pLeft->eval(aAddressee)) return false; + if (!m_pRight->eval(aAddressee)) return false; - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx index 4bed162305d8..7d1a3031295d 100644 --- a/connectivity/source/drivers/kab/kcondition.hxx +++ b/connectivity/source/drivers/kab/kcondition.hxx @@ -33,21 +33,21 @@ class KabCondition { public: virtual ~KabCondition(); - virtual sal_Bool isAlwaysTrue() const = 0; - virtual sal_Bool isAlwaysFalse() const = 0; - virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const = 0; + virtual bool isAlwaysTrue() const = 0; + virtual bool isAlwaysFalse() const = 0; + virtual bool eval(const ::KABC::Addressee &aAddressee) const = 0; }; class KabConditionConstant : public KabCondition { protected: - sal_Bool m_bValue; + bool m_bValue; public: - KabConditionConstant(const sal_Bool bValue); - virtual sal_Bool isAlwaysTrue() const SAL_OVERRIDE; - virtual sal_Bool isAlwaysFalse() const SAL_OVERRIDE; - virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; + KabConditionConstant(const bool bValue); + virtual bool isAlwaysTrue() const SAL_OVERRIDE; + virtual bool isAlwaysFalse() const SAL_OVERRIDE; + virtual bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; }; class KabConditionColumn : public KabCondition @@ -60,8 +60,8 @@ class KabConditionColumn : public KabCondition public: KabConditionColumn( const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool isAlwaysTrue() const SAL_OVERRIDE; - virtual sal_Bool isAlwaysFalse() const SAL_OVERRIDE; + virtual bool isAlwaysTrue() const SAL_OVERRIDE; + virtual bool isAlwaysFalse() const SAL_OVERRIDE; }; class KabConditionNull : public KabConditionColumn @@ -69,7 +69,7 @@ class KabConditionNull : public KabConditionColumn public: KabConditionNull( const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; + virtual bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; }; class KabConditionNotNull : public KabConditionColumn @@ -77,7 +77,7 @@ class KabConditionNotNull : public KabConditionColumn public: KabConditionNotNull( const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; + virtual bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; }; class KabConditionCompare : public KabConditionColumn @@ -97,7 +97,7 @@ class KabConditionEqual : public KabConditionCompare KabConditionEqual( const OUString &sColumnName, const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; + virtual bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; }; class KabConditionDifferent : public KabConditionCompare @@ -106,7 +106,7 @@ class KabConditionDifferent : public KabConditionCompare KabConditionDifferent( const OUString &sColumnName, const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; + virtual bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; }; class KabConditionSimilar : public KabConditionCompare @@ -115,7 +115,7 @@ class KabConditionSimilar : public KabConditionCompare KabConditionSimilar( const OUString &sColumnName, const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); - virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; + virtual bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; }; class KabConditionBoolean : public KabCondition @@ -132,18 +132,18 @@ class KabConditionOr : public KabConditionBoolean { public: KabConditionOr(KabCondition *pLeft, KabCondition *pRight); - virtual sal_Bool isAlwaysTrue() const SAL_OVERRIDE; - virtual sal_Bool isAlwaysFalse() const SAL_OVERRIDE; - virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; + virtual bool isAlwaysTrue() const SAL_OVERRIDE; + virtual bool isAlwaysFalse() const SAL_OVERRIDE; + virtual bool eval(const ::KABC::Addressee &aAddressee) const SAL_OVERRIDE; }; class KabConditionAnd : public KabConditionBoolean { public: KabConditionAnd(KabCondition *pLeft, KabCondition *pRight); - virtual sal_Bool isAlwaysTrue() const SAL_OVERRIDE; - virtual sal_Bool isAlwaysFalse() const SAL_OVERRIDE; - virtual sal_Bool eval(const ::KABC::Addressee &addressee) const SAL_OVERRIDE; + virtual bool isAlwaysTrue() const SAL_OVERRIDE; + virtual bool isAlwaysFalse() const SAL_OVERRIDE; + virtual bool eval(const ::KABC::Addressee &addressee) const SAL_OVERRIDE; }; } diff --git a/connectivity/source/drivers/kab/korder.cxx b/connectivity/source/drivers/kab/korder.cxx index cb9fe4494932..3948d5ee7b42 100644 --- a/connectivity/source/drivers/kab/korder.cxx +++ b/connectivity/source/drivers/kab/korder.cxx @@ -27,7 +27,7 @@ KabOrder::~KabOrder() { } -KabSimpleOrder::KabSimpleOrder(OUString &sColumnName, sal_Bool bAscending) +KabSimpleOrder::KabSimpleOrder(OUString &sColumnName, bool bAscending) : KabOrder(), m_nFieldNumber(findKabField(sColumnName)), m_bAscending(bAscending) diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx index 758c4572e061..7cbda900f6cc 100644 --- a/connectivity/source/drivers/kab/korder.hxx +++ b/connectivity/source/drivers/kab/korder.hxx @@ -40,11 +40,11 @@ namespace connectivity class KabSimpleOrder : public KabOrder { sal_Int32 m_nFieldNumber; - sal_Bool m_bAscending; + bool m_bAscending; QString value(const ::KABC::Addressee &aAddressee) const; public: - KabSimpleOrder(OUString &sColumnName, sal_Bool bAscending); + KabSimpleOrder(OUString &sColumnName, bool bAscending); virtual sal_Int32 compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const SAL_OVERRIDE; }; diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index 2ed87e665e13..7d96805fd520 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -78,7 +78,7 @@ void SAL_CALL OPreparedStatement::disposing() } -OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sql , sal_Bool bAdjusted ) +OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sql , bool bAdjusted ) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) { StatementType eStatementType = OCommonStatement::parseSql( sql, bAdjusted ); diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx index 3091680abbeb..15b02109954a 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx @@ -79,7 +79,7 @@ namespace connectivity // OCommonStatement overridables virtual StatementType - parseSql( const OUString& sql , sal_Bool bAdjusted = sal_False) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + parseSql( const OUString& sql , bool bAdjusted = false) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; virtual void initializeResultSet( OResultSet* _pResult ) SAL_OVERRIDE; virtual void clearCachedResultSet() SAL_OVERRIDE; virtual void cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult ) SAL_OVERRIDE; diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index ebff5ef2dc9f..1ee4b8c62c98 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -187,7 +187,7 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException ) */ } -OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , sal_Bool bAdjusted) +OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , bool bAdjusted) throw ( SQLException, RuntimeException ) { OUString aErr; @@ -253,7 +253,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql else if(!bAdjusted) //Our sql parser does not support a statement like "create table foo" // So we append ("E-mail" varchar) to the last of it to make it work { - return parseSql(sql + "(""E-mail"" character)", sal_True); + return parseSql(sql + "(""E-mail"" character)", true); } getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this ); diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index 0ca38cffde17..aa25fc49053d 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -123,7 +123,7 @@ namespace connectivity /** called to do the parsing of a to-be-executed SQL statement, and set all members as needed */ virtual StatementType - parseSql( const OUString& sql , sal_Bool bAdjusted = sal_False) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + parseSql( const OUString& sql , bool bAdjusted = false) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); /** called to initialize a result set, according to a previously parsed SQL statement */ virtual void initializeResultSet( OResultSet* _pResult ); diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 48703371c777..879d9c22b9f3 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -790,7 +790,7 @@ void OStatement_Base::setResultSetType(sal_Int32 _par0) ((nCurProp & SQL_CA2_SENSITIVITY_ADDITIONS) != SQL_CA2_SENSITIVITY_ADDITIONS)) { // bookmarks for keyset isn't supported so reset bookmark setting - setUsingBookmarks(sal_False); + setUsingBookmarks(false); nSet = SQL_CURSOR_DYNAMIC; } } @@ -875,7 +875,7 @@ bool OStatement_Base::getEscapeProcessing() const return SQL_NOSCAN_OFF == getStmtOption(SQL_ATTR_USE_BOOKMARKS, SQL_NOSCAN_OFF);; } -void OStatement_Base::setUsingBookmarks(sal_Bool _bUseBookmark) +void OStatement_Base::setUsingBookmarks(bool _bUseBookmark) { OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); SQLULEN nValue = _bUseBookmark ? SQL_UB_VARIABLE : SQL_UB_OFF; diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx index 55a670291f77..3fd0d7492f38 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx @@ -402,7 +402,7 @@ sal_Bool BaseResultSet::getBoolean( sal_Int32 columnIndex ) throw (SQLException, MutexGuard guard( m_refMutex->mutex ); checkClosed(); checkColumnIndex( columnIndex ); - checkRowIndex( sal_True /* must be on row */ ); + checkRowIndex( true /* must be on row */ ); OUString str = getString( columnIndex ); @@ -428,7 +428,7 @@ sal_Int8 BaseResultSet::getByte( sal_Int32 columnIndex ) MutexGuard guard( m_refMutex->mutex ); checkClosed(); checkColumnIndex( columnIndex ); - checkRowIndex( sal_True /* must be on row */ ); + checkRowIndex( true /* must be on row */ ); sal_Int8 b = 0; convertTo( getValue( columnIndex ), getCppuType( &b )) >>= b; return b; @@ -440,7 +440,7 @@ sal_Int16 BaseResultSet::getShort( sal_Int32 columnIndex ) MutexGuard guard( m_refMutex->mutex ); checkClosed(); checkColumnIndex( columnIndex ); - checkRowIndex( sal_True /* must be on row */ ); + checkRowIndex( true /* must be on row */ ); sal_Int16 i = 0; convertTo( getValue( columnIndex ), getCppuType( &i )) >>= i; return i; @@ -451,7 +451,7 @@ OUString BaseResultSet::getString( sal_Int32 columnIndex ) throw (SQLException, MutexGuard guard(m_refMutex->mutex); checkClosed(); checkColumnIndex( columnIndex ); - checkRowIndex( sal_True /* must be on row */ ); + checkRowIndex( true /* must be on row */ ); OUString ret; convertTo( getValue( columnIndex ), getCppuType( &ret ) ) >>= ret; // printf( "BaseResultSet::getString() %s\n" , OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ).getStr() ); @@ -464,7 +464,7 @@ sal_Int32 BaseResultSet::getInt( sal_Int32 columnIndex ) MutexGuard guard( m_refMutex->mutex ); checkClosed(); checkColumnIndex( columnIndex ); - checkRowIndex( sal_True /* must be on row */ ); + checkRowIndex( true /* must be on row */ ); sal_Int32 i = 0; convertTo( getValue( columnIndex ), getCppuType( &i )) >>= i; return i; @@ -476,7 +476,7 @@ sal_Int64 BaseResultSet::getLong( sal_Int32 columnIndex ) MutexGuard guard( m_refMutex->mutex ); checkClosed(); checkColumnIndex( columnIndex ); - checkRowIndex( sal_True /* must be on row */ ); + checkRowIndex( true /* must be on row */ ); sal_Int64 i = 0; convertTo( getValue( columnIndex ), getCppuType( &i )) >>= i; return i; @@ -488,7 +488,7 @@ float BaseResultSet::getFloat( sal_Int32 columnIndex ) MutexGuard guard( m_refMutex->mutex ); checkClosed(); checkColumnIndex( columnIndex ); - checkRowIndex( sal_True /* must be on row */ ); + checkRowIndex( true /* must be on row */ ); float f = 0.; convertTo( getValue( columnIndex ), getCppuType( &f )) >>= f; return f; @@ -511,7 +511,7 @@ Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32 columnIndex ) MutexGuard guard( m_refMutex->mutex ); checkClosed(); checkColumnIndex( columnIndex ); - checkRowIndex( sal_True /* must be on row */ ); + checkRowIndex( true /* must be on row */ ); Sequence< sal_Int8 > ret; OUString ustr; @@ -682,7 +682,7 @@ void BaseResultSet::checkColumnIndex(sal_Int32 index ) throw ( SQLException, Run } -void BaseResultSet::checkRowIndex( sal_Bool mustBeOnValidRow ) +void BaseResultSet::checkRowIndex( bool mustBeOnValidRow ) { OUStringBuffer buf( 128 ); buf.appendAscii( "pq_baseresultset: row index out of range, allowed is " ); diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx index a405b2ba9059..1adf0c95689c 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx @@ -87,7 +87,7 @@ protected: throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ) = 0; virtual void checkColumnIndex( sal_Int32 index ) throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); - virtual void checkRowIndex( sal_Bool mustBeOnValidRow ); + virtual void checkRowIndex( bool mustBeOnValidRow ); virtual ::com::sun::star::uno::Any getValue( sal_Int32 columnIndex ) = 0; com::sun::star::uno::Any convertTo( diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 9c2ecfd75a06..03a070c3c0b2 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -101,7 +101,7 @@ namespace connectivity virtual void setResultSetConcurrency(sal_Int32 _par0) ; virtual void setResultSetType(sal_Int32 _par0) ; - virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ; + virtual void setUsingBookmarks(bool _bUseBookmark) ; void reset() throw (css::sdbc::SQLException, css::uno::RuntimeException); void clearMyResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException); diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx index 56c8401ca6be..fb5587f02db7 100644 --- a/connectivity/source/simpledbt/staticdbtools_s.cxx +++ b/connectivity/source/simpledbt/staticdbtools_s.cxx @@ -78,7 +78,7 @@ namespace connectivity } - Reference< XConnection> ODataAccessStaticTools::connectRowset(const Reference< XRowSet>& _rxRowSet, const Reference< XComponentContext >& _rxContext, sal_Bool _bSetAsActiveConnection) const + Reference< XConnection> ODataAccessStaticTools::connectRowset(const Reference< XRowSet>& _rxRowSet, const Reference< XComponentContext >& _rxContext, bool _bSetAsActiveConnection) const { return ::dbtools::connectRowset( _rxRowSet, _rxContext, _bSetAsActiveConnection); } @@ -92,7 +92,7 @@ namespace connectivity } - Reference< XNumberFormatsSupplier> ODataAccessStaticTools::getNumberFormats(const Reference< XConnection>& _rxConn, sal_Bool _bAllowDefault) const + Reference< XNumberFormatsSupplier> ODataAccessStaticTools::getNumberFormats(const Reference< XConnection>& _rxConn, bool _bAllowDefault) const { return ::dbtools::getNumberFormats(_rxConn, _bAllowDefault); } diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx index 7ad25ae9481b..ce240b11312e 100644 --- a/connectivity/source/simpledbt/staticdbtools_s.hxx +++ b/connectivity/source/simpledbt/staticdbtools_s.hxx @@ -75,7 +75,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext, - sal_Bool _bSetAsActiveConnection + bool _bSetAsActiveConnection ) const SAL_OVERRIDE; @@ -86,7 +86,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, - sal_Bool _bAllowDefault + bool _bAllowDefault ) const SAL_OVERRIDE; -- cgit