diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-06-26 14:39:49 +1000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-07-02 10:50:19 +0200 |
| commit | dc58872a7296c0577e7dbe2ba41c33246386749d (patch) | |
| tree | 245480c60bfc9654f666360880c7201e1dccb526 /ucb | |
| parent | 79d7b69076feddaafdcde34fc747d83371464239 (diff) | |
tdf#114227: Add support for PAC to ucbhelper::InternetProxyDecider on Windows
Change-Id: I62c76efb354949699615a44d9482df24e3eaa314
Reviewed-on: https://gerrit.libreoffice.org/56433
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 2e142c0ee54744d35517f0b9c49a24302fb32d47)
Reviewed-on: https://gerrit.libreoffice.org/56688
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/webdav-neon/NeonSession.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/NeonSession.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index f9ccc0072c49..3af9a6aba60f 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -1696,7 +1696,7 @@ void NeonSession::abort() SAL_INFO( "ucb.ucp.webdav", "neon commands cannot be aborted" ); } -const ucbhelper::InternetProxyServer & NeonSession::getProxySettings() const +ucbhelper::InternetProxyServer NeonSession::getProxySettings() const { if ( m_aScheme == "http" || m_aScheme == "https" ) { diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx index 28b23678326c..db20772a62f2 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.hxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx @@ -219,7 +219,7 @@ private: const OUString & inPath, const DAVRequestEnvironment & rEnv ); - const ucbhelper::InternetProxyServer & getProxySettings() const; + ucbhelper::InternetProxyServer getProxySettings() const; bool removeExpiredLocktoken( const OUString & inURL, const DAVRequestEnvironment & rEnv ); |