diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-01-30 11:44:23 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-01-30 12:54:40 +0000 |
| commit | 97eb8a6e0eb830f37dcba64a51d725aab4c5ff53 (patch) | |
| tree | a1a95b8249052d846a997ad1729758168d6a3b24 /bridges/source/jni_uno/jni_bridge.cxx | |
| parent | f8569cd9a28a3a8856dba4ad53218aa6cc073521 (diff) | |
Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING
Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd
Reviewed-on: https://gerrit.libreoffice.org/1924
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'bridges/source/jni_uno/jni_bridge.cxx')
| -rw-r--r-- | bridges/source/jni_uno/jni_bridge.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx index 4ba0f7b1ac4b..a8bef0c0b8b7 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -102,7 +102,7 @@ void SAL_CALL Mapping_map_to_uno( #if OSL_DEBUG_LEVEL > 0 OString cstr_msg( OUStringToOString( - OUSTR("[jni_uno bridge error] ") + err.m_message, + "[jni_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); OSL_FAIL( cstr_msg.getStr() ); #else @@ -171,7 +171,7 @@ void SAL_CALL Mapping_map_to_java( #if OSL_DEBUG_LEVEL > 0 OString cstr_msg( OUStringToOString( - OUSTR("[jni_uno bridge error] ") + err.m_message, + "[jni_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); OSL_FAIL( cstr_msg.getStr() ); #else @@ -289,7 +289,7 @@ void JNI_context::java_exc_occurred() const if (! jo_exc.is()) { throw BridgeRuntimeError( - OUSTR("java exception occurred, but not available!?") + + "java exception occurred, but not available!?" + get_stack_trace() ); } @@ -299,7 +299,7 @@ void JNI_context::java_exc_occurred() const { m_env->ExceptionClear(); throw BridgeRuntimeError( - OUSTR("cannot get class java.lang.Object!") + get_stack_trace() ); + "cannot get class java.lang.Object!" + get_stack_trace() ); } JLocalAutoRef jo_Object( *this, jo_class ); // method Object.toString() @@ -309,7 +309,7 @@ void JNI_context::java_exc_occurred() const { m_env->ExceptionClear(); throw BridgeRuntimeError( - OUSTR("cannot get method id of java.lang.Object.toString()!") + + "cannot get method id of java.lang.Object.toString()!" + get_stack_trace() ); } OSL_ASSERT( 0 != method_Object_toString ); @@ -321,7 +321,7 @@ void JNI_context::java_exc_occurred() const { m_env->ExceptionClear(); throw BridgeRuntimeError( - OUSTR("error examining java exception object!") + + "error examining java exception object!" + get_stack_trace() ); } @@ -337,7 +337,7 @@ void JNI_context::java_exc_occurred() const { m_env->ExceptionClear(); throw BridgeRuntimeError( - OUSTR("invalid java string object!") + get_stack_trace() ); + "invalid java string object!" + get_stack_trace() ); } ustr->refCount = 1; ustr->length = len; @@ -535,7 +535,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( #if OSL_DEBUG_LEVEL > 0 OString cstr_msg( OUStringToOString( - OUSTR("[jni_uno bridge error] ") + err.m_message, + "[jni_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) ); OSL_FAIL( cstr_msg.getStr() ); #else |