diff options
author | Jan Holesovsky <kendy@collabora.com> | 2020-02-06 22:48:29 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2020-05-18 18:06:43 +0200 |
commit | c5d5b6f0c0ebef699acd98e784062bc8e96ef1b4 (patch) | |
tree | d224571c76052874aaf5bf8520327cc251f00ded | |
parent | android: Actually let's avoid the exceptions via bridges only on aarch4. (diff) | |
download | core-c5d5b6f0c0ebef699acd98e784062bc8e96ef1b4.tar.gz core-c5d5b6f0c0ebef699acd98e784062bc8e96ef1b4.zip |
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@collabora.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88364
Tested-by: Jenkins
-rw-r--r-- | desktop/source/lib/init.cxx | 8 | ||||
-rw-r--r-- | extensions/Module_extensions.mk | 7 | ||||
-rw-r--r-- | postprocess/Rdb_services.mk | 8 | ||||
-rwxr-xr-x | solenv/bin/native-code.py | 6 |
4 files changed, 28 insertions, 1 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index bd5cdc9a937b..2734dd52c035 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -6045,6 +6045,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 9612620e3a72..43a32560e64c 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -16,7 +16,6 @@ $(eval $(call gb_Module_add_l10n_targets,extensions,\ ifneq ($(filter-out iOS ANDROID,$(OS)),) $(eval $(call gb_Module_add_targets,extensions,\ Library_abp \ - Library_log \ Library_scn \ $(if $(filter WNT,$(OS)), \ Library_WinUserInfoBe \ @@ -27,6 +26,12 @@ $(eval $(call gb_Module_add_targets,extensions,\ )) endif +ifneq ($(filter-out iOS,$(OS)),) +$(eval $(call gb_Module_add_targets,extensions,\ + Library_log \ +)) +endif + ifeq ($(ENABLE_LDAP),TRUE) $(eval $(call gb_Module_add_targets,extensions,\ Library_ldapbe2 \ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index f9914bf5090b..e28de2ef751a 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -321,6 +321,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 5220d6492663..abf3509cd911 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -40,6 +40,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"), @@ -137,6 +138,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"), |