[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - comphelper/source

[Jan Holesovsky (via logerrit)]

 comphelper/source/misc/lok.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit dddb3877b2ce8fcc40bb1b255f47a0012e6e66de
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Feb 7 16:59:31 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Feb 10 11:26:02 2020 +0100

    android hunspell: All languages we pack are the supported ones.
    
    Without this, we disable all the languages, because the env. variable is
    not set.
    
    Change-Id: If8f6a9ec6270391d1f8c2bf225c8ea4bb1aae688
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88220
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index fa1344330e77..1834665e91a4 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -181,6 +181,10 @@ bool isWhitelistedLanguage(const OUString& lang)
     if (!isActive())
         return true;
 
+#ifdef ANDROID
+    (void) lang;
+    return true;
+#else
     static bool bInitialized = false;
     static std::vector<OUString> aWhitelist;
     if (!bInitialized)
@@ -221,6 +225,7 @@ bool isWhitelistedLanguage(const OUString& lang)
     }
 
     return false;
+#endif
 }
 
 static void (*pStatusIndicatorCallback)(void *data, statusIndicatorCallbackType type, int percent)(nullptr);