distro-configs/CPAndroidBranding.conf | 1 +
distro-configs/LibreOfficeAndroid.conf | 1 +
distro-configs/LibreOfficeAndroidAarch64.conf | 1 +
distro-configs/LibreOfficeAndroidX86.conf | 1 +
distro-configs/LibreOfficeAndroidX86_64.conf | 1 +
vcl/source/window/layout.cxx | 9 +++++++++
6 files changed, 14 insertions(+)
New commits:
commit 1844e4a34e52450932c342d1c3ffe159faf20315
Author: merttumer <mert.tu...@collabora.com>
AuthorDate: Tue May 11 06:36:31 2021 +0000
Commit: Mert Tumer <mert.tu...@collabora.com>
CommitDate: Mon May 31 05:53:15 2021 +0200
Enable PdfIum for android build
Change-Id: I58d09db362f0de991eab3920683530e1ec43e2bc
Signed-off-by: merttumer <mert.tu...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115373
Tested-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116307
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/distro-configs/CPAndroidBranding.conf
b/distro-configs/CPAndroidBranding.conf
index 21b5bb5635e0..f34f642fdf5d 100644
--- a/distro-configs/CPAndroidBranding.conf
+++ b/distro-configs/CPAndroidBranding.conf
@@ -9,5 +9,6 @@
--disable-scripting-javascript
--with-lang=de en-US es fr pt-BR zh-CN zh-TW
--with-myspell-dicts
+--enable-pdfimport
--enable-release-build
--disable-community-flavor
diff --git a/distro-configs/LibreOfficeAndroid.conf
b/distro-configs/LibreOfficeAndroid.conf
index 3ff76a8d60a9..82bc4afe0029 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -8,3 +8,4 @@
--without-junit
--disable-largefile
--with-theme=colibre
+--disable-poppler
diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf
b/distro-configs/LibreOfficeAndroidAarch64.conf
index bfc948c021f7..27ad9d1c788c 100644
--- a/distro-configs/LibreOfficeAndroidAarch64.conf
+++ b/distro-configs/LibreOfficeAndroidAarch64.conf
@@ -7,3 +7,4 @@
--without-helppack-integration
--without-junit
--with-theme=colibre
+--disable-poppler
diff --git a/distro-configs/LibreOfficeAndroidX86.conf
b/distro-configs/LibreOfficeAndroidX86.conf
index 8fc92786c5e7..2692d796195b 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -8,3 +8,4 @@
--without-junit
--disable-largefile
--with-theme=colibre
+--disable-poppler
diff --git a/distro-configs/LibreOfficeAndroidX86_64.conf
b/distro-configs/LibreOfficeAndroidX86_64.conf
index efbbdbb1e945..afc917d9a3f7 100644
--- a/distro-configs/LibreOfficeAndroidX86_64.conf
+++ b/distro-configs/LibreOfficeAndroidX86_64.conf
@@ -8,3 +8,4 @@
--without-junit
--disable-largefile
--with-theme=colibre
+--disable-poppler
commit 4fd30dfcbfc8ce8cfe3cfb72a8f59621f83ea1b6
Author: merttumer <mert.tu...@collabora.com>
AuthorDate: Fri May 7 10:19:05 2021 +0000
Commit: Mert Tumer <mert.tu...@collabora.com>
CommitDate: Mon May 31 05:53:01 2021 +0200
android: Fix DrawingArea inside CsvTableBox is shrinked
Change-Id: Ia722297051eb3413b9db17024173c9eb596d8e7a
Signed-off-by: merttumer <mert.tu...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115235
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116306
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 9b0ee7452577..0018971e0f5c 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <config_features.h>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <comphelper/base64.hxx>
#include <o3tl/enumarray.hxx>
@@ -271,6 +272,14 @@ void VclBox::setAllocation(const Size &rAllocation)
{
Size aRequisition = calculateRequisition();
nExtraSpace = (getPrimaryDimension(rAllocation) -
getPrimaryDimension(aRequisition)) / nExpandChildren;
+// In mobile, the screen size is small and extraSpace can become negative
+// Though the dialogs are rendered in javascript for LOK Android some widgets
like weld::DrawingArea
+// is sent as bitmap but it is rendered from only the visible part
+// when it gets negative, it shrinks instead of expands and it becomes
invisible
+#if HAVE_FEATURE_ANDROID_LOK
+ if (nExtraSpace < 0)
+ nExtraSpace = 0;
+#endif
}
//Split into those we pack from the start onwards, and those we pack from
the end backwards
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
