diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-08-07 13:36:26 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-08-07 13:36:26 +0000 |
| commit | 7556d8c64b91bdc7005953af16011c78834f8b30 (patch) | |
| tree | 0f04e9de30c05690809c3285b249c4306768466d /javaunohelper/source | |
| parent | d3436bae5b9dae41396d404a1c862557ee0b43f6 (diff) | |
INTEGRATION: CWS sb5 (1.6.16); FILE MERGED
2003/06/19 10:13:28 sb 1.6.16.1: #109236# Use RTL_TEXTENCODING_JAVA_UTF8 for strings passed to JNI functions.
Diffstat (limited to 'javaunohelper/source')
| -rw-r--r-- | javaunohelper/source/bootstrap.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx index aff09bd4942c..147889f83136 100644 --- a/javaunohelper/source/bootstrap.cxx +++ b/javaunohelper/source/bootstrap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bootstrap.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2003-03-26 12:23:47 $ + * last change: $Author: hr $ $Date: 2003-08-07 14:36:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -265,7 +265,8 @@ extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cpp jclass c = jni_env->FindClass( "com/sun/star/uno/RuntimeException" ); if (0 != c) { - OString cstr( ::rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); + OString cstr( ::rtl::OUStringToOString( + exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); OSL_TRACE( __FILE__": forwarding RuntimeException: %s", cstr.getStr() ); jni_env->ThrowNew( c, cstr.getStr() ); } @@ -275,7 +276,8 @@ extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cpp jclass c = jni_env->FindClass( "com/sun/star/uno/Exception" ); if (0 != c) { - OString cstr( ::rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); + OString cstr( ::rtl::OUStringToOString( + exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() ); jni_env->ThrowNew( c, cstr.getStr() ); } |