diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2023-11-16 12:55:48 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-11-16 19:15:26 +0100 |
| commit | d343a2b6393aec2eba0d25d7f4f390f12d1515f6 (patch) | |
| tree | 382202d861eee7a2a1909c627c400e5bfee7b173 /sfx2 | |
| parent | 4c40fe59893709f87e72f0dd36e859591d253189 (diff) | |
tdf#146386 deprecate, remove usage of Inet::Settings::ooInetFTPProxyName
* officecfg: deprecate Inet::Settings::ooInetFTPProxyName/Port
* ucbhelper: stop handling these settings
* sfx2: remove SID_INET_FTP_PROXY_NAME and SID_INET_FTP_PROXY_PORT
and usage from SfxApplication::GetOptions()
* shell: remove proxy config code from backends
* stoc: the JavaVM would have its "ftp.proxyHost" properties set based
on officecfg values; remove that
* sysui,vcl: remove protocol from KDE desktop files and file picker
Change-Id: Iba02676cf6e519e2fa60ba925209436d38e75f49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159500
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appcfg.cxx | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 679eb2cd3da9..ee45f9da2661 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -211,14 +211,6 @@ void SfxApplication::GetOptions( SfxItemSet& rSet ) bRet = toSet_withDefault<officecfg::Inet::Settings::ooInetHTTPProxyPort>( rSet, SID_INET_HTTP_PROXY_PORT, 0); break; - case SID_INET_FTP_PROXY_NAME: - bRet = toSet<officecfg::Inet::Settings::ooInetFTPProxyName>( - rSet, SID_INET_FTP_PROXY_NAME); - break; - case SID_INET_FTP_PROXY_PORT: - bRet = toSet_withDefault<officecfg::Inet::Settings::ooInetFTPProxyPort>( - rSet, SID_INET_FTP_PROXY_PORT, 0); - break; case SID_INET_NOPROXY: bRet = toSet<officecfg::Inet::Settings::ooInetNoProxy>(rSet, SID_INET_NOPROXY); break; @@ -318,10 +310,6 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) rSet, SID_INET_HTTP_PROXY_NAME, batch); toCfg_ifSet<officecfg::Inet::Settings::ooInetHTTPProxyPort>( rSet, SID_INET_HTTP_PROXY_PORT, batch); - toCfg_ifSet<officecfg::Inet::Settings::ooInetFTPProxyName>( - rSet, SID_INET_FTP_PROXY_NAME, batch); - toCfg_ifSet<officecfg::Inet::Settings::ooInetFTPProxyPort>( - rSet, SID_INET_FTP_PROXY_PORT, batch); toCfg_ifSet<officecfg::Inet::Settings::ooInetNoProxy>(rSet, SID_INET_NOPROXY, batch); // Secure-Referrer |