diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 12:10:42 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 14:19:48 +0100 |
| commit | adc6fe00e3ef3cca5bbd49a4633181856bf111df (patch) | |
| tree | ea50caa8979aa23d77f912bee478d968ccf18232 /cli_ure | |
| parent | 629b05ac304a47f70180d044ac5db18a9ecfc9cc (diff) | |
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/source/climaker/climaker_app.cxx | 6 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_bridge.cxx | 6 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_proxy.cxx | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx index d3380757d75e..907054c0b8bb 100644 --- a/cli_ure/source/climaker/climaker_app.cxx +++ b/cli_ure/source/climaker/climaker_app.cxx @@ -150,8 +150,8 @@ static OptionInfo const * get_option_info( } } } - OSL_ENSURE( - 0, OUStringToOString( opt, osl_getThreadTextEncoding() ).getStr() ); + OSL_FAIL( + OUStringToOString( opt, osl_getThreadTextEncoding() ).getStr() ); return 0; } @@ -449,7 +449,7 @@ SAL_IMPLEMENT_MAIN() } else { - OSL_ENSURE( 0, "unhandled valid option?!" ); + OSL_FAIL( "unhandled valid option?!" ); if (option_info->m_has_argument) ++nPos; } diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 070e0a621873..6f6f16978864 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -112,7 +112,7 @@ void SAL_CALL Mapping_cli2uno( OString cstr_msg( OUStringToOString( OUSTR("[cli_uno bridge error] ") + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( 0, cstr_msg.getStr() ); + OSL_FAIL( cstr_msg.getStr() ); #else (void) err; // unused #endif @@ -171,7 +171,7 @@ void SAL_CALL Mapping_uno2cli( rtl::OString cstr_msg( rtl::OUStringToOString( OUSTR("[cli_uno bridge error] ") + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( 0, cstr_msg.getStr() ); + OSL_FAIL( cstr_msg.getStr() ); #else (void) err; // unused #endif @@ -352,7 +352,7 @@ void SAL_CALL uno_ext_getMapping( OString cstr_msg( OUStringToOString( OUSTR("[cli_uno bridge error] ") + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( 0, cstr_msg.getStr() ); + OSL_FAIL( cstr_msg.getStr() ); #else (void) err; // unused #endif diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index 85d5d1b3503b..df86686dd988 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -310,8 +310,8 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType, catch (BridgeRuntimeError& e) { (void) e; // avoid warning - OSL_ENSURE( - 0, OUStringToOString( + OSL_FAIL( + OUStringToOString( e.m_message, RTL_TEXTENCODING_UTF8 ).getStr() ); } catch (System::Exception* e) @@ -321,14 +321,14 @@ bool UnoInterfaceProxy::CanCastTo(System::Type* fromType, S"UnoInterfaceProxy::CanCastTo(). Original" S"message: \n"); msg= System::String::Concat(msg, e->get_Message()); - OSL_ENSURE( - 0, OUStringToOString( + OSL_FAIL( + OUStringToOString( mapCliString(msg), RTL_TEXTENCODING_UTF8 ).getStr() ); } catch (...) { - OSL_ENSURE( - 0, "An unexpected native C++ exception occurred in " + OSL_FAIL( + "An unexpected native C++ exception occurred in " "UnoInterfaceProxy::CanCastTo()" ); } __finally @@ -1172,7 +1172,7 @@ void SAL_CALL cli_proxy_dispatch( #if OSL_DEBUG_LEVEL >= 1 OString cstr_msg(OUStringToOString(exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE(0, cstr_msg.getStr()); + OSL_FAIL(cstr_msg.getStr()); #endif } } |