diff options
| author | Tor Lillqvist <tml@collabora.com> | 2022-12-28 13:47:26 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2022-12-28 13:08:56 +0000 |
| commit | de3b4b02008d708a66f8d6a8a365974eac7de3b3 (patch) | |
| tree | 6155bc059c83706117233e445ce6cc1f78b4c129 /desktop/source/lib | |
| parent | a510543a466aca0d152f82af24d16563f28455f0 (diff) | |
Introduce lo_get_app_data_dir() for Emscripten, too
And not just Android. Hardcoded to return "/instdir" to match what is
in the emscripten_fs_image.
Change-Id: I26d4ec5e02ec9900e35ca47f1565a13ad2b723b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144849
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'desktop/source/lib')
| -rw-r--r-- | desktop/source/lib/init.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index cdf6049d193d..f805f4a73322 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -29,6 +29,10 @@ #include <osl/detail/android-bootstrap.h> #endif +#ifdef EMSCRIPTEN +#include <osl/detail/emscripten-bootstrap.h> +#endif + #include <algorithm> #include <memory> #include <iostream> @@ -7106,10 +7110,8 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char } else { -#ifdef ANDROID +#if defined ANDROID || defined EMSCRIPTEN 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; |