summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysqlc/source/mysqlc_connection.cxx2
-rw-r--r--mysqlc/source/mysqlc_driver.cxx4
-rw-r--r--mysqlc/source/mysqlc_general.cxx2
-rw-r--r--sdext/source/pdfimport/filterdet.cxx4
-rw-r--r--sdext/source/pdfimport/tree/imagecontainer.cxx2
5 files changed, 7 insertions, 7 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;
}
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index 64c58ed58e74..d6afc41dbde0 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -78,7 +78,7 @@ namespace {
switch(nIndex)
{
default:
- OSL_ENSURE(false,"Unexpected case!");
+ OSL_FAIL("Unexpected case!");
break;
case DRAW_INDEX:
bDrawState=sal_True;
@@ -520,7 +520,7 @@ rtl::OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue
break;
default:
- OSL_ENSURE(false,"Unexpected case");
+ OSL_FAIL("Unexpected case");
}
aOutTypeName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("pdf_Portable_Document_Format") );
diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx
index 7acc47e7e6c3..9be7bb5de0dd 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.cxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.cxx
@@ -146,7 +146,7 @@ void ImageContainer::writeBase64EncodedStream( ImageId nId, EmitContext& rContex
uno::Sequence<sal_Int8> aData;
if( !(pValue->Value >>= aData) )
- OSL_ENSURE(false,"Wrong data type");
+ OSL_FAIL("Wrong data type");
rContext.rEmitter.write( encodeBase64( aData.getConstArray(), aData.getLength() ));
}