diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-07-07 09:52:15 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-07-07 09:52:15 +0000 |
| commit | 5e06b827a8a9a3e80e8e7d993257d065b8c19732 (patch) | |
| tree | c1a4539e13f499ffe12c401cb24a1a21f538a961 | |
| parent | 7ec2602b6dfb3bd408080b601380511dff7e1e79 (diff) | |
INTEGRATION: CWS sb33 (1.19.4); FILE MERGED
2005/06/29 15:56:53 sb 1.19.4.1: #i51091# Changed occurences of jobject in the jvmaccess API to void* to avoid different mangled C++ names for different JDKs.
| -rw-r--r-- | bridges/source/jni_uno/jni_java2uno.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx index 4c8ac2497..e91a748a0 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.19 $ + * $Revision: 1.20 $ * - * last change: $Author: obo $ $Date: 2005-06-17 09:54:00 $ + * last change: $Author: obo $ $Date: 2005-07-07 10:52:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -387,8 +387,9 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call( JNI_info const * jni_info = bridge->m_jni_info; JNI_context jni( jni_info, jni_env, - reinterpret_cast< ::jvmaccess::UnoVirtualMachine * >( - bridge->m_java_env->pContext )->getClassLoader() ); + static_cast< jobject >( + reinterpret_cast< ::jvmaccess::UnoVirtualMachine * >( + bridge->m_java_env->pContext )->getClassLoader() ) ); OUString method_name; @@ -648,8 +649,9 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_finalize__J( JNI_info const * jni_info = bridge->m_jni_info; JNI_context jni( jni_info, jni_env, - reinterpret_cast< ::jvmaccess::UnoVirtualMachine * >( - bridge->m_java_env->pContext )->getClassLoader() ); + static_cast< jobject >( + reinterpret_cast< ::jvmaccess::UnoVirtualMachine * >( + bridge->m_java_env->pContext )->getClassLoader() ) ); uno_Interface * pUnoI = reinterpret_cast< uno_Interface * >( jni->GetLongField( |