diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 11:29:41 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 14:12:21 +0100 |
| commit | 530b835583553dbe9af1481ce7082f6117446370 (patch) | |
| tree | 1257c62afe092b06c67413bd679f5387ae9053d9 /mysqlc | |
| parent | ea807d038815f34dc4c10cb466b2051da5a5cc0d (diff) | |
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'mysqlc')
| -rw-r--r-- | mysqlc/source/mysqlc_connection.cxx | 2 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_driver.cxx | 4 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_general.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 281a40f08b7b..df6f25dba0c8 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -217,7 +217,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > #if OSL_DEBUG_LEVEL > 0 ::rtl::OString sMessage( "OConnection::construct: malformed URI: " ); sMessage += ::rtl::OUStringToOString( e.getMessage(), osl_getThreadTextEncoding() ); - OSL_ENSURE( false, sMessage.getStr() ); + OSL_FAIL( sMessage.getStr() ); #endif } diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index 42c1001c8a20..2b52a2e82f43 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -154,7 +154,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw() // attempted to load - was it successful? if ( !m_hCppConnModule ) { - OSL_ENSURE( false, "MysqlCDriver::impl_initCppConn_lck_throw: could not load the " CPPCONN_LIB " library!"); + OSL_FAIL( "MysqlCDriver::impl_initCppConn_lck_throw: could not load the " CPPCONN_LIB " library!"); throw SQLException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unable to load the " CPPCONN_LIB " library." ) ), *this, @@ -171,7 +171,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw() const FGetMySQLDriver pFactoryFunction = (FGetMySQLDriver)( osl_getFunctionSymbol( m_hCppConnModule, sSymbolName.pData ) ); if ( !pFactoryFunction ) { - OSL_ENSURE( false, "MysqlCDriver::impl_initCppConn_lck_throw: could not find the factory symbol in " CPPCONN_LIB "!"); + OSL_FAIL( "MysqlCDriver::impl_initCppConn_lck_throw: could not find the factory symbol in " CPPCONN_LIB "!"); throw SQLException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CPPCONN_LIB " is invalid: missing the driver factory function." ) ), *this, diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx index 347cdabf8a1b..fb55f0bce06b 100644 --- a/mysqlc/source/mysqlc_general.cxx +++ b/mysqlc/source/mysqlc_general.cxx @@ -154,7 +154,7 @@ int mysqlToOOOType(int cppConnType) return com::sun::star::sdbc::DataType::VARCHAR; } - OSL_ENSURE( false, "mysqlToOOOType: unhandled case, falling back to VARCHAR" ); + OSL_FAIL( "mysqlToOOOType: unhandled case, falling back to VARCHAR" ); return com::sun::star::sdbc::DataType::VARCHAR; } |