core.git: Branch 'distro/collabora/co-24.04' - ucb/source

[Caolán McNamara (via logerrit)]

 ucb/source/ucp/webdav-curl/SerfLockStore.hxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 3f90d8ac41c6aa69047b13f264a5018996285e4d
Author: Caolán McNamara 
AuthorDate: Mon May 20 16:48:54 2024 +0100
Commit: Caolán McNamara 
CommitDate: Tue May 21 11:56:27 2024 +0200

remove stray lines

Change-Id: I63aaa95921f79eea682ab82194b15083a9fa8fd4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167873
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
Reviewed-by: Michael Meeks 

diff --git a/ucb/source/ucp/webdav-curl/SerfLockStore.hxx 
b/ucb/source/ucp/webdav-curl/SerfLockStore.hxx
index 08a88746b0d0..30c7fe1d407e 100644
--- a/ucb/source/ucp/webdav-curl/SerfLockStore.hxx
+++ b/ucb/source/ucp/webdav-curl/SerfLockStore.hxx
@@ -82,9 +82,6 @@ public:
 
 void refreshLocks();
 
-void joinThread();
-void restartThread();
-
 // comphelper::LibreOfficeKit::ThreadJoinable
 virtual bool joinThreads() override;
 virtual void startThreads() override;

core.git: Branch 'distro/collabora/co-24.04' - ucb/source

[Thorsten Behrens (via logerrit)]

 ucb/source/ucp/webdav-curl/CurlSession.cxx |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 5c81267c2e564cd4860f6034f2c3ec7831e2760b
Author: Thorsten Behrens 
AuthorDate: Thu May 16 17:52:41 2024 +0200
Commit: Andras Timar 
CommitDate: Fri May 17 13:36:22 2024 +0200

Revert "LOK: Allow image upload from WOPI-like host with self-signed cert"

This reverts commit d95ac1c608caba9cabaa503f1a5589285547aed5.

Change-Id: I4bc104272d4c41efab1a7e5eae78267675c1b32b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167753
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx 
b/ucb/source/ucp/webdav-curl/CurlSession.cxx
index 8baca1577f28..e60bd6ef1d36 100644
--- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
+++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
@@ -15,7 +15,6 @@
 #include "webdavresponseparser.hxx"
 
 #include 
-#include 
 #include 
 #include 
 
@@ -690,14 +689,6 @@ 
CurlSession::CurlSession(uno::Reference xContext,
 rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_FORBID_REUSE, 1L);
 assert(rc == CURLE_OK);
 }
-// If WOPI-like host has self-signed certificate, it's not possible to 
insert images
-// to the document, so here is a compromise. The user has already accepted 
the self
-// signed certificate in the browser, when we get here.
-if (comphelper::LibreOfficeKit::isActive())
-{
-rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_SSL_VERIFYPEER, 0L);
-assert(rc == CURLE_OK);
-}
 }
 
 CurlSession::~CurlSession() {}