From 1b97206d571462a8ee51162b244478f395863179 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 17 Dec 2003 19:37:25 +0000 Subject: INTEGRATION: CWS geordi2q11 (1.2.86); FILE MERGED 2003/12/16 16:05:21 hr 1.2.86.1: #111934#: join CWS ooo111fix1 --- sj2/source/jscpp/sjapplet_impl.hxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'sj2/source') 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 - +#ifdef SOLAR_JAVA #include - +#endif // SOLAR_JAVA #include +#ifdef SOLAR_JAVA #include #include +#endif // SOLAR_JAVA #include @@ -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 _xJavaVM; com::sun::star::uno::Reference _xJavaThreadRegister_11; +#endif // SOLAR_JAVA SjApplet2_Impl() throw(com::sun::star::uno::RuntimeException); ~SjApplet2_Impl() throw(); -- cgit