diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 19:37:25 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 19:37:25 +0000 |
| commit | 1b97206d571462a8ee51162b244478f395863179 (patch) | |
| tree | f4cccc55226404072e2b5a3174baa5fcb5ee3158 /sj2/source | |
| parent | b9f2cc490243d8770cf3a63f0a5a70fa9a85090c (diff) | |
INTEGRATION: CWS geordi2q11 (1.2.86); FILE MERGED
2003/12/16 16:05:21 hr 1.2.86.1: #111934#: join CWS ooo111fix1
Diffstat (limited to 'sj2/source')
| -rw-r--r-- | sj2/source/jscpp/sjapplet_impl.hxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sj2/source/jscpp/sjapplet_impl.hxx b/sj2/source/jscpp/sjapplet_impl.hxx index 11a70c482dc1..b8e884a0453e 100644 --- a/sj2/source/jscpp/sjapplet_impl.hxx +++ b/sj2/source/jscpp/sjapplet_impl.hxx @@ -1,13 +1,15 @@ #include <cstdarg> - +#ifdef SOLAR_JAVA #include <jni.h> - +#endif // SOLAR_JAVA #include <unotools/processfactory.hxx> +#ifdef SOLAR_JAVA #include <com/sun/star/java/XJavaVM.hpp> #include <com/sun/star/java/XJavaThreadRegister_11.hpp> +#endif // SOLAR_JAVA #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -16,9 +18,12 @@ class INetURLObject; class SvCommandList; class Size; +#ifdef SOLAR_JAVA struct EmbeddedWindow; +#endif // SOLAR_JAVA struct SjApplet2_Impl { +#ifdef SOLAR_JAVA Window * _pParentWin; JavaVM * _pJVM; @@ -29,6 +34,7 @@ struct SjApplet2_Impl { 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(); |