diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2020-01-31 21:35:30 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2020-02-01 09:29:11 +0100 |
| commit | 312a7d8173c2fe35c3c635f4046df8433abb68ad (patch) | |
| tree | 8f60c2b30262758663aa0ee5d01e4fc6b7d0efb8 /i18nlangtag | |
| parent | 24073d986988c51425b3eb3c8d6aef171e914eaf (diff) | |
android: Set the correct path for the liblangtag data.
Change-Id: I8b8bf76f086812c5f995c6ef513f0b7f773475ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87785
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'i18nlangtag')
| -rw-r--r-- | i18nlangtag/source/languagetag/languagetag.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index ef34402d02de..1dd6981bd0fc 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -30,6 +30,10 @@ #endif #include <liblangtag/langtag.h> +#ifdef ANDROID +#include <osl/detail/android-bootstrap.h> +#endif + using namespace com::sun::star; @@ -197,6 +201,9 @@ void LiblangtagDataRef::teardown() void LiblangtagDataRef::setupDataPath() { +#if defined(ANDROID) + maDataPath = OString(lo_get_app_data_dir()) + "/share/liblangtag"; +#else // maDataPath is assumed to be empty here. OUString aURL("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/liblangtag"); rtl::Bootstrap::expandMacros(aURL); //TODO: detect failure @@ -212,6 +219,7 @@ void LiblangtagDataRef::setupDataPath() if (osl::FileBase::getSystemPathFromFileURL( aURL, aPath) == osl::FileBase::E_None) maDataPath = OUStringToOString( aPath, RTL_TEXTENCODING_UTF8); } +#endif if (maDataPath.isEmpty()) maDataPath = "|"; // assume system else |