android/source/Makefile | 10 ++++------
comphelper/source/misc/lok.cxx | 5 +++++
configure.ac | 3 ++-
cppuhelper/source/exc_thrower.cxx | 10 ++++++----
desktop/source/deployment/misc/dp_dependencies.cxx | 5 +++++
desktop/source/lib/init.cxx | 8 ++++++++
extensions/Module_extensions.mk | 7 ++++++-
postprocess/Rdb_services.mk | 8 ++++++++
solenv/bin/native-code.py | 6 ++++++
9 files changed, 50 insertions(+), 12 deletions(-)
New commits:
commit acd76621758a9dc1aa16d455101ce0a347b412bf
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Tue Feb 11 23:55:52 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon May 18 18:06:44 2020 +0200
If asked to do so, enable icecream even in the 'build' part of configure.
Otherwise it is used only in the 'host' part of the cross-compile build.
Change-Id: Ifb8d88e18c131e3019a4f3168afc1b743f3cc8e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88486
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 231384588a20..543d0ce3635d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4779,6 +4779,7 @@ if test "$cross_compiling" = "yes"; then
--disable-gtk3 \
--disable-pdfimport \
--disable-postgresql-sdbc \
+ --enable-icecream="$enable_icecream" \
--with-parallelism="$with_parallelism" \
--without-doxygen \
--without-java \
commit ac014fc6e88c276b54aac6e5af3ced536a7fa98b
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Fri Feb 7 16:59:31 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon May 18 18:06:44 2020 +0200
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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88367
Tested-by: Jenkins
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 16996d885bf7..c4ff1c641240 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -188,6 +188,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)
@@ -228,6 +232,7 @@ bool isWhitelistedLanguage(const OUString& lang)
}
return false;
+#endif
}
static void (*pStatusIndicatorCallback)(void *data,
statusIndicatorCallbackType type, int percent)(nullptr);
commit d5240b00f150cf0fbc1f451f97993c11fe735f8a
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Fri Feb 7 15:43:50 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon May 18 18:06:44 2020 +0200
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 <ke...@collabora.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88366
Tested-by: Jenkins
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx
b/desktop/source/deployment/misc/dp_dependencies.cxx
index 49b64780ec04..c5507d9ba659 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -61,10 +61,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;
}
commit 230a8af4a2eb1bb42107213da47989949f65e3d4
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Fri Feb 7 14:18:40 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon May 18 18:06:43 2020 +0200
android hunspell: Don't explicitly disable extensions on Android.
We need the bundled extensions for hunspell.
Change-Id: I423d71376652b7d54dfdcc81462a19db9dc785bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88218
Tested-by: Jan Holesovsky <ke...@collabora.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88365
diff --git a/configure.ac b/configure.ac
index 6c93da694c5a..231384588a20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2568,7 +2568,7 @@ fi
if test -z "$enable_extensions"; then
# For iOS and Android disable extensions unless specifically overridden
with --enable-extensions.
- if test $_os != iOS -a $_os != Android; then
+ if test $_os != iOS; then
enable_extensions=yes
fi
fi
commit c5d5b6f0c0ebef699acd98e784062bc8e96ef1b4
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Thu Feb 6 22:48:29 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon May 18 18:06:43 2020 +0200
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 <ke...@collabora.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88364
Tested-by: Jenkins
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"),
commit fa553b3538ac0c0098ba70d73e9aeff3e7932c88
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Mon Dec 2 11:32:45 2019 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon May 18 18:06:43 2020 +0200
android: Actually let's avoid the exceptions via bridges only on aarch4.
Change-Id: Id2830f09ca6afd11f6f866565f37bdb7ba45bfb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84205
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/cppuhelper/source/exc_thrower.cxx
b/cppuhelper/source/exc_thrower.cxx
index a0e7fb32b046..b09d9b7b75e3 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -173,7 +173,7 @@ ExceptionThrower::ExceptionThrower()
class theExceptionThrower : public rtl::Static<ExceptionThrower,
theExceptionThrower> {};
-#if defined(IOS) || HAVE_FEATURE_ANDROID_LOK
+#if defined(IOS) || (defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK)
// In the native iOS / Android app, where we don't have any Java, Python,
// BASIC, or other scripting, the only thing that would use the C++/UNO bridge
// functionality that invokes codeSnippet() was cppu::throwException().
@@ -211,7 +211,7 @@ void lo_mobile_throwException(css::uno::Any const&
aException)
assert(false);
}
-#endif // defined(IOS) || HAVE_FEATURE_ANDROID_LOK
+#endif // defined(IOS) || (defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK)
} // anonymous namespace
@@ -229,7 +229,7 @@ void SAL_CALL throwException( Any const & exc )
"(must be derived from com::sun::star::uno::Exception)!" );
}
-#if defined(IOS) || HAVE_FEATURE_ANDROID_LOK
+#if defined(IOS) || (defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK)
lo_mobile_throwException(exc);
#else
Mapping uno2cpp(Environment(UNO_LB_UNO), Environment::getCurrent());
@@ -252,7 +252,9 @@ void SAL_CALL throwException( Any const & exc )
Any SAL_CALL getCaughtException()
{
-#if HAVE_FEATURE_ANDROID_LOK
+#if defined(__aarch64__) && HAVE_FEATURE_ANDROID_LOK
+ // FIXME This stuff works on 32bit ARM, let's use the shortcut only for
+ // the 64bit ARM.
return Any();
#else
Mapping cpp2uno(Environment::getCurrent(), Environment(UNO_LB_UNO));
commit 64451a725523002d2a3cf9f182a8e3bd56e92208
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Thu Jan 2 14:58:18 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon May 18 18:06:43 2020 +0200
android: Avoid building the apk when configured with --enable-android-lok.
Change-Id: I6e82d1c1c00d67f5ff370a7625e33efbb172ca38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86110
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
(cherry picked from commit f4c83939edb9adb9d81a8a442f5449e619df03dd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86131
Tested-by: Jenkins
diff --git a/android/source/Makefile b/android/source/Makefile
index 3fbfcddb0dd3..b64802ec9e78 100644
--- a/android/source/Makefile
+++ b/android/source/Makefile
@@ -16,10 +16,8 @@ native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
$< -j -g core -g writer -g calc -g draw -g edit > $@
install:
- ./gradlew $(if $(verbose),--info) $(if
$(versionCode),-PcmdVersionCode=$(versionCode)) install$(if
$(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_ANDROID_EDITING),Editing)Debug
- @echo
- @echo 'Run it with "make run"'
- @echo
+ if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then ./gradlew $(if
$(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode))
install$(if $(DISABLE_UI),StrippedUI,FullUI)$(if
$(ENABLE_ANDROID_EDITING),Editing)Debug ; fi
+ @if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then echo ; echo 'Run it
with "make run"' ; echo ; fi
uninstall:
$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(ANDROID_PACKAGE_NAME)
@@ -30,10 +28,10 @@ clean:
rm -f liboSettings.gradle
build-gradle: liboSettings.gradle local.properties link-so
- ./gradlew $(if $(verbose),--info) $(if
$(versionCode),-PcmdVersionCode=$(versionCode)) assemble$(if
$(DISABLE_UI),StrippedUI,FullUI)$(if $(ENABLE_ANDROID_EDITING),Editing)$(if
$(ENABLE_RELEASE_BUILD),Release,Debug)
+ if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then ./gradlew $(if
$(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode))
assemble$(if $(DISABLE_UI),StrippedUI,FullUI)$(if
$(ENABLE_ANDROID_EDITING),Editing)$(if $(ENABLE_RELEASE_BUILD),Release,Debug) ;
fi
run:
- $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(ANDROID_PACKAGE_NAME)/.ui.LibreOfficeUIActivity
+ if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then
$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(ANDROID_PACKAGE_NAME)/.ui.LibreOfficeUIActivity ; fi
debugrun:
@echo "please debug with lldb from within Android Studio, or setup
ndk-gdb manually (see android/README for details)"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
