desktop/source/lib/init.cxx | 1 +
include/systools/curlinit.hxx | 13 ++++++++++++-
sfx2/source/control/unoctitm.cxx | 1 +
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 31d2e0e7b431285b11455a321845371411c09795
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jun 4 16:35:57 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Aug 23 21:52:02 2024 +0200
map LO_CERTIFICATE_AUTHORITY_PATH to CURLOPT_CAPATH
curl has both CURLOPT_CAINFO for the single-file collection
of certificates case and CURLOPT_CAPATH for the multi-file
exploder view of certificates, this adds support to
use CURLOPT_CAPATH as well as CURLOPT_CAINFO
Change-Id: I28163bbe81fa389eea70ef1289ed04a50a029c5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168825
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172327
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/include/systools/curlinit.hxx b/include/systools/curlinit.hxx
index 5167a06d995f..7d842a8e4c01 100644
--- a/include/systools/curlinit.hxx
+++ b/include/systools/curlinit.hxx
@@ -30,7 +30,6 @@
static void InitCurl_easy(CURL* const pCURL)
{
CURLcode rc;
- (void)rc;
#if defined(LO_CURL_NEEDS_CA_BUNDLE)
char const* const path = GetCABundleFile();
@@ -52,6 +51,18 @@ static void InitCurl_easy(CURL* const pCURL)
}
#endif
+ // curl: "If you have a CA cert for the server stored someplace else than
+ // in the default bundle, then the CURLOPT_CAPATH option might come handy
+ // for you"
+ if (char const* const capath = getenv("LO_CERTIFICATE_AUTHORITY_PATH"))
+ {
+ rc = curl_easy_setopt(pCURL, CURLOPT_CAPATH, capath);
+ if (rc != CURLE_OK)
+ {
+ throw css::uno::RuntimeException("CURLOPT_CAPATH failed");
+ }
+ }
+
if (!officecfg::Office::Security::Net::AllowInsecureProtocols::get())
{
rc = curl_easy_setopt(pCURL, CURLOPT_SSLVERSION,
CURL_SSLVERSION_TLSv1_2);
commit ff3a316f8865ea0ba118b258ca9391abcfa3d5ae
Author: Hubert Figuière <h...@collabora.com>
AuthorDate: Mon Aug 19 17:10:38 2024 -0400
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Aug 23 21:51:48 2024 +0200
LOKit: Enable the Execute Interaction command for Impress
Signed-off-by: Hubert Figuière <h...@collabora.com>
Change-Id: I5b3b3cc8e1e8c0ad3ec933ea9047da3367583767
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172088
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
(cherry picked from commit ad124b2de2bcbb6a093b551633fc7e50f4cecfaf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172190
Tested-by: Jenkins
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 563ee52ef695..2d9f489b6c74 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3993,6 +3993,7 @@ static void doc_iniUnoCommands ()
u".uno:DistributeVertDistance"_ustr,
u".uno:DistributeVertTop"_ustr,
u".uno:AnimationEffects"_ustr,
+ u".uno:ExecuteAnimationEffect"_ustr,
};
util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index c8457853f418..431c68cbd953 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1307,6 +1307,7 @@ constexpr auto handlers =
frozen::make_unordered_map<std::u16string_view, Payloa
{ u"DistributeVertDistance", EnabledPayload },
{ u"DistributeVertTop", EnabledPayload },
{ u"AnimationEffects", EnabledPayload },
+ { u"ExecuteAnimationEffect", EnabledPayload },
{ u"ParaLeftToRight", ParaDirectionPayload },
{ u"ParaRightToLeft", ParaDirectionPayload },
