diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2020-02-07 15:43:50 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2020-02-10 18:16:34 +0100 |
| commit | cc0759f1e2bea4241d878ee57deaab9e50e24a3d (patch) | |
| tree | 747e143308f9695931407c351b05f886466dcf10 /desktop | |
| parent | 99e143cb771446b592e0d9e52bb16563e114b69a (diff) | |
android hunspell: Hardcode the ReferenceOOoMajorMinor for version check.
From some reason it fails to be read from the versionrc; and I'm not
really eager to debug why...
Without this, only the dictionaries that do not mention the
OpenOffice.org-minimal-version are registered; which would be just 2 of
them.
Change-Id: I9fe0bc138eadbdcbe5e0d8231e7e90ef268163bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88219
Tested-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88366
Tested-by: Jenkins
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/misc/dp_dependencies.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 9d74f1b92910..0105c4ba7d62 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -59,10 +59,15 @@ OUString getLibreOfficeMajorMinorMicro() { } OUString getReferenceOpenOfficeOrgMajorMinor() { +#ifdef ANDROID + // just hardcode the version + OUString v("4.1"); +#else OUString v( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":Version:ReferenceOOoMajorMinor}"); rtl::Bootstrap::expandMacros(v); //TODO: check for failure +#endif return v; } |