ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Some minimal Embind support for UNO type

Browse Source 
...which should be rare enough in practical use that it should be sufficient to
only have toString-functionality for instances mapped from C++ to JS, but no
constructor for new instances on the JS side.  (The natural choice for the
latter would be a mapping of the C++

>     inline Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName );

constructor, but which requires a mapping for the css::uno::TypeClass UNOIDL
enum, which is only provided "later" through CustomTarget_static/unoembind, so
would at least conceptually be a bit dirty.)

This Embind mapping treats css::uno::Type as a smart pointer for the underlying
typelib_TypeDescriptionReference, to benefit from the fallback garbage
collection (in more recent Emscripten versions, at least) for smart pointers,
obviating the need to call .delete() on each instance mapped to JS.

Change-Id: Ic113967c264c28641dfd1fe159012c85519f4a9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164140
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
Stephan Bergmann
2024-02-29 16:19:19 +01:00
parent 6588c30ed4
commit 41feb036b4
4 changed files with 87 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/source/unoembindhelpers/PrimaryBindings.cxx
+43
View File
@@ -12,17 +12,41 @@
#include <emscripten.h>
#include <emscripten/bind.h>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Type.hxx>
#include <comphelper/processfactory.hxx>
#include <rtl/string.hxx>
#include <rtl/textcvt.h>
#include <rtl/textenc.h>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <sfx2/viewsh.hxx>
#include <static/unoembindhelpers/PrimaryBindings.hxx>
#include <typelib/typedescription.h>
#include <cstdint>
#include <string>
#include <typeinfo>
using namespace emscripten;
using namespace css::uno;
template <> struct emscripten::smart_ptr_trait<css::uno::Type>
{
using PointerType = css::uno::Type;
using element_type = typelib_TypeDescriptionReference;
static typelib_TypeDescriptionReference* get(css::uno::Type const& ptr)
{
return ptr.getTypeLibType();
}
static sharing_policy get_sharing_policy() { return sharing_policy::INTRUSIVE; }
static css::uno::Type* share(typelib_TypeDescriptionReference* v)
{
return new css::uno::Type(v);
}
static css::uno::Type* construct_null() { return new css::uno::Type(); }
};
EM_JS(void, jsRegisterChar, (std::type_info const* raw),
// clang-format off
{
@@ -110,6 +134,18 @@ EM_JS(void, jsRegisterString, (std::type_info const* raw),
namespace
{
OString toUtf8(OUString const& string)
{
OString s;
if (!string.convertToString(&s, RTL_TEXTENCODING_UTF8,
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
| RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))
{
throw css::uno::RuntimeException("cannot convert OUString to UTF-8");
}
return s;
}
template <typename T> void registerInOutParam(char const* name)
{
class_<unoembindhelpers::UnoInOutParam<T>>(name).constructor().constructor<T>().property(
@@ -135,6 +171,13 @@ EMSCRIPTEN_BINDINGS(PrimaryBindings)
enum_<unoembindhelpers::uno_Sequence>("uno_Sequence")
.value("FromSize", unoembindhelpers::uno_Sequence::FromSize);
emscripten::class_<typelib_TypeDescriptionReference>("uno_Type")
.smart_ptr<css::uno::Type>("uno_Type$")
.function("toString", +[](css::uno::Type const& self) {
auto const name = toUtf8(self.getTypeName());
return std::string(name.getStr(), name.getLength());
});
// Any
class_<Any>("Any").constructor(+[](const val& rObject, const TypeClass& rUnoType) -> Any {
switch (rUnoType)