From c7664f12a99b6e08eb334d63646c3d2a6aa75e18 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 27 Feb 2024 16:30:24 +0100 Subject: Init Embind-ings manually, once UNO is set up Upcoming code that changes the Embind'ing of UNO sequences will require availability of the UNO type manager during that Embind init code, so only call that after UNO has been bootstrapped (rather than as part of the initialization of global static data, which is what EMSCRIPTEN_BINDINGS does). Change-Id: Iba19851ffb82c055dcab10a28a8c1fafa9d2a414 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164065 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- desktop/source/app/appinit.cxx | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'desktop/source/app/appinit.cxx') diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 51b466c6b980..1a0681f0d163 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -45,6 +45,10 @@ #include #include +#if defined EMSCRIPTEN +#include +#endif + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; @@ -83,6 +87,9 @@ void Desktop::InitApplicationServiceManager() UNO_QUERY_THROW); #endif comphelper::setProcessServiceFactory(sm); +#if defined EMSCRIPTEN + init_unoembind_uno(); +#endif } void Desktop::RegisterServices() -- cgit