diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-08-07 13:30:57 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-08-07 13:30:57 +0000 |
| commit | da94f38e70d5c8b59b14b98c861a4b69e5a3276f (patch) | |
| tree | 16b8b57929639fb96c80450c8057b50479d9d1e5 /bridges/source | |
| parent | 9e46b499310ffbe7daa17f0b533f299ad78aaed8 (diff) | |
INTEGRATION: CWS sb5 (1.15.16); FILE MERGED
2003/06/19 09:56:29 sb 1.15.16.1: #109236# Use RTL_TEXTENCODING_JAVA_UTF8 for strings passed to JNI functions.
Diffstat (limited to 'bridges/source')
| -rw-r--r-- | bridges/source/jni_uno/jni_java2uno.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx index d3a039a278dc..7cc5b1412ebe 100644 --- a/bridges/source/jni_uno/jni_java2uno.cxx +++ b/bridges/source/jni_uno/jni_java2uno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: jni_java2uno.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: hr $ $Date: 2003-04-28 16:29:17 $ + * last change: $Author: hr $ $Date: 2003-08-07 14:30:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -621,7 +621,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call( // notify RuntimeException OString cstr_msg( OUStringToOString( - buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); + buf.makeStringAndClear(), RTL_TEXTENCODING_JAVA_UTF8 ) ); OSL_ENSURE( 0, cstr_msg.getStr() ); jint res = jni->ThrowNew( jni_info->m_class_RuntimeException, cstr_msg.getStr() ); @@ -635,7 +635,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call( "[jni_uno bridge error] " "attaching current thread to java failed!") ) + OUStringToOString( - jni.get_stack_trace(), RTL_TEXTENCODING_ASCII_US ) ); + jni.get_stack_trace(), RTL_TEXTENCODING_JAVA_UTF8 ) ); OSL_ENSURE( 0, cstr_msg.getStr() ); jint res = jni->ThrowNew( jni_info->m_class_RuntimeException, cstr_msg.getStr() ); |