[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - uui/source

[Libreoffice Gerrit user]

 uui/source/iahndl-ssl.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit a08552a8c36754930a3268e27aefee70d5cf21df
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Nov 25 18:15:24 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Nov 28 13:54:56 2018 +0100

    Do not validate SSL cert in LOK case
    
    Currently we cannot tunnel interaction handler dialog, so if there
    is a problem with site's SSL cert, the operation (e.g. insert image)
    would silently fail. As a workaround, let's not validate the remote
    site's SSL cert, as we also do not validate the site's SSL cert when
    we download the file through WOPI from the site, in the first place.
    So this patch does not really make things worse, but makes it possible
    to use the insert image feature with a self signed cert in test environments.
    
    Change-Id: Ibc14f0f76b814abcb9ec9ca02d92c27ad35d3878
    Reviewed-on: https://gerrit.libreoffice.org/63994
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 9f3aa12a725c..db0c3dc84322 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/ucb/CertificateValidationRequest.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 
+#include <comphelper/lok.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <svl/zforlist.hxx>
@@ -250,6 +251,12 @@ handleCertificateValidationRequest_(
     uno::Reference< task::XInteractionAbort > xAbort;
     getContinuations(rContinuations, &xApprove, &xAbort);
 
+    if ( comphelper::LibreOfficeKit::isActive() && xApprove.is() )
+    {
+        xApprove->select();
+        return;
+    }
+
     sal_Int32 failures = rRequest.CertificateValidity;
     bool trustCert = true;