[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.4' - 2 commits - configure.ac uui/source

[Libreoffice Gerrit user]

 configure.ac              |    2 +-
 uui/source/iahndl-ssl.cxx |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 476212d9b2b91ceedf48b998e4eaa91e1bda0ff6
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Nov 29 14:47:24 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Dec 4 22:41:01 2018 +0100

    Bump version to 5.3-61
    
    Change-Id: I0753c83b554dca20de6650d7947b3112d177df90
    (cherry picked from commit cd2475c52a096b001a7e3179f02e11cbc8a5615f)

diff --git a/configure.ac b/configure.ac
index bd93fe182eb5..c9227f742d5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([Collabora Office],[5.3.10.60],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.61],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
commit c625c49bac701c9b58ed4728a460b7094d632501
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Nov 25 17:41:20 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Dec 4 22:40:54 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: I672ba9016b1555c6d9d8faba8d0a4b2a17adf453
    Reviewed-on: https://gerrit.libreoffice.org/63993
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit ea471b508cb90fbaa770f291a40864324d8d74ef)

diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 20688f7a3c9f..d27e273952b9 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 <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <svl/zforlist.hxx>
@@ -256,6 +257,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;