[Libreoffice-commits] core.git: 3 commits - configure.ac distro-configs/LibreOfficeAndroidAarch64.conf distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf sal/android solenv/bin
Jan Holesovsky (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jun 21 11:01:45 UTC 2019
configure.ac | 1 -
distro-configs/LibreOfficeAndroid.conf | 1 +
distro-configs/LibreOfficeAndroidAarch64.conf | 1 +
distro-configs/LibreOfficeAndroidX86.conf | 1 +
sal/android/libreofficekit-jni.c | 10 ++++++----
solenv/bin/native-code.py | 6 ++++++
6 files changed, 15 insertions(+), 5 deletions(-)
New commits:
commit 9712f5d2316fa469b92f2f8092925e2cd4e8dd5b
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Jun 19 20:29:02 2019 +0200
Commit: Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Jun 21 13:00:21 2019 +0200
android: Fix type of a C string to be const char[].
With the wrong type, we were measuring the sizeof() wrongly, leading to
a hard to catch crash at start that appeared only from time to time.
Improve the concatenation too when at that.
Change-Id: I4a4ab2909124281aac99118d66c62d669294d5f7
Reviewed-on: https://gerrit.libreoffice.org/74375
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
Tested-by: Michael Meeks <michael.meeks at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/74444
Tested-by: Jenkins
diff --git a/sal/android/libreofficekit-jni.c b/sal/android/libreofficekit-jni.c
index 0f66fdc44fe0..1307ab6a5fbb 100644
--- a/sal/android/libreofficekit-jni.c
+++ b/sal/android/libreofficekit-jni.c
@@ -75,7 +75,8 @@ jboolean libreofficekit_initialize(JNIEnv* env,
const char *cacheDirPath;
const char *apkFilePath;
- const char *fontsConf = "/etc/fonts/fonts.conf";
+ size_t data_dir_len;
+ const char fontsConf[] = "/etc/fonts/fonts.conf";
char *fontsConfPath;
setenv("OOO_DISABLE_RECOVERY", "1", 1);
@@ -93,9 +94,10 @@ jboolean libreofficekit_initialize(JNIEnv* env,
// TMPDIR is used by osl_getTempDirURL()
setenv("TMPDIR", cache_dir, 1);
- fontsConfPath = malloc(strlen(data_dir) + sizeof(fontsConf));
- strcpy(fontsConfPath, data_dir);
- strcat(fontsConfPath, fontsConf);
+ data_dir_len = strlen(data_dir);
+ fontsConfPath = malloc(data_dir_len + sizeof(fontsConf));
+ strncpy(fontsConfPath, data_dir, data_dir_len);
+ strncpy(fontsConfPath + data_dir_len, fontsConf, sizeof(fontsConf));
fd = open(fontsConfPath, O_RDONLY);
if (fd != -1) {
commit 21201ea7521aa94da9b9c8771ac779d4e393c56e
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Jun 18 09:54:00 2019 +0200
Commit: Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Jun 21 12:59:52 2019 +0200
android: Add the sidebar-related constructors to liblo-native-code.so.
Change-Id: I25acb8965d190fc443d75357352e4d02c9b03cc2
Reviewed-on: https://gerrit.libreoffice.org/74265
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/74443
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index b2de206b0833..9ebf741a88b9 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -225,11 +225,16 @@ core_constructor_list = [
"com_sun_star_graphic_GraphicObject_get_implementation",
"com_sun_star_comp_graphic_GraphicProvider_get_implementation",
# svx/util/svx.component
+ "com_sun_star_comp_svx_NumberingToolBoxControl_get_implementation",
"com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation",
"com_sun_star_drawing_SvxShapeCollection_get_implementation",
+ "com_sun_star_svx_FontHeightToolBoxController_get_implementation",
+ "org_apache_openoffice_comp_svx_sidebar_PanelFactory_get_implementation",
# svx/util/svxcore.component
"com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation",
"com_sun_star_comp_Draw_GraphicExporter_get_implementation",
+ "com_sun_star_comp_svx_ColorToolBoxControl_get_implementation",
+ "com_sun_star_comp_svx_FontNameToolBoxControl_get_implementation",
"com_sun_star_comp_Svx_GraphicExportHelper_get_implementation",
"com_sun_star_comp_Svx_GraphicImportHelper_get_implementation",
# toolkit/util/tk.component
@@ -305,6 +310,7 @@ edit_factory_list = [
edit_constructor_list = [
# framework/util/fwk.component
"com_sun_star_comp_framework_GlobalAcceleratorConfiguration_get_implementation",
+ "com_sun_star_comp_framework_UICommandDescription_get_implementation",
# i18npool/util/i18npool.component
"com_sun_star_i18n_InputSequenceChecker_get_implementation",
"com_sun_star_i18n_OrdinalSuffix_get_implementation",
commit 1a99219283d4d57c05639023ca692f6cdae36473
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Jun 17 21:35:48 2019 +0200
Commit: Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Jun 21 12:59:31 2019 +0200
android: Define the icon theme in distro-configs and switch to colibre.
No need to reinvent the wheel and hardcode it in configure.ac.
Change-Id: Idb08ea0e5ce228bb0758dbdf023f3aee44da76eb
Reviewed-on: https://gerrit.libreoffice.org/74247
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/74442
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/configure.ac b/configure.ac
index dbced920a118..87202bc17ea7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -767,7 +767,6 @@ linux-android*)
enable_odk=no
enable_postgresql_sdbc=no
enable_python=no
- with_theme="tango"
test_cups=no
test_dbus=no
test_fontconfig=no
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 0c72075041c3..3ff76a8d60a9 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -7,3 +7,4 @@
--without-helppack-integration
--without-junit
--disable-largefile
+--with-theme=colibre
diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf b/distro-configs/LibreOfficeAndroidAarch64.conf
index 0cf3388b6852..bfc948c021f7 100644
--- a/distro-configs/LibreOfficeAndroidAarch64.conf
+++ b/distro-configs/LibreOfficeAndroidAarch64.conf
@@ -6,3 +6,4 @@
--without-export-validation
--without-helppack-integration
--without-junit
+--with-theme=colibre
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index 722df76820c2..8fc92786c5e7 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -7,3 +7,4 @@
--without-helppack-integration
--without-junit
--disable-largefile
+--with-theme=colibre
More information about the Libreoffice-commits
mailing list