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 /ucbhelper | |
| 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 'ucbhelper')
| -rw-r--r-- | ucbhelper/source/client/proxydecider.cxx | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index 7dba73a50d67..8acc15716af4 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -56,8 +56,6 @@ constexpr OUString HTTP_PROXY_NAME_KEY = u"ooInetHTTPProxyName"_ustr; constexpr OUString HTTP_PROXY_PORT_KEY = u"ooInetHTTPProxyPort"_ustr; constexpr OUString HTTPS_PROXY_NAME_KEY = u"ooInetHTTPSProxyName"_ustr; constexpr OUString HTTPS_PROXY_PORT_KEY = u"ooInetHTTPSProxyPort"_ustr; -constexpr OUString FTP_PROXY_NAME_KEY = u"ooInetFTPProxyName"_ustr; -constexpr OUString FTP_PROXY_PORT_KEY = u"ooInetFTPProxyPort"_ustr; namespace ucbhelper @@ -129,7 +127,6 @@ class InternetProxyDecider_Impl : mutable osl::Mutex m_aMutex; InternetProxyServer m_aHttpProxy; InternetProxyServer m_aHttpsProxy; - InternetProxyServer m_aFtpProxy; const InternetProxyServer m_aEmptyProxy; ProxyType m_nProxyType; uno::Reference< util::XChangesNotifier > m_xNotifier; @@ -352,14 +349,6 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl( xNameAccess, HTTPS_PROXY_PORT_KEY, m_aHttpsProxy.nPort ); if ( m_aHttpsProxy.nPort == -1 ) m_aHttpsProxy.nPort = 443; // standard HTTPS port. - - // *** FTP *** - getConfigStringValue( - xNameAccess, FTP_PROXY_NAME_KEY, m_aFtpProxy.aName ); - - m_aFtpProxy.nPort = -1; - getConfigInt32Value( - xNameAccess, FTP_PROXY_PORT_KEY, m_aFtpProxy.nPort ); } // Register as listener for config changes. @@ -685,12 +674,7 @@ InternetProxyServer InternetProxyDecider_Impl::getProxy( return m_aEmptyProxy; } - if ( rProtocol.toAsciiLowerCase() == "ftp" ) - { - if ( !m_aFtpProxy.aName.isEmpty() && m_aFtpProxy.nPort >= 0 ) - return m_aFtpProxy; - } - else if ( rProtocol.toAsciiLowerCase() == "https" ) + if (rProtocol.toAsciiLowerCase() == "https") { if ( !m_aHttpsProxy.aName.isEmpty() ) return m_aHttpsProxy; @@ -774,22 +758,6 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( if ( m_aHttpsProxy.nPort == -1 ) m_aHttpsProxy.nPort = 443; // standard HTTPS port. } - else if ( aKey == FTP_PROXY_NAME_KEY ) - { - if ( !( rElem.Element >>= m_aFtpProxy.aName ) ) - { - OSL_FAIL( "InternetProxyDecider - changesOccurred - " - "Error getting config item value!" ); - } - } - else if ( aKey == FTP_PROXY_PORT_KEY ) - { - if ( !( rElem.Element >>= m_aFtpProxy.nPort ) ) - { - OSL_FAIL( "InternetProxyDecider - changesOccurred - " - "Error getting config item value!" ); - } - } } } } |