From a14ca2917b69b221c2956efc0eca04e842bdcf24 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Thu, 25 Mar 2004 13:56:23 +0000
Subject: INTEGRATION: CWS jl3 (1.2.78); FILE MERGED 2004/02/10 16:48:12 jl
 1.2.78.3: #111907# removed conflicts after merge 2004/02/09 13:43:03 jl
 1.2.78.2: RESYNC: (1.2-1.3); FILE MERGED 2003/11/20 16:40:05 jl 1.2.78.1:
 #111907# replace TKTThreadAttach by jvmaccess::VirtualMachine, directory
 source/java is now empty

---
 sj2/source/jscpp/sjapplet_impl.hxx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'sj2')

diff --git a/sj2/source/jscpp/sjapplet_impl.hxx b/sj2/source/jscpp/sjapplet_impl.hxx
index b8e884a0453e..b0cc9c1c00db 100644
--- a/sj2/source/jscpp/sjapplet_impl.hxx
+++ b/sj2/source/jscpp/sjapplet_impl.hxx
@@ -3,7 +3,6 @@
 #ifdef SOLAR_JAVA
 #include <jni.h>
 #endif // SOLAR_JAVA
-
 #include <unotools/processfactory.hxx>
 
 #ifdef SOLAR_JAVA
@@ -12,6 +11,8 @@
 #endif // SOLAR_JAVA
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include "rtl/ref.hxx"
+#include "jvmaccess/virtualmachine.hxx"
 
 class Window;
 class INetURLObject;
@@ -26,16 +27,13 @@ struct SjApplet2_Impl {
 #ifdef SOLAR_JAVA
     Window              * _pParentWin;
 
-    JavaVM *    _pJVM;
+    rtl::Reference<jvmaccess::VirtualMachine> _virtualMachine;
+
     jobject     _joAppletExecutionContext;
     jclass      _jcAppletExecutionContext;
 
     EmbeddedWindow * _pEmbeddedWindow;
-
-    com::sun::star::uno::Reference<com::sun::star::java::XJavaVM>                   _xJavaVM;
-    com::sun::star::uno::Reference<com::sun::star::java::XJavaThreadRegister_11>    _xJavaThreadRegister_11;
 #endif // SOLAR_JAVA
-
     SjApplet2_Impl() throw(com::sun::star::uno::RuntimeException);
     ~SjApplet2_Impl() throw();
 
-- 
cgit