diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-03-25 13:56:23 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-03-25 13:56:23 +0000 |
| commit | a14ca2917b69b221c2956efc0eca04e842bdcf24 (patch) | |
| tree | 5dbc6ab700a81950953b2d167f33dcb26affe3bf /sj2 | |
| parent | e2dd695668579c2a0483a0af32bbaff2a9c55ee8 (diff) | |
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
Diffstat (limited to 'sj2')
| -rw-r--r-- | sj2/source/jscpp/sjapplet_impl.hxx | 10 |
1 files changed, 4 insertions, 6 deletions
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(); |