diff options
Diffstat (limited to 'vcl/source/window/javachild.cxx')
| -rw-r--r-- | vcl/source/window/javachild.cxx | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/vcl/source/window/javachild.cxx b/vcl/source/window/javachild.cxx index 3b26e92829a7..250b82010855 100644 --- a/vcl/source/window/javachild.cxx +++ b/vcl/source/window/javachild.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 @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" - + #ifdef SOLAR_JAVA #include <jni.h> #endif @@ -83,20 +83,20 @@ void JavaChildWindow::implTestJavaException( void* pEnv ) #ifdef SOLAR_JAVA JNIEnv* pJavaEnv = reinterpret_cast< JNIEnv* >( pEnv ); jthrowable jtThrowable = pJavaEnv->ExceptionOccurred(); - - if( jtThrowable ) + + if( jtThrowable ) { // is it a java exception ? #if OSL_DEBUG_LEVEL > 1 pJavaEnv->ExceptionDescribe(); -#endif // OSL_DEBUG_LEVEL > 1 +#endif // OSL_DEBUG_LEVEL > 1 pJavaEnv->ExceptionClear(); jclass jcThrowable = pJavaEnv->FindClass("java/lang/Throwable"); jmethodID jmThrowable_getMessage = pJavaEnv->GetMethodID(jcThrowable, "getMessage", "()Ljava/lang/String;"); jstring jsMessage = (jstring) pJavaEnv->CallObjectMethod(jtThrowable, jmThrowable_getMessage); ::rtl::OUString ouMessage; - - if(jsMessage) + + if(jsMessage) { const jchar * jcMessage = pJavaEnv->GetStringChars(jsMessage, NULL); ouMessage = ::rtl::OUString(jcMessage); @@ -112,7 +112,7 @@ void JavaChildWindow::implTestJavaException( void* pEnv ) sal_IntPtr JavaChildWindow::getParentWindowHandleForJava() { - sal_IntPtr nRet = 0; + sal_IntPtr nRet = 0; #if defined WNT nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd ); @@ -122,7 +122,7 @@ sal_IntPtr JavaChildWindow::getParentWindowHandleForJava() #elif defined UNX #ifdef SOLAR_JAVA uno::Reference< lang::XMultiServiceFactory > xFactory( vcl::unohelper::GetMultiServiceFactory() ); - + if( xFactory.is() && ( GetSystemData()->aWindow > 0 ) ) { try @@ -130,65 +130,65 @@ sal_IntPtr JavaChildWindow::getParentWindowHandleForJava() ::rtl::Reference< ::jvmaccess::VirtualMachine > xVM; uno::Reference< java::XJavaVM > xJavaVM( xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.java.JavaVirtualMachine") ) ), uno::UNO_QUERY ); uno::Sequence< sal_Int8 > aProcessID( 17 ); - + rtl_getGlobalProcessId( (sal_uInt8*) aProcessID.getArray() ); aProcessID[ 16 ] = 0; OSL_ENSURE(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *), "Pointer cannot be represented as sal_Int64"); sal_Int64 nPointer = reinterpret_cast< sal_Int64 >( static_cast< jvmaccess::VirtualMachine * >(0)); xJavaVM->getJavaVM(aProcessID) >>= nPointer; xVM = reinterpret_cast< jvmaccess::VirtualMachine * >(nPointer); - + if( xVM.is() ) { try { ::jvmaccess::VirtualMachine::AttachGuard aVMAttachGuard( xVM ); JNIEnv* pEnv = aVMAttachGuard.getEnvironment(); - - jclass jcToolkit = pEnv->FindClass("java/awt/Toolkit"); + + jclass jcToolkit = pEnv->FindClass("java/awt/Toolkit"); implTestJavaException(pEnv); - + jmethodID jmToolkit_getDefaultToolkit = pEnv->GetStaticMethodID( jcToolkit, "getDefaultToolkit", "()Ljava/awt/Toolkit;" ); implTestJavaException(pEnv); - + pEnv->CallStaticObjectMethod(jcToolkit, jmToolkit_getDefaultToolkit); implTestJavaException(pEnv); - + jclass jcMotifAppletViewer = pEnv->FindClass("sun/plugin/navig/motif/MotifAppletViewer"); if( pEnv->ExceptionOccurred() ) { pEnv->ExceptionClear(); - - jcMotifAppletViewer = pEnv->FindClass( "sun/plugin/viewer/MNetscapePluginContext"); + + jcMotifAppletViewer = pEnv->FindClass( "sun/plugin/viewer/MNetscapePluginContext"); implTestJavaException(pEnv); } - - jclass jcClassLoader = pEnv->FindClass("java/lang/ClassLoader"); + + jclass jcClassLoader = pEnv->FindClass("java/lang/ClassLoader"); implTestJavaException(pEnv); - + jmethodID jmClassLoader_loadLibrary = pEnv->GetStaticMethodID( jcClassLoader, "loadLibrary", "(Ljava/lang/Class;Ljava/lang/String;Z)V"); implTestJavaException(pEnv); - + jstring jsplugin = pEnv->NewStringUTF("javaplugin_jni"); implTestJavaException(pEnv); - - pEnv->CallStaticVoidMethod(jcClassLoader, jmClassLoader_loadLibrary, jcMotifAppletViewer, jsplugin, JNI_FALSE); + + pEnv->CallStaticVoidMethod(jcClassLoader, jmClassLoader_loadLibrary, jcMotifAppletViewer, jsplugin, JNI_FALSE); implTestJavaException(pEnv); - + jmethodID jmMotifAppletViewer_getWidget = pEnv->GetStaticMethodID( jcMotifAppletViewer, "getWidget", "(IIIII)I" ); implTestJavaException(pEnv); - + const Size aSize( GetOutputSizePixel() ); - jint ji_widget = pEnv->CallStaticIntMethod( jcMotifAppletViewer, jmMotifAppletViewer_getWidget, + jint ji_widget = pEnv->CallStaticIntMethod( jcMotifAppletViewer, jmMotifAppletViewer_getWidget, GetSystemData()->aWindow, 0, 0, aSize.Width(), aSize.Height() ); implTestJavaException(pEnv); - + nRet = static_cast< sal_IntPtr >( ji_widget ); } catch( uno::RuntimeException& ) { } - + if( !nRet ) nRet = static_cast< sal_IntPtr >( GetSystemData()->aWindow ); } |