diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-16 09:14:24 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-16 11:51:51 +0200 |
commit | 199d333f131474729a105afa5a3da61205f61df2 (patch) | |
tree | 01c0270df697b8857af0ad52fd8bd4502ccf86a0 /connectivity/source/drivers/postgresql | |
parent | 2f316b07a502b527876462d524061dbf6c9a04d5 (diff) |
connectivity: sal_Bool->bool
Change-Id: I96371121ce6697f153f4e973e65831ea2265eb56
Diffstat (limited to 'connectivity/source/drivers/postgresql')
18 files changed, 78 insertions, 78 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx index 1d8ac87a1c26..e6fb435d077d 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx @@ -283,7 +283,7 @@ sal_Bool BaseResultSet::first( ) throw (SQLException, RuntimeException, std::ex { MutexGuard guard( m_refMutex->mutex ); checkClosed(); - sal_Bool bRet = ( m_rowCount > 0 ); + bool bRet = ( m_rowCount > 0 ); if( bRet ) m_row = 0; return bRet; @@ -293,7 +293,7 @@ sal_Bool BaseResultSet::last( ) throw (SQLException, RuntimeException, std::exc { MutexGuard guard( m_refMutex->mutex ); checkClosed(); - sal_Bool bRet = ( m_rowCount > 0 ); + bool bRet = ( m_rowCount > 0 ); if( bRet ) m_row = m_rowCount -1; return bRet; @@ -342,7 +342,7 @@ sal_Bool BaseResultSet::previous( ) throw (SQLException, RuntimeException, std: { MutexGuard guard( m_refMutex->mutex ); checkClosed(); - sal_Bool bRet = ( m_row != -1 ); + bool bRet = ( m_row != -1 ); if( bRet ) m_row --; return bRet; @@ -604,7 +604,7 @@ sal_Bool BaseResultSet::convertFastPropertyValue( Any & /* rConvertedValue */, Any & /* rOldValue */, sal_Int32 nHandle, const Any& rValue ) throw (IllegalArgumentException) { - sal_Bool bRet; + bool bRet; switch( nHandle ) { case BASERESULTSET_CURSOR_NAME: @@ -617,7 +617,7 @@ sal_Bool BaseResultSet::convertFastPropertyValue( case BASERESULTSET_ESCAPE_PROCESSING: case BASERESULTSET_IS_BOOKMARKABLE: { - sal_Bool val; + bool val; bRet = ( rValue >>= val ); m_props[nHandle] = makeAny( val ); break; diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx index 2c60de222036..12ab1aede0b1 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx @@ -75,7 +75,7 @@ protected: sal_Int32 m_row; sal_Int32 m_rowCount; sal_Int32 m_fieldCount; - sal_Bool m_wasNull; + bool m_wasNull; public: inline cppu::OBroadcastHelper & getRBHelper() { return OComponentHelper::rBHelper;} diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index c3736d516cea..ffa2c5517e4a 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -107,7 +107,7 @@ struct ConnectionSettings maxIndexKeys(0), pTablesImpl(0), pViewsImpl(0), - showSystemColumns( sal_False ), + showSystemColumns( false ), logFile( 0 ), loglevel( LogLevel::INFO ) {} @@ -123,7 +123,7 @@ struct ConnectionSettings Views *pViewsImpl; // needed to implement renaming of tables / views OUString user; OUString catalog; - sal_Bool showSystemColumns; + bool showSystemColumns; FILE *logFile; sal_Int32 loglevel; }; diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index ac194d48a9c0..78f02e106fdb 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -2471,7 +2471,7 @@ static sal_Int32 seqContains( const Sequence< sal_Int32 > &seq, sal_Int32 value OUString currentTable = xRow->getString( C_TABLENAME ); OUString currentIndexName = xRow->getString( C_INDEXNAME ); sal_Bool isNonUnique = ! xRow->getBoolean( C_IS_UNIQUE ); - sal_Bool isPrimary = xRow->getBoolean( C_IS_PRIMARY ); + bool isPrimary = xRow->getBoolean( C_IS_PRIMARY ); (void)isPrimary; sal_Int32 indexType = xRow->getBoolean( C_IS_CLUSTERED ) ? com::sun::star::sdbc::IndexType::CLUSTERED : diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index 7269c3ca6999..bfb50101a1d6 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -766,7 +766,7 @@ sal_Bool PreparedStatement::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw (IllegalArgumentException) { - sal_Bool bRet; + bool bRet; rOldValue = m_props[nHandle]; switch( nHandle ) { @@ -779,7 +779,7 @@ sal_Bool PreparedStatement::convertFastPropertyValue( } case PREPARED_STATEMENT_ESCAPE_PROCESSING: { - sal_Bool val; + bool val; bRet = ( rValue >>= val ); rConvertedValue = makeAny( val ); break; diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx index b2be7c4f8c2e..56886677c7c8 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx @@ -84,7 +84,7 @@ private: ::rtl::Reference< RefCountedMutex > m_refMutex; OStringVector m_vars; OStringVector m_splittedStatement; - sal_Bool m_multipleResultAvailable; + bool m_multipleResultAvailable; sal_Int32 m_multipleResultUpdateCount; sal_Int32 m_lastOidInserted; OUString m_lastTableInserted; diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx index f041721117bf..1e57850187d0 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx @@ -242,9 +242,9 @@ sal_Int32 ResultSetMetaData::getIntColumnProperty( const OUString & name, int in return ret; } -sal_Bool ResultSetMetaData::getBoolColumnProperty( const OUString & name, int index, sal_Bool def ) +bool ResultSetMetaData::getBoolColumnProperty( const OUString & name, int index, bool def ) { - sal_Bool ret = def; + bool ret = def; try { MutexGuard guard( m_refMutex->mutex ); @@ -293,7 +293,7 @@ sal_Bool ResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) { - sal_Bool ret = getBoolColumnProperty( getStatics().IS_AUTO_INCREMENT, column, sal_False ); + bool ret = getBoolColumnProperty( getStatics().IS_AUTO_INCREMENT, column, false ); return ret; } @@ -312,7 +312,7 @@ sal_Bool ResultSetMetaData::isSearchable( sal_Int32 column ) throw (SQLException sal_Bool ResultSetMetaData::isCurrency( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) { - return getBoolColumnProperty( getStatics().IS_CURRENCY, column, sal_False ); + return getBoolColumnProperty( getStatics().IS_CURRENCY, column, false ); } sal_Int32 ResultSetMetaData::isNullable( sal_Int32 column ) diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx index a784637b2c1b..bfecaf8853ef 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx @@ -90,7 +90,7 @@ class ResultSetMetaData : com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > getColumnByIndex( int index ); sal_Int32 getIntColumnProperty( const OUString & name, int index, int def ); - sal_Bool getBoolColumnProperty( const OUString & name, int index, sal_Bool def ); + bool getBoolColumnProperty( const OUString & name, int index, bool def ); public: ResultSetMetaData( diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx index eb67bbf83b03..dc34aa715e59 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx @@ -94,7 +94,7 @@ sal_Int32 SequenceResultSetMetaData::isNullable( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); - return m_columnData[column-1].isNullable; + return m_columnData[column-1].isNullable ? 1 : 0; } sal_Bool SequenceResultSetMetaData::isSigned( sal_Int32 /* column */ ) diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index 2a1d9a33bd20..14a781755160 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -467,13 +467,13 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) *(data->pLastTableInserted) = OUString(); *(data->pLastQuery) = cmd; - sal_Bool ret = sal_False; + bool ret = false; switch( state ) { case PGRES_COMMAND_OK: { *(data->pMultipleResultUpdateCount) = atoi( PQcmdTuples( result ) ); - *(data->pMultipleResultAvailable) = sal_False; + *(data->pMultipleResultAvailable) = false; // in case an oid value is available, we retrieve it *(data->pLastOidInserted) = PQoidValue( result ); @@ -623,8 +623,8 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) new ResultSet( data->refMutex, data->owner, data->ppSettings,result, schema, table ) ); - *(data->pMultipleResultAvailable) = sal_True; - ret = sal_True; + *(data->pMultipleResultAvailable) = true; + ret = true; if( isLog( pSettings, LogLevel::SQL ) ) { OStringBuffer buf( 128 ); @@ -922,7 +922,7 @@ sal_Bool Statement::convertFastPropertyValue( throw (IllegalArgumentException) { rOldValue = m_props[nHandle]; - sal_Bool bRet; + bool bRet; switch( nHandle ) { case STATEMENT_CURSOR_NAME: @@ -934,7 +934,7 @@ sal_Bool Statement::convertFastPropertyValue( } case STATEMENT_ESCAPE_PROCESSING: { - sal_Bool val; + bool val; bRet = ( rValue >>= val ); rConvertedValue = makeAny( val ); break; diff --git a/connectivity/source/drivers/postgresql/pq_statement.hxx b/connectivity/source/drivers/postgresql/pq_statement.hxx index 089ff1acc6a2..78d6d5a1b059 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.hxx +++ b/connectivity/source/drivers/postgresql/pq_statement.hxx @@ -76,7 +76,7 @@ private: ConnectionSettings *m_pSettings; com::sun::star::uno::Reference< com::sun::star::sdbc::XCloseable > m_lastResultset; ::rtl::Reference< RefCountedMutex > m_refMutex; - sal_Bool m_multipleResultAvailable; + bool m_multipleResultAvailable; sal_Int32 m_multipleResultUpdateCount; sal_Int32 m_lastOidInserted; OUString m_lastTableInserted; @@ -183,7 +183,7 @@ struct CommandData ConnectionSettings **ppSettings; sal_Int32 *pLastOidInserted; sal_Int32 *pMultipleResultUpdateCount; - sal_Bool *pMultipleResultAvailable; + bool *pMultipleResultAvailable; OUString *pLastTableInserted; ::com::sun::star::uno::Reference< com::sun::star::sdbc::XCloseable > *pLastResultset; OString *pLastQuery; diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx index 8ef277d82194..0b6a15ca1d92 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.cxx +++ b/connectivity/source/drivers/postgresql/pq_statics.cxx @@ -61,11 +61,11 @@ struct DefColumnMetaData sal_Int32 type; sal_Int32 precision; sal_Int32 scale; - sal_Bool isCurrency; - sal_Bool isNullable; - sal_Bool isAutoIncrement; - sal_Bool isReadOnly; - sal_Bool isSigned; + bool isCurrency; + bool isNullable; + bool isAutoIncrement; + bool isReadOnly; + bool isSigned; }; struct BaseTypeDef { const char * typeName; sal_Int32 value; }; @@ -681,25 +681,25 @@ Statics & getStatics() // that is what is returned by getTypeInfo().getMetaData() DefColumnMetaData defTypeInfoMetaData[] = { - { "TYPE_NAME", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,0,0,0,0, false }, // 0 - { "DATA_TYPE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,0,0,0,0, true }, // 1 - { "PRECISION", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0, true }, // 2 - { "LITERAL_PREFIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,0,0,0,0, false }, // 3 - { "LITERAL_SUFFIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,0,0,0,0, false }, // 4 - { "CREATE_PARAMS", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,0,0,0,0, false }, // 5 - { "NULLABLE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0, true }, // 6 - { "CASE_SENSITIVE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BIT, 0,50,0,0,0,0, false }, // 7 - { "SEARCHABLE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,0,0,0,0, true }, // 8 - { "UNSIGNED_ATTRIBUTE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BIT, 0,50,0,0,0,0, false }, // 9 - { "FIXED_PREC_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BIT, 0,50,0,0,0,0, false }, // 10 - { "AUTO_INCREMENT", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BIT, 0,50,0,0,0,0, false }, // 11 - { "LOCAL_TYPE_NAME", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,0,0,0,0, false }, // 12 - { "MINIMUM_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,0,0,0,0, true}, // 13 - { "MAXIMUM_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,0,0,0,0, true }, // 14 - { "SQL_DATA_TYPE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0, true }, // 15 - { "SQL_DATETIME_SUB", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0 , true}, // 16 - { "NUM_PREC_RADIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,0,0,0,0, true }, // 17 - {0,0,0,0,0,0,0,0,0,0,0, 0} + { "TYPE_NAME", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 0 + { "DATA_TYPE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true }, // 1 + { "PRECISION", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false, true }, // 2 + { "LITERAL_PREFIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 3 + { "LITERAL_SUFFIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 4 + { "CREATE_PARAMS", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 5 + { "NULLABLE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false, true }, // 6 + { "CASE_SENSITIVE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BIT, 0,50,false,false,false,false, false }, // 7 + { "SEARCHABLE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true }, // 8 + { "UNSIGNED_ATTRIBUTE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BIT, 0,50,false,false,false,false, false }, // 9 + { "FIXED_PREC_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BIT, 0,50,false,false,false,false, false }, // 10 + { "AUTO_INCREMENT", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BIT, 0,50,false,false,false,false, false }, // 11 + { "LOCAL_TYPE_NAME", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 12 + { "MINIMUM_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true}, // 13 + { "MAXIMUM_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true }, // 14 + { "SQL_DATA_TYPE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false, true }, // 15 + { "SQL_DATETIME_SUB", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false , true}, // 16 + { "NUM_PREC_RADIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false, true }, // 17 + {0,0,0,0,0,0,0,false,false,false,false, false} }; for( i = 0 ; defTypeInfoMetaData[i].columnName ; i++ ) diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx index ee6bfde61dbd..e67297363581 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.hxx +++ b/connectivity/source/drivers/postgresql/pq_statics.hxx @@ -61,11 +61,11 @@ struct ColumnMetaData sal_Int32 _type, sal_Int32 _precision, sal_Int32 _scale, - sal_Bool _isCurrency, - sal_Bool _isNullable, - sal_Bool _isAutoIncrement, - sal_Bool _isReadOnly, - sal_Bool _isSigned ) : + bool _isCurrency, + bool _isNullable, + bool _isAutoIncrement, + bool _isReadOnly, + bool _isSigned ) : columnName( _columnName ), tableName( _tableName ), schemaTableName( _schemaTableName ), @@ -87,11 +87,11 @@ struct ColumnMetaData sal_Int32 type; sal_Int32 precision; sal_Int32 scale; - sal_Bool isCurrency; - sal_Bool isNullable; - sal_Bool isAutoIncrement; - sal_Bool isReadOnly; - sal_Bool isSigned; + bool isCurrency; + bool isNullable; + bool isAutoIncrement; + bool isReadOnly; + bool isSigned; }; typedef std::vector< ColumnMetaData, Allocator< ColumnMetaData > > ColumnMetaDataVector; @@ -101,8 +101,8 @@ struct TypeDetails sal_Int32 dataType; sal_Int32 minScale; sal_Int32 maxScale; // in case nothing is given in getTypeInfo - sal_Bool isAutoIncrement; - sal_Bool isSearchable; + bool isAutoIncrement; + bool isSearchable; }; typedef ::boost::unordered_map diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index f95d02aa2978..1a552d6135e7 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -209,10 +209,10 @@ OUString extractStringProperty( return value; } -sal_Bool extractBoolProperty( +bool extractBoolProperty( const Reference< XPropertySet > & descriptor, const OUString &name ) { - sal_Bool value = sal_False; + bool value = false; descriptor->getPropertyValue( name ) >>= value; return value; } @@ -278,7 +278,7 @@ DisposeGuard::~DisposeGuard() TransactionGuard::TransactionGuard( const Reference< XStatement > &stmt ) : m_stmt( stmt ), - m_commited( sal_False ) + m_commited( false ) { m_stmt->executeUpdate( getStatics().BEGIN ); } @@ -286,7 +286,7 @@ TransactionGuard::TransactionGuard( const Reference< XStatement > &stmt ) void TransactionGuard::commit() { m_stmt->executeUpdate( getStatics().COMMIT ); - m_commited = sal_True; + m_commited = true; } void TransactionGuard::executeUpdate( const OUString & sql ) @@ -1153,7 +1153,7 @@ OUString querySingleValue( bool implSetObject( const Reference< XParameters >& _rxParameters, const sal_Int32 _nColumnIndex, const Any& _rValue) { - sal_Bool bSuccessfullyReRouted = sal_True; + bool bSuccessfullyReRouted = true; switch (_rValue.getValueTypeClass()) { case typelib_TypeClass_HYPER: @@ -1207,7 +1207,7 @@ bool implSetObject( const Reference< XParameters >& _rxParameters, _rxParameters->setBytes(_nColumnIndex, *(Sequence<sal_Int8>*)_rValue.getValue()); } else - bSuccessfullyReRouted = sal_False; + bSuccessfullyReRouted = false; break; case typelib_TypeClass_STRUCT: if (_rValue.getValueType() == ::getCppuType((const com::sun::star::util::DateTime*)0)) @@ -1217,7 +1217,7 @@ bool implSetObject( const Reference< XParameters >& _rxParameters, else if (_rValue.getValueType() == ::getCppuType((const com::sun::star::util::Time*)0)) _rxParameters->setTime(_nColumnIndex, *(com::sun::star::util::Time*)_rValue.getValue()); else - bSuccessfullyReRouted = sal_False; + bSuccessfullyReRouted = false; break; case typelib_TypeClass_INTERFACE: @@ -1232,7 +1232,7 @@ bool implSetObject( const Reference< XParameters >& _rxParameters, } // run through default: - bSuccessfullyReRouted = sal_False; + bSuccessfullyReRouted = false; } diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx index 23757046d34e..039d4b52cca1 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.hxx +++ b/connectivity/source/drivers/postgresql/pq_tools.hxx @@ -88,7 +88,7 @@ sal_Int32 extractIntProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & descriptor, const OUString &name ); -sal_Bool extractBoolProperty( +bool extractBoolProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & descriptor, const OUString &name ); @@ -155,7 +155,7 @@ public: class TransactionGuard { com::sun::star::uno::Reference< com::sun::star::sdbc::XStatement > m_stmt; - sal_Bool m_commited; + bool m_commited; public: /// takes over ownership of given statemet TransactionGuard( const com::sun::star::uno::Reference< com::sun::star::sdbc::XStatement > &stmt ); diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx index accede94c50d..8e8bdc56ce66 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx @@ -147,7 +147,7 @@ void IndexColumns::refresh() columnMetaData2SDBCX( pIndexColumn, xRow ); pIndexColumn->setPropertyValue_NoBroadcast_public( - st.IS_ASCENDING , makeAny( (sal_Bool ) sal_False ) ); + st.IS_ASCENDING , makeAny( false ) ); m_values[ index ] = makeAny( prop ); m_name2index[ columnName ] = index; diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx index 58ad44d5bca3..32d571249fb3 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx @@ -205,7 +205,7 @@ void Indexes::appendByDescriptor( Statics & st = getStatics(); OUString name = extractStringProperty( descriptor, st.NAME ); - sal_Bool isUnique = extractBoolProperty( descriptor, st.IS_UNIQUE ); + bool isUnique = extractBoolProperty( descriptor, st.IS_UNIQUE ); OUStringBuffer buf( 128 ); diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx index 78f9048b4cd1..fc75b13c707a 100644 --- a/connectivity/source/drivers/postgresql/pq_xtables.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx @@ -186,8 +186,8 @@ static void appendColumnList( Reference< XPropertySet > column( xEnum->nextElement(), UNO_QUERY ); OUString name = extractStringProperty( column, st.NAME ); OUString defaultValue = extractStringProperty( column, st.DEFAULT_VALUE ); - sal_Bool isNullable = extractBoolProperty( column, st.IS_NULLABLE ); - sal_Bool isAutoIncrement = extractBoolProperty( column, st.IS_AUTO_INCREMENT ); + bool isNullable = extractBoolProperty( column, st.IS_NULLABLE ); + bool isAutoIncrement = extractBoolProperty( column, st.IS_AUTO_INCREMENT ); bufferQuoteIdentifier( buf, name, settings ); @@ -199,12 +199,12 @@ static void appendColumnList( if( com::sun::star::sdbc::DataType::INTEGER == dataType ) { buf.append( " serial "); - isNullable = sal_False; + isNullable = false; } else if( com::sun::star::sdbc::DataType::BIGINT == dataType ) { buf.append( " serial8 " ); - isNullable = sal_False; + isNullable = false; } else buf.append( type ); |