[Libreoffice-commits] online.git: 3 commits - configure.ac loleaflet/src Mobile/Android Mobile/Mobile

[Libreoffice Gerrit user]

 Mobile/Android/README                      |   17 +++++++++++++++++
 Mobile/Mobile/Info.plist.in                |    2 +-
 configure.ac                               |    6 +++---
 loleaflet/src/control/Control.LokDialog.js |    2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

New commits:
commit d967a3330825ee7fc4358b876725f6f305094f57
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Nov 22 14:10:50 2018 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Nov 22 14:11:59 2018 +0000

    Don't squash dialogs into just the area of the map.

diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index 1f03ad3f7..9f76f53b5 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -272,7 +272,7 @@ L.Control.LokDialog = L.Control.extend({
 			dialogClass += ' lokdialog_notitle';
 
 		var that = this;
-		var size = this._map.getSize();
+		var size = $(window).width();
 		$(dialogContainer).dialog({
 			minWidth: Math.min(width, size.x),
 			width: Math.min(width, size.x),
commit 4618b6c9c30fb5cc877381d1df00308c4b11f5f6
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Nov 16 18:26:54 2018 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Nov 22 14:11:59 2018 +0000

    mobile: use more generic names to share with Android.
    
    Change-Id: I747c6d384071d3a43d43c3c3f801efdfac0a1825

diff --git a/Mobile/Mobile/Info.plist.in b/Mobile/Mobile/Info.plist.in
index 71fdfddeb..497aa633a 100644
--- a/Mobile/Mobile/Info.plist.in
+++ b/Mobile/Mobile/Info.plist.in
@@ -14,7 +14,7 @@
     <key>CFBundleDevelopmentRegion</key>
     <string>$(DEVELOPMENT_LANGUAGE)</string>
     <key>CFBundleDisplayName</key>
-    <string>@IOSAPP_NAME@</string>
+    <string>@MOBILE_APP_NAME@</string>
     <key>CFBundleDocumentTypes</key>
     <array>
        <!-- Document sub-types are listed in order ODF, OOXML, MSO, other -->
diff --git a/configure.ac b/configure.ac
index 39e4cf3b3..b2480942c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,12 +217,12 @@ if test -z "$anonym_msg";  then
 fi
 
 ENABLE_IOSAPP=
-IOSAPP_NAME="Mobile"
+MOBILE_APP_NAME="Mobile"
 
 if test "$enable_iosapp" = "yes"; then
    ENABLE_IOSAPP=true
    if test -n "$with_iosapp_name"; then
-      IOSAPP_NAME="$with_iosapp_name"
+      MOBILE_APP_NAME="$with_iosapp_name"
    fi
 
    # When configuring for building the app itself, on macOS, we need
@@ -271,7 +271,7 @@ if test "$enable_iosapp" = "yes"; then
 fi
 AC_SUBST(ENABLE_IOSAPP)
 AM_CONDITIONAL([ENABLE_IOSAPP], [test "$ENABLE_IOSAPP" = "true"])
-AC_SUBST(IOSAPP_NAME)
+AC_SUBST(MOBILE_APP_NAME)
 
 ENABLE_GTKAPP=
 if test "$enable_gtkapp" = "yes"; then
commit 4440a9950403d07425ecd493f3eb7c3bc363f314
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Nov 16 11:00:24 2018 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Nov 22 14:11:59 2018 +0000

    Android build readme.
    
    Change-Id: Ic82a3d7eb6148a5117d393f5fcb8d5413ef9f41b

diff --git a/Mobile/Android/README b/Mobile/Android/README
new file mode 100644
index 000000000..e42bb9d8c
--- /dev/null
+++ b/Mobile/Android/README
@@ -0,0 +1,17 @@
+** First configure & build LibreOffice core for Android.
+
+** cross-compile poco:
+
+git clone https://github.com/pocoproject/poco.git
+cd poco
+git checkout 1.8.0
+
+NDK=/opt/libreoffice/android-ndk-r15c
+$NDK/build/tools/make-standalone-toolchain.sh --arch=arm --install-dir=`pwd`/toolchain
+PATH="`pwd`/toolchain/bin:$PATH"
+./configure --config=Android --no-samples --no-tests
+make -s -j4 ANDROID_ABI=armeabi-v7a
+
+lib/Android/armeabi-v7a/*.a # are the static objects we need ...
+
+**