diff options
| author | Joachim Lingner <jl@openoffice.org> | 2010-10-27 14:33:45 +0200 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2010-10-27 14:33:45 +0200 |
| commit | 3352853a9d6779a40a50ce7ecee6d794a6a5075f (patch) | |
| tree | 597d17ed40fb2027937498208a04ae3e53cb4ced /jvmfwk | |
| parent | d726734faf28f6d84f7f97f25b45e46ffd4c53f4 (diff) | |
jl162 #i115180# fix problems with latest java 1.6.0_22 on MacOS 10.6
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/elements.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 37e5891af32b..9674c28d54df 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -938,8 +938,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo) //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. - if (nRequirements & JFW_REQUIRE_NEEDRESTART) - nRequirements ^= JFW_REQUIRE_NEEDRESTART; + nRequirements &= ~JFW_REQUIRE_NEEDRESTART; #endif } else if (xmlStrcmp(cur->name, (xmlChar*) "vendorData") == 0) |