diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-23 11:47:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-23 14:38:14 +0200 |
| commit | 5e028ad5dccc6ff1a9250baf2196f7a2f235e314 (patch) | |
| tree | 6c6992e6fccf43b60141fb6ae32a6ad8e37cb84d /cli_ure | |
| parent | f905d6056606234ba53a26a3e4105ad3560d4b7b (diff) | |
simplify some string handling in tracing calls
Change-Id: I0fb76562429e691400a02216019c7f96791cf9b3
Reviewed-on: https://gerrit.libreoffice.org/39159
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_bridge.cxx | 30 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_proxy.cxx | 6 |
2 files changed, 7 insertions, 29 deletions
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index da8d0852e927..615941b3f36a 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -82,14 +82,8 @@ void SAL_CALL Mapping_cli2uno( } catch (BridgeRuntimeError & err) { -#if OSL_DEBUG_LEVEL >= 1 - OString cstr_msg( - OUStringToOString( - "[cli_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_FAIL( cstr_msg.getStr() ); -#else - (void) err; // unused -#endif + (void) err; + SAL_WARN( "cli", "[cli_uno bridge error] " << err.m_message ); } } @@ -142,14 +136,8 @@ void SAL_CALL Mapping_uno2cli( } catch (BridgeRuntimeError & err) { -#if OSL_DEBUG_LEVEL >= 1 - OString cstr_msg( - OUStringToOString( - "[cli_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_FAIL( cstr_msg.getStr() ); -#else - (void) err; // unused -#endif + (void) err; + SAL_WARN( "cli", "[cli_uno bridge error] " << err.m_message ); } } @@ -320,14 +308,8 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( } catch (BridgeRuntimeError & err) { -#if OSL_DEBUG_LEVEL >= 1 - OString cstr_msg( - OUStringToOString( - "[cli_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_FAIL( cstr_msg.getStr() ); -#else - (void) err; // unused -#endif + (void) err; + SAL_WARN( "cli", "[cli_uno bridge error] " << err.m_message ); } *ppMapping = mapping; } diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index b703cc05cb17..453880298485 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -1096,11 +1096,7 @@ void SAL_CALL cli_proxy_dispatch( css::uno::XInterface >() ); css::uno::Type const & exc_type = cppu::UnoType<decltype(exc)>::get(); uno_type_any_construct( *uno_exc, &exc, exc_type.getTypeLibType(), 0); -#if OSL_DEBUG_LEVEL >= 1 - OString cstr_msg(OUStringToOString(exc.Message, - RTL_TEXTENCODING_ASCII_US ) ); - OSL_FAIL(cstr_msg.getStr()); -#endif + SAL_WARN( "cli", exc.Message); } } |