summaryrefslogtreecommitdiff
path: root/svtools/source/config
diff options
context:
space:
mode:
authorStephan Bergmann <sb@openoffice.org>2001-06-22 13:11:08 +0000
committerStephan Bergmann <sb@openoffice.org>2001-06-22 13:11:08 +0000
commit10a035e5deef8f5808aa7e5a8a3153b7986ad7bf (patch)
tree0334d3f33961d4a118de1752c004b1ca0b2309e3 /svtools/source/config
parentbd41ce9c569c48f6233c767f84931b489ba9441d (diff)
#88512# Wrap config entry name changes in TF_CFGDATA.
Diffstat (limited to 'svtools/source/config')
-rw-r--r--svtools/source/config/inetoptions.cxx29
1 files changed, 27 insertions, 2 deletions
diff --git a/svtools/source/config/inetoptions.cxx b/svtools/source/config/inetoptions.cxx
index c3411d82b46a..040094889772 100644
--- a/svtools/source/config/inetoptions.cxx
+++ b/svtools/source/config/inetoptions.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: inetoptions.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: dg $ $Date: 2001-06-22 11:15:28 $
+ * last change: $Author: sb $ $Date: 2001-06-22 14:11:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -325,8 +325,13 @@ SvtInetOptions::Impl::notifyListeners(
//============================================================================
SvtInetOptions::Impl::Impl():
+#if defined TF_CFGDATA
ConfigItem(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Inet/Settings")))
+#else // TF_CFGDATA
+ ConfigItem(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Inet")))
+#endif // TF_CFGDATA
{
+#if defined TF_CFGDATA
m_aEntries[INDEX_DNS_SERVER].m_aName
= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooInetDNSServer"));
m_aEntries[INDEX_NO_PROXY].m_aName
@@ -345,6 +350,26 @@ SvtInetOptions::Impl::Impl():
= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooInetSOCKSProxyName"));
m_aEntries[INDEX_SOCKS_PROXY_PORT].m_aName
= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooInetSOCKSProxyPort"));
+#else // TF_CFGDATA
+ m_aEntries[INDEX_DNS_SERVER].m_aName
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DNS/IP_Address"));
+ m_aEntries[INDEX_NO_PROXY].m_aName
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Proxy/NoProxy"));
+ m_aEntries[INDEX_PROXY_TYPE].m_aName
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Proxy/Type"));
+ m_aEntries[INDEX_FTP_PROXY_NAME].m_aName
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Proxy/FTP/Name"));
+ m_aEntries[INDEX_FTP_PROXY_PORT].m_aName
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Proxy/FTP/Port"));
+ m_aEntries[INDEX_HTTP_PROXY_NAME].m_aName
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Proxy/HTTP/Name"));
+ m_aEntries[INDEX_HTTP_PROXY_PORT].m_aName
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Proxy/HTTP/Port"));
+ m_aEntries[INDEX_SOCKS_PROXY_NAME].m_aName
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Proxy/SOCKS/Name"));
+ m_aEntries[INDEX_SOCKS_PROXY_PORT].m_aName
+ = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Proxy/SOCKS/Port"));
+#endif // TF_CFGDATA
star::uno::Sequence< rtl::OUString > aKeys(ENTRY_COUNT);
for (sal_Int32 i = 0; i < ENTRY_COUNT; ++i)
aKeys[i] = m_aEntries[i].m_aName;