diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-02-15 16:04:51 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-03-11 17:46:27 +0100 |
| commit | e745b06352cfe358ba927c9b4ef938452907a14f (patch) | |
| tree | 29aa8795384a0b82f07a939005a8d0e2e3a17c3a | |
| parent | bd050920ffdeb694d0b4a8feaf72625626e851d7 (diff) | |
android: Set the program path sensibly when we've got nullptr.
Change-Id: I4415459ca5d758d06d866faeca85e1cf154d0567
Reviewed-on: https://gerrit.libreoffice.org/67877
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
| -rw-r--r-- | desktop/source/lib/init.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 65da82f294ad..0ec7bdf3bad7 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -24,6 +24,10 @@ #include <postmac.h> #endif +#ifdef ANDROID +#include <osl/detail/android-bootstrap.h> +#endif + #include <algorithm> #include <memory> #include <iostream> @@ -4457,11 +4461,16 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char } else { +#ifdef ANDROID + aAppPath = OUString::fromUtf8(lo_get_app_data_dir()) + "/program"; +#else // Fun conversion dance back and forth between URLs and system paths... OUString aAppURL; ::osl::Module::getUrlFromAddress( reinterpret_cast< oslGenericFunction >(lo_initialize), aAppURL); osl::FileBase::getSystemPathFromFileURL( aAppURL, aAppPath ); +#endif + #ifdef IOS // The above gives something like // "/private/var/containers/Bundle/Application/953AA851-CC15-4C60-A2CB-C2C6F24E6F71/Foo.app/Foo", |