diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 19:36:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 19:36:51 +0000 |
| commit | 51ae19745e6ea0ab786a4acba32dd69071e71cef (patch) | |
| tree | b7bdb0fd41e54a047fb0ff38c87c8c02d4418be8 /sj2 | |
| parent | ae7eecf0b700331514a18a89d4febd36b4c50062 (diff) | |
INTEGRATION: CWS geordi2q11 (1.9.40); FILE MERGED
2003/12/16 16:05:20 hr 1.9.40.1: #111934#: join CWS ooo111fix1
Diffstat (limited to 'sj2')
| -rw-r--r-- | sj2/source/jscpp/sjapplet.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sj2/source/jscpp/sjapplet.cxx b/sj2/source/jscpp/sjapplet.cxx index 1a96b7d1ac5e..879d356533c9 100644 --- a/sj2/source/jscpp/sjapplet.cxx +++ b/sj2/source/jscpp/sjapplet.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sjapplet.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: vg $ $Date: 2003-04-15 16:00:56 $ + * last change: $Author: vg $ $Date: 2003-12-17 20:36:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,9 @@ ************************************************************************/ #include <cstdarg> +#ifdef SOLAR_JAVA #include <jnihelp.hxx> +#endif // SOLAR_JAVA #include <sjapplet.hxx> @@ -79,11 +81,15 @@ using namespace ::rtl; using namespace ::utl; +#ifdef SOLAR_JAVA using namespace ::sj2; +#endif // SOLAR_JAVA using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; +#ifdef SOLAR_JAVA using namespace ::com::sun::star::java; +#endif // SOLAR_JAVA SjApplet2::SjApplet2() : _pImpl(new SjApplet2_Impl()) @@ -346,7 +352,7 @@ SjINetSettings::SjINetSettings() /* * Java init function to invoke Java runtime using JNI invocation API. */ - +#ifdef SOLAR_JAVA void JRE_PropertyChanged( JNIEnv * env, const SvCommandList & rCmdList ) { jclass pClass = env->FindClass("java/util/Properties"); @@ -389,6 +395,7 @@ void JRE_PropertyChanged( JNIEnv * env, const SvCommandList & rCmdList ) env->DeleteLocalRef( pProps ); env->DeleteLocalRef( pClass ); } +#endif // SOLAR_JAVA // Settings are detected by the JavaVM service // This function is not necessary anymore |