[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - 3 commits - android/Bootstrap android/mobile-config.py framework/source

[Tor Lillqvist]

 android/Bootstrap/Makefile.shared                |    4 +++-
 android/mobile-config.py                         |    1 -
 framework/source/layoutmanager/layoutmanager.cxx |    6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 2efc7da79eaddc53d91d87ed93a593e20d3a8623
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Oct 27 14:33:51 2014 +0200

    The configuration pruning with mobile-config.py seems to work now
    
    Change-Id: I1b1891f0d7d7b8aa407e7da346ff5f8e3cbe8657

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 3924dfe..984f368 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -138,7 +138,9 @@ copy-stuff:
 	rm -Rf assets/share # pre-clean it
 	mkdir -p assets/share/config
 	cp -R $(INSTDIR)/share/registry assets/share
-#	$(SRC_ROOT)/android/mobile-config.py assets/share/registry/main.xcd assets/share/registry/main.xcd.new && mv assets/share/registry/main.xcd.new assets/share/registry/main.xcd
+	for F in main.xcd res/registry_en-US.xcd; do \
+		$(SRC_ROOT)/android/mobile-config.py assets/share/registry/$$F assets/share/registry/$$F.new && mv assets/share/registry/$$F.new assets/share/registry/$$F; \
+	done
 	if ! test z$(DISABLE_UI) = zTRUE; then \
 		echo "Copying UI files into the apk"; \
 		cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config; \
commit bd08374a04aad60518390c0702397831f6572ce8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Oct 27 14:10:18 2014 +0200

    Don't prune org.openoffice.Office/UI
    
    It apparently contains color schemes and stuff that the code wants access to
    here and there.
    
    Change-Id: Ie3f0de5e3846df99a02a2693156679cc6c010d10

diff --git a/android/mobile-config.py b/android/mobile-config.py
index cdf0afc..59ade79 100755
--- a/android/mobile-config.py
+++ b/android/mobile-config.py
@@ -24,7 +24,6 @@ main_xcd_discard = [
     # no conventional UI; reverse sorted by size
     'org.openoffice.Office.UI/GenericCommands',
     'org.openoffice.Office/Accelerators',
-    'org.openoffice.Office/UI',
     'org.openoffice.Office.UI/DrawImpressCommands',
     'org.openoffice.Office.UI/Sidebar',
     'org.openoffice.Office.UI/ChartCommands',
commit 447fed3aebbc88a14506e02c8b7e6d29bd89ccbd
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Oct 27 14:09:56 2014 +0200

    Avoid automatic toolbars in the non-desktop case
    
    Change-Id: I9e5bff735b0035c147e10ae066da3a4873d66749

diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index eb58919..bd4eaf9 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <services/layoutmanager.hxx>
 #include "helpers.hxx"
 
@@ -113,7 +115,11 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) :
         , m_bVisible( true )
         , m_bParentWindowVisible( false )
         , m_bMustDoLayout( true )
+#if HAVE_FEATURE_DESKTOP
         , m_bAutomaticToolbars( true )
+#else
+        , m_bAutomaticToolbars( false )
+#endif
         , m_bStoreWindowState( false )
         , m_bHideCurrentUI( false )
         , m_bGlobalSettings( false )