[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - uui/source
uui/source/iahndl-ssl.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit ea471b508cb90fbaa770f291a40864324d8d74ef
Author: Andras Timar
AuthorDate: Sun Nov 25 17:41:20 2018 +0100
Commit: Andras Timar
CommitDate: Wed Nov 28 13:55:18 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
Tested-by: Andras Timar
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
#include
+#include
#include
#include
#include
@@ -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;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - uui/source
uui/source/iahndl-locking.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e93a48a3e290022213a90c58e057907b8ee2907f Author: Aron Budea Date: Mon Mar 12 22:55:11 2018 +0100 tdf#115742: use correct parameter Change-Id: I3e9d30b64533007040761f152d15875f2fbcb4ce Reviewed-on: https://gerrit.libreoffice.org/51177 Reviewed-by: Aron Budea Tested-by: Aron Budea diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx index 9b22b288c8e6..3f82480cdb35 100644 --- a/uui/source/iahndl-locking.cxx +++ b/uui/source/iahndl-locking.cxx @@ -116,7 +116,7 @@ handleLockedDocumentRequest_( aMessage = UUIInteractionHelper::replaceMessageWithArguments( aMessage, aArguments ); -ScopedVclPtrInstance< TryLaterQueryBox > xDialog( pParent, xManager.get(), aMessage, false ); +ScopedVclPtrInstance< TryLaterQueryBox > xDialog( pParent, xManager.get(), aMessage, xRetry.is() ); nResult = xDialog->Execute(); } else if ( nMode == UUI_DOC_OWN_LOAD_LOCK || ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - uui/source
uui/source/iahndl-locking.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit db585162fdc8dcd804a99338d0c2c3c5e9d8088d Author: Mike Kaganski Date: Mon Mar 12 19:22:28 2018 +0100 Build fix after e169df73408a48427a2b4b2a1927da09fc740169 Change-Id: I5aa972e6c9b5f9c24f69350171b9ac570a866003 Reviewed-on: https://gerrit.libreoffice.org/51162 Reviewed-by: Aron Budea Tested-by: Aron Budea diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx index f4a14ef9bc3f..9b22b288c8e6 100644 --- a/uui/source/iahndl-locking.cxx +++ b/uui/source/iahndl-locking.cxx @@ -116,7 +116,7 @@ handleLockedDocumentRequest_( aMessage = UUIInteractionHelper::replaceMessageWithArguments( aMessage, aArguments ); -ScopedVclPtrInstance< TryLaterQueryBox > xDialog( pParent, xManager.get(), aMessage ); +ScopedVclPtrInstance< TryLaterQueryBox > xDialog( pParent, xManager.get(), aMessage, false ); nResult = xDialog->Execute(); } else if ( nMode == UUI_DOC_OWN_LOAD_LOCK || ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
