diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-19 14:09:49 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-19 14:09:49 +0100 |
| commit | 970be45287de1a046df1c546abb06ad5f6b9c084 (patch) | |
| tree | 0a88a771e96b5e9d884e5b087adad9d320bdbe7b /connectivity/source/drivers/ado | |
| parent | e35cffb37a792b78f8dbcd85b329fa88097b1ea5 (diff) | |
Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)
Diffstat (limited to 'connectivity/source/drivers/ado')
4 files changed, 4 insertions, 5 deletions
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index a5bb2c190186..200884e4de98 100755 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -577,8 +577,7 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r { // we can not assert here because we could be in d&d /* - OSL_ENSURE(sal_False, - ( ::rtl::OString("getTypeInfoFromType: assuming column type ") + OSL_FAIL(( ::rtl::OString("getTypeInfoFromType: assuming column type ") += ::rtl::OString(aIter->second->aTypeName.getStr(), aIter->second->aTypeName.getLength(), gsl_getSystemTextEncoding()) += ::rtl::OString("\" (expected type name ") += ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding()) diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index 3d6168116212..531d2a913aa2 100755 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -99,7 +99,7 @@ OPreparedStatement::~OPreparedStatement() { if (m_pParameters) { - OSL_ENSURE( sal_False, "OPreparedStatement::~OPreparedStatement: not disposed!" ); + OSL_FAIL( "OPreparedStatement::~OPreparedStatement: not disposed!" ); m_pParameters->Release(); m_pParameters = NULL; } diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index feb6074eff61..e8c7a41cd0bc 100755 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -112,7 +112,7 @@ void OResultSet::construct() osl_incrementInterlockedCount( &m_refCount ); if (!m_pRecordSet) { - OSL_ENSURE( sal_False, "OResultSet::construct: no RecordSet!" ); + OSL_FAIL( "OResultSet::construct: no RecordSet!" ); Reference< XInterface > xInt( *this ); osl_decrementInterlockedCount( &m_refCount ); ::dbtools::throwFunctionSequenceException( xInt ); diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index efb6735c318d..2ea1cb58b718 100755 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -735,7 +735,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue( catch( const Exception& e ) { bModified = sal_True; // will ensure that the property is set - OSL_ENSURE( sal_False, "OStatement_Base::convertFastPropertyValue: caught something strange!" ); + OSL_FAIL( "OStatement_Base::convertFastPropertyValue: caught something strange!" ); (void)e; } return bModified; |