CWS-TOOLING: integrate CWS avmedia102

4 files changed, 166 insertions, 160 deletions

diff --git a/vcl/inc/vcl/javachild.hxx b/vcl/inc/vcl/javachild.hxx
index 62b447f26571..c5ec3c678900 100644
--- a/vcl/inc/vcl/javachild.hxx
+++ b/vcl/inc/vcl/javachild.hxx
@@ -47,8 +47,6 @@ public:
 
 private:
 
-    SAL_DLLPRIVATE void implTestJavaException( void* pEnv );
-
     // Copy assignment is forbidden and not implemented.
     SAL_DLLPRIVATE      JavaChildWindow (const JavaChildWindow &);
     SAL_DLLPRIVATE      JavaChildWindow & operator= (const JavaChildWindow &);
diff --git a/vcl/inc/vcl/syschild.hxx b/vcl/inc/vcl/syschild.hxx
index da4ffcd51a22..e914adbdffed 100644
--- a/vcl/inc/vcl/syschild.hxx
+++ b/vcl/inc/vcl/syschild.hxx
@@ -44,6 +44,7 @@ class VCL_DLLPUBLIC SystemChildWindow : public Window
 private:
     using Window::ImplInit;
     SAL_DLLPRIVATE void     ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, BOOL bShow = FALSE );
+    SAL_DLLPRIVATE void     ImplTestJavaException( void* pEnv );
 
     // Copy assignment is forbidden and not implemented.
     SAL_DLLPRIVATE          SystemChildWindow (const SystemChildWindow &);
@@ -62,6 +63,11 @@ public:
     //  however, this might not always be required
     void                    EnableEraseBackground( BOOL bEnable = TRUE );
     BOOL                    IsEraseBackgroundEnabled();
+
+    // return the platform specific handle/id of this window;
+    // in case the flag bUseJava is set, a java compatible overlay window
+    // is created on which other java windows can be created (plugin interface)
+    sal_IntPtr              GetParentWindowHandle( sal_Bool bUseJava = sal_False );
 };
 
 #endif // _SV_SYSCHILD_HXX
diff --git a/vcl/source/window/javachild.cxx b/vcl/source/window/javachild.cxx
index 2cd18b897ff5..aa198c85c138 100644
--- a/vcl/source/window/javachild.cxx
+++ b/vcl/source/window/javachild.cxx
@@ -2,10 +2,13 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: javachild.cxx,v $
+ * $Revision: 1.12 $
+ *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -28,32 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-
-#ifdef SOLAR_JAVA
-#include <jni.h>
-#endif
-#include <comphelper/processfactory.hxx>
-
-#include <vcl/unohelp.hxx>
-#include <rtl/process.h>
-#include <rtl/ref.hxx>
-#include <jvmaccess/virtualmachine.hxx>
-#include <com/sun/star/java/XJavaVM.hpp>
-#include <com/sun/star/java/XJavaThreadRegister_11.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#include <vcl/salinst.hxx>
-#include <vcl/salframe.hxx>
-#include <vcl/window.hxx>
-#include <vcl/salobj.hxx>
 #include <vcl/javachild.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/sysdata.hxx>
-
-using namespace ::com::sun::star;
 
 // -------------------
 // - JavaChildWindow -
@@ -79,129 +57,7 @@ JavaChildWindow::~JavaChildWindow()
 
 // -----------------------------------------------------------------------
 
-void JavaChildWindow::implTestJavaException( void* pEnv )
-{
-#ifdef SOLAR_JAVA
-    JNIEnv*     pJavaEnv = reinterpret_cast< JNIEnv* >( pEnv );
-    jthrowable  jtThrowable = pJavaEnv->ExceptionOccurred();
-
-    if( jtThrowable )
-    { // is it a java exception ?
-#if OSL_DEBUG_LEVEL > 1
-        pJavaEnv->ExceptionDescribe();
-#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)
-        {
-            const jchar * jcMessage = pJavaEnv->GetStringChars(jsMessage, NULL);
-            ouMessage = ::rtl::OUString(jcMessage);
-            pJavaEnv->ReleaseStringChars(jsMessage, jcMessage);
-        }
-
-        throw uno::RuntimeException(ouMessage, uno::Reference<uno::XInterface>());
-    }
-#endif // SOLAR_JAVA
-}
-
-// -----------------------------------------------------------------------
-
 sal_IntPtr JavaChildWindow::getParentWindowHandleForJava()
 {
-    sal_IntPtr nRet = 0;
-
-#if defined WNT
-    nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd );
-#elif defined QUARTZ
-    // FIXME: this is wrong
-    nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView );
-#elif defined UNX
-#ifdef SOLAR_JAVA
-    uno::Reference< lang::XMultiServiceFactory > xFactory( vcl::unohelper::GetMultiServiceFactory() );
-
-    if( xFactory.is() && ( GetSystemData()->aWindow > 0 ) )
-    {
-        try
-        {
-            ::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");
-                    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");
-                        implTestJavaException(pEnv);
-                    }
-
-                    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);
-                    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,
-                                                                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 );
-            }
-        }
-        catch( ... )
-        {
-        }
-    }
-#endif // SOLAR_JAVA
-#else // WNT || QUARTZ || UNX
-    // TBD
-#endif
-
-    return nRet;
+    return SystemChildWindow::GetParentWindowHandle( sal_True );
 }
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index ef71f83df1ee..4e897eef4a8b 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -28,25 +28,34 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
 #include <svsys.h>
