diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-07 09:13:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-07 09:13:09 +0000 |
| commit | 13d2292de8aeda9b43b6ca2682415be0c45a4bcc (patch) | |
| tree | dcfe3e82bd8e0a16f926cc60487112465dbbda77 /shell | |
| parent | e9978f687df4f9362a64faf6ecfe5bd00af2fcf5 (diff) | |
INTEGRATION: CWS tkr05_SRC680 (1.13.42); FILE MERGED
2007/10/25 07:42:15 tkr 1.13.42.2: #31053# HTTPS WebDAV support (proxy)
2007/10/24 09:47:40 tkr 1.13.42.1: #31053# HTTPS WebDAV support (proxies)
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/backends/gconfbe/gconfbackend.cxx | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index 2512d6d6f965..a293fab6df74 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -4,9 +4,9 @@ * * $RCSfile: gconfbackend.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2007-04-04 07:46:40 $ + * last change: $Author: rt $ $Date: 2007-11-07 10:13:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -222,6 +222,26 @@ static const ConfigurationValue InetConfigurationValuesList[] = SETTING_PROXY_MODE }, + { + SETTING_PROXY_HTTPS_HOST, + "/system/proxy/secure_host", + "org.openoffice.Inet/Settings/ooInetHTTPSProxyName", + "string", + sal_False, + sal_False, + SETTING_PROXY_MODE + }, + + { + SETTING_PROXY_HTTPS_PORT, + "/system/proxy/secure_port", + "org.openoffice.Inet/Settings/ooInetHTTPSProxyPort", + "int", + sal_False, + sal_False, + SETTING_PROXY_MODE + }, + { SETTING_PROXY_FTP_HOST, "/system/proxy/ftp_host", |