diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-12-16 10:41:15 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-12-16 10:41:15 +0000 |
| commit | 4e669e2ecd2f0780305c653f0cee382c25e7363f (patch) | |
| tree | e4d0ee6265733388e0d0ad1b3bf15e6bfb58013f /stoc | |
| parent | 4e67b74317de776b260b836b4622099b533bb995 (diff) | |
INTEGRATION: CWS jl15 (1.65.2); FILE MERGED
2004/11/29 15:54:27 jl 1.65.2.1: #i37828# applet - netaccess settings did not match the values from officecfg/registry/schema/org/openoffice/Office/Java.xcs
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/javavm/javavm.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index cf7c61a00..bfe1051ca 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: javavm.cxx,v $ * - * $Revision: 1.65 $ + * $Revision: 1.66 $ * - * last change: $Author: hr $ $Date: 2004-11-09 13:53:37 $ + * last change: $Author: kz $ $Date: 2004-12-16 11:41:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -529,11 +529,11 @@ void getJavaPropsFromSafetySettings( rtl::OUString sVal; switch( val) { - case 0: sVal= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unrestricted")); + case 0: sVal= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("host")); break; - case 1: sVal= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("none")); + case 1: sVal= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unrestricted")); break; - case 2: sVal= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("host")); + case 3: sVal= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("none")); break; } rtl::OUString sProperty( RTL_CONSTASCII_USTRINGPARAM("appletviewer.security.mode=")); @@ -1220,15 +1220,15 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( { case 0: aPropertyValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "unrestricted")); + "host")); break; case 1: aPropertyValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "none")); + "unrestricted")); break; - case 2: + case 3: aPropertyValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "host")); + "none")); break; } else |