-#endif
+#include <rtl/process.h>
+#include <rtl/ref.hxx>
+#include <tools/rc.h>
+#include <vcl/window.h>
 #include <vcl/salinst.hxx>
 #include <vcl/salframe.hxx>
 #include <vcl/window.hxx>
 #include <vcl/salobj.hxx>
-
-#ifndef _SV_RC_H
-#include <tools/rc.h>
-#endif
 #include <vcl/svdata.hxx>
-#ifndef _SV_WIDNOW_H
-#include <vcl/window.h>
-#endif
+#include <vcl/sysdata.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syschild.hxx>
+#include <vcl/unohelp.hxx>
 
+#ifdef SOLAR_JAVA
+#include <jni.h>
+#endif
+
+#include <comphelper/processfactory.hxx>
+#include <jvmaccess/virtualmachine.hxx>
+#include <com/sun/star/java/XJavaVM.hpp>
+#include <com/sun/star/java/XJavaThreadRegister_11.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+
+#include <vcl/syschild.hxx>
 
+using namespace ::com::sun::star;
 
 // =======================================================================
 
@@ -183,6 +192,8 @@ void SystemChildWindow::EnableEraseBackground( BOOL bEnable )
         mpWindowImpl->mpSysObj->EnableEraseBackground( bEnable );
 }
 
+// -----------------------------------------------------------------------
+
 BOOL SystemChildWindow::IsEraseBackgroundEnabled()
 {
     if ( mpWindowImpl->mpSysObj )
@@ -190,3 +201,138 @@ BOOL SystemChildWindow::IsEraseBackgroundEnabled()
     else
         return FALSE;
 }
+
+// -----------------------------------------------------------------------
+
+void SystemChildWindow::ImplTestJavaException( void* pEnv )
+{
+#ifdef SOLAR_JAVA
+    JNIEnv*     pJavaEnv = reinterpret_cast< JNIEnv* >( pEnv );
+    jthrowable  jtThrowable = pJavaEnv->ExceptionOccurred();
+
+    if( jtThrowable )
+    { // is it a java exception ?
+#if OSL_DEBUG_LEVEL > 1
+        pJavaEnv->ExceptionDescribe();
+#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)
+            {
+                const jchar * jcMessage = pJavaEnv->GetStringChars(jsMessage, NULL);
+                ouMessage = ::rtl::OUString(jcMessage);
+                pJavaEnv->ReleaseStringChars(jsMessage, jcMessage);
+            }
+
+            throw uno::RuntimeException(ouMessage, uno::Reference<uno::XInterface>());
+    }
+#endif // SOLAR_JAVA
+}
+
+// -----------------------------------------------------------------------
+
+sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava )
+{
+    sal_IntPtr nRet = 0;
+
+#if defined WNT
+    nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd );
+#elif defined QUARTZ
+    // FIXME: this is wrong
+    nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView );
+#elif defined UNX
+    if( !bUseJava )
+    {
+        nRet = (sal_IntPtr) GetSystemData()->aWindow;
+    }
+#ifdef SOLAR_JAVA
+    else
+    {
+        uno::Reference< lang::XMultiServiceFactory > xFactory( vcl::unohelper::GetMultiServiceFactory() );
+
+        if( xFactory.is() && ( GetSystemData()->aWindow > 0 ) )
+        {
+            try
+            {
+                    ::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");
+                                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");
+                                    ImplTestJavaException(pEnv);
+                                }
+
+                                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);
+                                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,
+                                        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 );
+                    }
+            }
+            catch( ... )
+            {
+            }
+        }
+    }
+#endif // SOLAR_JAVA
+#else // WNT || QUARTZ || UNX
+#endif
+
+    return nRet;
+}