comphelper/source/misc/sequenceashashmap.cxx | 8 ++++++++ desktop/source/lib/init.cxx | 4 ++++ 2 files changed, 12 insertions(+)
New commits: commit 3a9caad863554b1a3465e9eb898f55f516c378d1 Author: Skyler Grey <[email protected]> AuthorDate: Wed Oct 9 16:29:30 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Nov 4 09:39:27 2024 +0100 feat(json): Allow serializing any Previously, as far as I can tell, there was no way to send a Size in a .uno command (as would be needed in, say, '.uno:InsertAVMedia'). We do, however, already have a way to send an `[]any`, and we can use a similar method to allow sending arbitrary types with `any` rather than `[]any`. To use this, the type you really want to send has to be wrapped in any, so for example... { type: "any", value: { type: "com.sun.star.awt.Size", value: { Width: { type: "long", value: 0, }, Height: { type: "long", value: 0, } } } } Change-Id: Ic33594dee955d475d81733adb21950c0458435e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174740 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Mike Kaganski <[email protected]> (cherry picked from commit cccbf8608f3b76651993bc8576c672367c228fa2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175982 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx index 9f8655f3d164..651f1ee4aad9 100644 --- a/comphelper/source/misc/sequenceashashmap.cxx +++ b/comphelper/source/misc/sequenceashashmap.cxx @@ -347,6 +347,14 @@ static std::vector<css::beans::PropertyValue> JsonToPropertyValues(const boost:: aValue.Value <<= aSeqByte; } } + else if (rType == "any") + { + aNodeValue = rPair.second.get_child("value", aNodeNull); + if (aNodeValue != aNodeNull && !aNodeValue.empty()) + { + aValue.Value = jsonToUnoAny(aNodeValue); + } + } else if (rType == "[]any") { aNodeValue = rPair.second.get_child("value", aNodeNull); commit eeb72ef257742e9d67927e976779468a78f1d402 Author: Skyler Grey <[email protected]> AuthorDate: Tue Oct 1 09:17:49 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Nov 4 09:39:18 2024 +0100 feat(lok): Add extra impress export formats Previously we had the ability to export to various formats, but these weren't exposed in a way that LOK could request them. We want to increase the options available for export, so we need to make these available. Change-Id: I1c05aeec8de32929481059bcfd02cac05a46788d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174602 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit 541272d3eaa322ccdd1b926add031a39faeccf49) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175981 Tested-by: Jenkins diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 1e667eeb76b0..7f804585813e 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -365,6 +365,10 @@ constexpr ExtensionMap aImpressExtensionMap[] = { "svg", u"impress_svg_Export"_ustr }, { "xhtml", u"XHTML Impress File"_ustr }, { "png", u"impress_png_Export"_ustr }, + { "bmp", u"impress_bmp_Export"_ustr }, + { "gif", u"impress_gif_Export"_ustr }, + { "tif", u"impress_tif_Export"_ustr }, + { "tiff", u"impress_tif_Export"_ustr }, // tif and tiff are the same format: see https://developer.mozilla.org/en-US/docs/Web/Media/Formats/Image_types#tiff_tagged_image_file_format }; constexpr ExtensionMap aDrawExtensionMap[] =
