diff options
Diffstat (limited to 'bridges/source/jni_uno/jni_uno2java.cxx')
| -rw-r--r-- | bridges/source/jni_uno/jni_uno2java.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx index 70e139d66aab..d4c59ab2ad11 100644 --- a/bridges/source/jni_uno/jni_uno2java.cxx +++ b/bridges/source/jni_uno/jni_uno2java.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ void Bridge::handle_java_exc( jni.ensure_no_exception(); OUString exc_name( jstring_to_oustring( jni, (jstring) jo_class_name.get() ) ); - + ::com::sun::star::uno::TypeDescription td( exc_name.pData ); if (!td.is() || (typelib_TypeClass_EXCEPTION != td.get()->eTypeClass)) { @@ -148,11 +148,11 @@ void Bridge::call_java( void * uno_ret, void * uno_args [], uno_Any ** uno_exc ) const { OSL_ASSERT( function_pos_offset == 0 || function_pos_offset == 1 ); - + JNI_guarded_context jni( m_jni_info, reinterpret_cast< ::jvmaccess::UnoVirtualMachine * >( m_java_env->pContext ) ); - + // assure fully initialized iface_td: ::com::sun::star::uno::TypeDescription iface_holder; if (! iface_td->aBase.bComplete) { @@ -171,14 +171,14 @@ void Bridge::call_java( iface_holder.get() ); OSL_ASSERT( iface_td->aBase.eTypeClass == typelib_TypeClass_INTERFACE ); } - + // prepare java args, save param td #ifdef BROKEN_ALLOCA jvalue * java_args = (jvalue *) malloc( sizeof (jvalue) * nParams ); #else jvalue * java_args = (jvalue *) alloca( sizeof (jvalue) * nParams ); #endif - + sal_Int32 nPos; for ( nPos = 0; nPos < nParams; ++nPos ) { @@ -227,7 +227,7 @@ void Bridge::call_java( && function_pos < iface_td->nMapFunctionIndexToMemberIndex, "### illegal function index!" ); function_pos -= base_members_function_pos; - + JNI_interface_type_info const * info = static_cast< JNI_interface_type_info const * >( m_jni_info->get_type_info( jni, &iface_td->aBase ) ); @@ -525,7 +525,7 @@ uno_Interface * Bridge::map_to_uno( pUnoI = new UNO_proxy( jni, const_cast< Bridge * >( this ), javaI, (jstring) jo_oid.get(), oid, info ); - + (*m_uno_env->registerProxyInterface)( m_uno_env, (void **)&pUnoI, UNO_proxy_free, @@ -555,7 +555,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) } #if OSL_DEBUG_LEVEL > 1 OString cstr_msg( - OUStringToOString( + OUStringToOString( OUSTR("freeing binary uno proxy: ") + that->m_oid, RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( cstr_msg.getStr() ); @@ -567,7 +567,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) bridge->m_jni_info, reinterpret_cast< ::jvmaccess::UnoVirtualMachine * >( bridge->m_java_env->pContext ) ); - + jni->DeleteGlobalRef( that->m_javaI ); jni->DeleteGlobalRef( that->m_jo_oid ); } @@ -740,7 +740,7 @@ void SAL_CALL UNO_proxy_dispatch( jni_info->m_class_UnoRuntime, jni_info->m_method_UnoRuntime_queryInterface, args ) ); - + if (jni->ExceptionCheck()) { JLocalAutoRef jo_exc( jni, jni->ExceptionOccurred() ); @@ -772,7 +772,7 @@ void SAL_CALL UNO_proxy_dispatch( reinterpret_cast< typelib_InterfaceTypeDescription * >( info->m_td.get() ) ); - + uno_any_construct( (uno_Any *)uno_ret, &pUnoI2, demanded_td.get(), 0 ); |