[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - desktop/source include/LibreOfficeKit

[Tor Lillqvist (via logerrit)]

 desktop/source/lib/init.cxx                 |   10 ++++++----
 include/LibreOfficeKit/LibreOfficeKitInit.h |    4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 9b59231edf524e359ae5bb92517c9f9a98b86030
Author:     Tor Lillqvist <t...@collabora.com>
AuthorDate: Mon Dec 12 17:59:30 2022 +0200
Commit:     Tor Lillqvist <t...@collabora.com>
CommitDate: Fri Feb 24 07:54:12 2023 +0000

    Attempt to add ifdefs for WASM (Emscripten) for LOKit-based code
    
    Change-Id: I5b2556d1be61fa3a1d7996ce8d61958fbe7984c6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144002
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <t...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147557
    Tested-by: Tor Lillqvist <t...@collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 399a42159cc3..72fab196c38a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -7142,7 +7142,7 @@ static void lo_runLoop(LibreOfficeKit* /*pThis*/,
                        LibreOfficeKitWakeCallback pWakeCallback,
                        void* pData)
 {
-#if defined(IOS) || defined(ANDROID)
+#if defined(IOS) || defined(ANDROID) || defined(__EMSCRIPTEN__)
     Application::GetSolarMutex().acquire();
 #endif
 
@@ -7153,7 +7153,7 @@ static void lo_runLoop(LibreOfficeKit* /*pThis*/,
         Application::UpdateMainThread();
         soffice_main();
     }
-#if defined(IOS) || defined(ANDROID)
+#if defined(IOS) || defined(ANDROID) || defined(__EMSCRIPTEN__)
     vcl::lok::unregisterPollCallbacks();
     Application::ReleaseSolarMutex();
 #endif
@@ -7536,6 +7536,8 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
     {
 #ifdef ANDROID
         aAppPath = OUString::fromUtf8(lo_get_app_data_dir()) + "/program";
+#elif defined __EMSCRIPTEN__
+        aAppPath = OUString::fromUtf8("instdir/program");
 #else
         // Fun conversion dance back and forth between URLs and system paths...
         OUString aAppURL;
@@ -7732,8 +7734,8 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
         comphelper::ThreadPool::getSharedOptimalPool().shutdown();
     }
 
-// Turn off quick editing on IOS and ANDROID
-#if defined IOS || defined ANDROID
+// Turn off quick editing on iOS, Android and Emscripten
+#if defined IOS || defined ANDROID || defined __EMSCRIPTEN__
     if (officecfg::Office::Impress::Misc::TextObject::QuickEditing::get())
     {
         std::shared_ptr<comphelper::ConfigurationChanges> 
batch(comphelper::ConfigurationChanges::create());
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index 08feb42c1e18..506f373c5108 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -259,13 +259,13 @@ typedef int             (LokHookPreInit)  ( const char 
*install_path, const char
 
 typedef int             (LokHookPreInit2) ( const char *install_path, const 
char *user_profile_url, LibreOfficeKit** kit);
 
-#if defined(IOS) || defined(ANDROID)
+#if defined(IOS) || defined(ANDROID) || defined(__EMSCRIPTEN__)
 LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* 
user_profile_path);
 #endif
 
 static LibreOfficeKit *lok_init_2( const char *install_path,  const char 
*user_profile_url )
 {
-#if !defined(IOS) && !defined(ANDROID)
+#if !defined(IOS) && !defined(ANDROID) && !defined(__EMSCRIPTEN__)
     void *dlhandle;
     char *imp_lib;
     LokHookFunction *pSym;