diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-02-15 16:04:51 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-10-09 10:38:14 +0200 |
| commit | bc5525eb71cbbdadf7c65fdd935e29c1cb83e384 (patch) | |
| tree | 5664c0114572e705fca92fce44a7084496158356 /desktop | |
| parent | 695a6629aa258556dd1632448753cc2ccd8ae1b3 (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>
Reviewed-on: https://gerrit.libreoffice.org/80271
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'desktop')
| -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 5fafd6c2a25a..aadafe279a43 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> @@ -5423,11 +5427,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", |