[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - desktop/source extensions/Module_extensions.mk postprocess/Rdb_services.mk solenv/bin

[Jan Holesovsky (via logerrit)]

 desktop/source/lib/init.cxx     |    8 ++++++++
 extensions/Module_extensions.mk |    7 ++++++-
 postprocess/Rdb_services.mk     |    8 ++++++++
 solenv/bin/native-code.py       |    6 ++++++
 4 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit f2d67ee76778c27d56eb1d663f8c5cc09906da44
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu Feb 6 22:48:29 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Feb 10 11:18:26 2020 +0100

    android hunspell: Turn on the hunspell build on Android...
    
    ...and try to register it for use - it's a bundled extension.
    
    The attempt to use the Android's native spell checking failed because
    the combination of gboard + google's spell checker makes every word in
    the app appear as if spelled correctly.
    
    I haven't found any easy way around that, so let's use hunspell instead;
    but for that, we need to make the bundled extensions work on Android.
    
    Change-Id: If6563e497f1d3085c26eda571567242b2c1f6181
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88217
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 35964dae4447..8916065bc273 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5910,6 +5910,14 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
             SfxApplication::GetOrCreate();
 #endif
 
+#ifdef ANDROID
+            // Register the bundled extensions - so that the dictionaries work
+            desktop::Desktop::SynchronizeExtensionRepositories(false);
+            bool bFailed = desktop::Desktop::CheckExtensionDependencies();
+            if (bFailed)
+                SAL_INFO("lok", "CheckExtensionDependencies failed");
+#endif
+
             if (eStage == PRE_INIT)
             {
                 {
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index e30a5c1593f1..be00bbc69800 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -17,7 +17,6 @@ ifneq ($(filter-out iOS ANDROID,$(OS)),)
 $(eval $(call gb_Module_add_targets,extensions,\
 	Library_abp \
 	Library_ldapbe2 \
-	Library_log \
 	Library_scn \
 	$(if $(filter WNT,$(OS)), \
 		Library_WinUserInfoBe \
@@ -28,6 +27,12 @@ $(eval $(call gb_Module_add_targets,extensions,\
 ))
 endif
 
+ifneq ($(filter-out iOS,$(OS)),)
+$(eval $(call gb_Module_add_targets,extensions,\
+	Library_log \
+))
+endif
+
 $(eval $(call gb_Module_add_targets,extensions,\
 	Library_bib \
 ))
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index bcfd9fd8a18d..2b6073da42cb 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -330,6 +330,14 @@ $(eval $(call gb_Rdb_add_components,services,\
 	) \
 ))
 
+else # DESKTOP
+
+$(eval $(call gb_Rdb_add_components,services,\
+	$(if $(filter ANDROID,$(OS)),\
+		extensions/source/logging/log \
+	) \
+))
+
 endif # DESKTOP
 
 ifeq ($(ENABLE_PDFIMPORT),TRUE)
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 9a688a3b470d..9ac86f9c0f25 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -41,6 +41,7 @@ core_factory_list = [
     ("libsrtrs1.a", "srtrs1_component_getFactory"),
     ("libstoragefdlo.a", "storagefd_component_getFactory"),
     ("libucb1.a", "ucb_component_getFactory"),
+    ("libucpexpand1lo.a", "ucpexpand1_component_getFactory", "#ifdef ANDROID"),
     ("libucpfile1.a", "ucpfile_component_getFactory"),
     ("libucphier1.a", "ucphier1_component_getFactory"),
     ("libucptdoc1lo.a", "ucptdoc1_component_getFactory"),
@@ -138,6 +139,11 @@ core_constructor_list = [
     "com_sun_star_comp_util_OfficeInstallationDirectories",
 # dbaccess/util/dba.component
     "com_sun_star_comp_dba_ORowSet_get_implementation",
+# extensions/source/logging/log.component
+    ("com_sun_star_comp_extensions_FileHandler", "#ifdef ANDROID"),
+    ("com_sun_star_comp_extensions_LoggerPool", "#ifdef ANDROID"),
+    ("com_sun_star_comp_extensions_PlainTextFormatter", "#ifdef ANDROID"),
+    ("com_sun_star_comp_extensions_SimpleTextFormatter", "#ifdef ANDROID"),
 # forms/util/frm.component
     ("com_sun_star_comp_forms_FormOperations_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
     ("com_sun_star_comp_forms_ODatabaseForm_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),