[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - 2 commits - android/mobile-config.py

[Tor Lillqvist]

 android/mobile-config.py |   33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

New commits:
commit c7b363466023169c1aab5733c86b86713db80375
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Oct 22 11:54:22 2014 +0300

    Bin duplicates
    
    Change-Id: Ie6347ed6b9c1b8bee7a08950d5c67d4a2039fba5

diff --git a/android/mobile-config.py b/android/mobile-config.py
index d28c7c0..4cc6fa6 100755
--- a/android/mobile-config.py
+++ b/android/mobile-config.py
@@ -25,13 +25,11 @@ main_xcd_discard = [
     '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',
     'org.openoffice.Office.UI/DbuCommands',
     'org.openoffice.Office.UI/Controller',
-    'org.openoffice.Office/UI',
     'org.openoffice.Office.UI/StartModuleCommands',
     'org.openoffice.Office.UI/BasicIDEWindowState',
     'org.openoffice.Office.UI/GenericCategories',
@@ -39,38 +37,18 @@ main_xcd_discard = [
     'org.openoffice.Office.UI/Factories',
     'org.openoffice.Office.UI/BaseWindowState',
     'org.openoffice.Office.UI/BasicIDECommands',
-    'org.openoffice.Office.UI/Sidebar',
     'org.openoffice.Office.UI/BibliographyCommands',
     'org.openoffice.Office.UI/DbQueryWindowState',
     'org.openoffice.Office.UI/WindowState',
-    'org.openoffice.Office.UI/Controller',
     'org.openoffice.Office.UI/DbRelationWindowState',
     'org.openoffice.Office.UI/DbTableWindowState',
     'org.openoffice.Office.UI/DbTableDataWindowState',
     'org.openoffice.Office.UI/DbBrowserWindowState',
     'org.openoffice.Office.UI/WindowContentFactories',
-    'org.openoffice.Office.UI/Factories',
     'org.openoffice.Office.UI/StartModuleWindowState',
     'org.openoffice.Office.UI/GlobalSettings',
     'org.openoffice.Office.UI/Commands',
-    'org.openoffice.Office.UI/BibliographyCommands',
-    'org.openoffice.Office.UI/StartModuleCommands',
-    'org.openoffice.Office.UI/DrawImpressCommands',
-    'org.openoffice.Office.UI/BasicIDECommands',
-    'org.openoffice.Office.UI/GenericCommands',
-    'org.openoffice.Office.UI/ChartCommands',
-    'org.openoffice.Office.UI/DbuCommands',
     'org.openoffice.Office.UI/BibliographyWindowState',
-    'org.openoffice.Office.UI/StartModuleWindowState',
-    'org.openoffice.Office.UI/DbTableDataWindowState',
-    'org.openoffice.Office.UI/DbRelationWindowState',
-    'org.openoffice.Office.UI/DbBrowserWindowState',
-    'org.openoffice.Office.UI/BasicIDEWindowState',
-    'org.openoffice.Office.UI/DbTableWindowState',
-    'org.openoffice.Office.UI/DbQueryWindowState',
-    'org.openoffice.Office.UI/ChartWindowState',
-    'org.openoffice.Office.UI/BaseWindowState',
-    'org.openoffice.Office.UI/GenericCategories',
     'org.openoffice.Office.UI/Category',
     ]
 
@@ -92,4 +70,11 @@ if __name__ == '__main__':
             saved = saved + size
 
     print "saved %d of %d bytes: %2.f%%" % (saved, total, saved*100.0/total)
+
+    # The namespace prefixes xs and oor are present in attribute *values*, and namespace
+    # declarations for them are needed, even if no actual elements or attributes with these
+    # namespace prefixes are present. Fun.
+    root.set('xmlns:xs', 'http://www.w3.org/2001/XMLSchema')
+    root.set('xmlns:oor', 'http://openoffice.org/2001/registry')
+
     tree.write(sys.argv[2], 'UTF-8', True)
commit ef6f481ca7bb65d5a6ba9ac540e7407fc414ecc8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Oct 21 18:22:11 2014 +0300

    Cosmetics
    
    Change-Id: I4d819f59ecb2462aee5998628ad034657bf3b0f9

diff --git a/android/mobile-config.py b/android/mobile-config.py
index 6f29297..d28c7c0 100755
--- a/android/mobile-config.py
+++ b/android/mobile-config.py
@@ -14,7 +14,6 @@
 import sys
 import xml.etree.ElementTree as ET
 
-
 main_xcd_discard = [
     'org.openoffice.Office/TableWizard', # huge
 
@@ -75,12 +74,10 @@ main_xcd_discard = [
     'org.openoffice.Office.UI/Category',
     ]
 
-
 if __name__ == '__main__':
     tree = ET.parse(sys.argv[1])
     root = tree.getroot()
 
-    print "Foo\n"
     saved = 0
     total = 0
     for child in root:
@@ -96,4 +93,3 @@ if __name__ == '__main__':
 
     print "saved %d of %d bytes: %2.f%%" % (saved, total, saved*100.0/total)
     tree.write(sys.argv[2], 'UTF-8', True)
-