configure.ac | 4 ++--
desktop/source/lib/init.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 7f049babd79ad14242dd346945c31a90607082ed
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Mar 5 15:27:13 2020 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Mar 5 17:29:11 2020 +0100
android hunspell: Disable for Android Viewer
Since hunspell/extension support does not work for the
Fennec-based Android Viewer, only enable the feature for
the LibreOffice-Online-based Android app, not Android
Viewer.
This amends commits 4f9531c81d4190090ede4d657acdd4b7628462d0
("android hunspell: Turn on the hunspell build on Android...",
2020-02-06) and 99e143cb771446b592e0d9e52bb16563e114b69a
("android hunspell: Don't explicitly disable extensions on
Android.", 2020-02-07) to prevent Android Viewer from
crashing whenever trying to open a document.
Change-Id: Ib35fb35baf542a66b77ce2eed902e68adfec7349
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90021
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/configure.ac b/configure.ac
index d896b12c8a6b..01c85265ccf3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2567,8 +2567,8 @@ if test "$enable_database_connectivity" = yes; then
fi
if test -z "$enable_extensions"; then
- # For iOS and Android disable extensions unless specifically overridden
with --enable-extensions.
- if test $_os != iOS; then
+ # For iOS and Android Viewer, disable extensions unless specifically
overridden with --enable-extensions.
+ if test $_os != iOS && test $_os != Android -o "$ENABLE_ANDROID_LOK" =
TRUE ; then
enable_extensions=yes
fi
fi
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 31ca77f7d7bb..3e9332bca713 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5928,7 +5928,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
SfxApplication::GetOrCreate();
#endif
-#ifdef ANDROID
+#if HAVE_FEATURE_ANDROID_LOK
// Register the bundled extensions - so that the dictionaries work
desktop::Desktop::SynchronizeExtensionRepositories(false);
bool bFailed = desktop::Desktop::CheckExtensionDependencies();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
