ucb/source/ucp/webdav/SerfSession.cxx | 2 +- ucb/source/ucp/webdav/SerfSession.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 200f88c55842a3947eb3cbc5ce05b044eb25d338 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Tue Sep 4 09:06:39 2018 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Tue Sep 4 14:56:04 2018 +0200 -Werror=return-local-addr (-with-webdav=serf) Missing adaption after 2e142c0ee54744d35517f0b9c49a24302fb32d47 "tdf#114227: Add support for PAC to ucbhelper::InternetProxyDecider on Windows", found by <https://ci.libreoffice.org//job/lo_tb_random_config_linux/1456/>. Change-Id: I5093827035a9bbc31f3d8d2262e14df55fa610aa Reviewed-on: https://gerrit.libreoffice.org/59961 Reviewed-by: Stephan Bergmann <sberg...@redhat.com> Tested-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index 41e30b823e96..a8be54cdc052 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -1121,7 +1121,7 @@ void SerfSession::abort() } -const ucbhelper::InternetProxyServer & SerfSession::getProxySettings() const +ucbhelper::InternetProxyServer SerfSession::getProxySettings() const { if ( m_aUri.GetScheme() == "http" || m_aUri.GetScheme() == "https" ) { diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx index 3e162258117c..8c2a14439358 100644 --- a/ucb/source/ucp/webdav/SerfSession.hxx +++ b/ucb/source/ucp/webdav/SerfSession.hxx @@ -236,7 +236,7 @@ private: /// @throws DAVException void HandleError( std::shared_ptr<SerfRequestProcessor> rReqProc ); - const ucbhelper::InternetProxyServer & getProxySettings() const; + ucbhelper::InternetProxyServer getProxySettings() const; static bool removeExpiredLocktoken( const OUString & inURL, const DAVRequestEnvironment & rEnv ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits