[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - ucb/source

[Libreoffice Gerrit user]

 ucb/source/ucp/webdav/SerfSession.cxx |    2 +-
 ucb/source/ucp/webdav/SerfSession.hxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1be537ea29cd02ea01ab8ecd078135cd45c9ff40
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Sep 4 09:06:39 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Sep 5 08:48:33 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 <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 200f88c55842a3947eb3cbc5ce05b044eb25d338)
    Reviewed-on: https://gerrit.libreoffice.org/59981
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Jenkins

diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index ab41f1f5ac0f..2f4b0db16761 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -1120,7 +1120,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 );