diff options
| author | Joachim Lingner <jl@openoffice.org> | 2011-01-04 12:01:53 +0100 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2011-01-04 12:01:53 +0100 |
| commit | 4d9bdb9e1a698f256a32921b5eeb7019699835db (patch) | |
| tree | 1657ca8b942e299dfdcceb70252f84067c017687 /jvmfwk/source/elements.cxx | |
| parent | c8108e906f998f14a0a7f0125674970b55def952 (diff) | |
| parent | 77ffc6a41ba05725442df132131597fca78a84ea (diff) | |
jl160 merge with DEV300m96
Diffstat (limited to 'jvmfwk/source/elements.cxx')
| -rw-r--r-- | jvmfwk/source/elements.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 606929375915..8ed982f34523 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -974,6 +974,16 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo) pDoc, cur->children, 1); rtl::OUString sRequire = xmlRequire; nRequirements = sRequire.toInt64(16); +#ifdef MACOSX + //javaldx is not used anymore in the mac build. In case the Java + //corresponding to the saved settings does not exist anymore the + //javavm services will look for an existing Java after creation of + //the JVM failed. See stoc/source/javavm/javavm.cxx. Only if + //nRequirements does not have the flag JFW_REQUIRE_NEEDRESTART the + //jvm of the new selected JRE will be started. Old settings (before + //OOo 3.3) still contain the flag which can be safely ignored. + nRequirements &= ~JFW_REQUIRE_NEEDRESTART; +#endif } else if (xmlStrcmp(cur->name, (xmlChar*) "vendorData") == 0) { |