[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 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 c6e07ecc750237db0ab7eb75c0e15d9d527b2c1b
Author:     Szymon Kłos <eszka...@gmail.com>
AuthorDate: Fri Mar 1 00:40:47 2019 +0100
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Mar 1 00:48:53 2019 +0100

    WebDAV serf: crash fix on init
    
    Change-Id: I418865f4552cb91c7e2ba47e6b73baf8ee0547a3
    Reviewed-on: https://gerrit.libreoffice.org/68519
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    Tested-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/ucb/source/ucp/webdav/SerfSession.cxx 
b/ucb/source/ucp/webdav/SerfSession.cxx
index ab41f1f5ac0f..a801b3e45c51 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
+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..0993af3dc91f 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;
+    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