merge packimages into postprocess

Change-Id: Ie00c7cbc012a605e95ceafcad384a67b599fc758
Reviewed-on: https://gerrit.libreoffice.org/1476
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>

5 files changed, 484 insertions, 0 deletions

diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
new file mode 100644
index 000000000000..73dd16e367ff
--- /dev/null
+++ b/postprocess/CustomTarget_images.mk
@@ -0,0 +1,84 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CustomTarget_CustomTarget,postprocess/images))
+
+packimages_DIR := $(call gb_CustomTarget_get_workdir,postprocess/images)
+
+# Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
+# (Tango fallbacks to Industrial for the missing icons)
+packimages_CUSTOM_FALLBACK_1 := -c $(SRCDIR)/icon-themes/tango
+packimages_CUSTOM_FALLBACK_2 := -c $(SRCDIR)/icon-themes/industrial
+
+$(call gb_CustomTarget_get_target,postprocess/images) : \
+	$(packimages_DIR)/images_brand.zip \
+	$(if $(filter default,$(WITH_THEMES)),$(packimages_DIR)/images.zip) \
+	$(foreach theme,$(filter-out default,$(WITH_THEMES)),$(packimages_DIR)/images_$(theme).zip)
+
+$(packimages_DIR)/images.zip : \
+		$(packimages_DIR)/sorted.lst $(packimages_DIR)/commandimagelist.ilst
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
+	$(call gb_Helper_abbreviate_dirs, \
+		$(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \
+			-m $(SRCDIR)/icon-themes/galaxy -c $(packimages_DIR) \
+			-l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -l $(OUTDIR)/res/img -s $< -o $@ \
+			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
+
+$(packimages_DIR)/images_%.zip : \
+		$(packimages_DIR)/sorted.lst $(packimages_DIR)/commandimagelist.ilst
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
+	$(call gb_Helper_abbreviate_dirs, \
+		$(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \
+			-m $(SRCDIR)/icon-themes/galaxy -c $(SRCDIR)/icon-themes/$* \
+			$(packimages_CUSTOM_FALLBACK_1) $(packimages_CUSTOM_FALLBACK_2) \
+			-l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -l $(OUTDIR)/res/img -s $< -o $@ \
+			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
+
+# make sure to have one to keep packing happy
+$(packimages_DIR)/images_brand.zip :| $(packimages_DIR)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),TCH,2)
+	touch $@
+
+# commandimagelist.ilst and sorted.lst are phony to rebuild everything each time
+.PHONY : $(packimages_DIR)/commandimagelist.ilst $(packimages_DIR)/sorted.lst
+
+$(packimages_DIR)/commandimagelist.ilst :| $(packimages_DIR)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
+	$(call gb_Helper_abbreviate_dirs, \
+		find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" -o -name "*.svg" | \
+			sed "s#$(SRCDIR)/icon-themes/galaxy#%MODULE%#" | \
+			$(PERL) $(SOLARENV)/bin/sort.pl > $@.$(INPATH) && \
+		$(PERL) $(SOLARENV)/bin/diffmv.pl $@.$(INPATH) $@ \
+			$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
+
+$(packimages_DIR)/sorted.lst : \
+		$(SRCDIR)/postprocess/packimages/image-sort.lst | $(packimages_DIR)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
+	$(call gb_Helper_abbreviate_dirs, \
+		$(PERL) $(SOLARENV)/bin/image-sort.pl $< $(OUTDIR)/xml $@)
+
+# vim: set noet sw=4 ts=4:
diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk
index 6e1c7c25514a..0716ae780fe5 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -17,8 +17,10 @@ $(eval $(call gb_Module_Module,postprocess))
 
 $(eval $(call gb_Module_add_targets,postprocess,\
 	CustomTarget_config \
+	CustomTarget_images \
 	CustomTarget_registry \
 	Package_config \
+	Package_images \
 	Package_registry \
 	Rdb_services \
 ))
diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk
new file mode 100644
index 000000000000..6d6059036f72
--- /dev/null
+++ b/postprocess/Package_images.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,postprocess_images,$(call gb_CustomTarget_get_workdir,postprocess/images)))
+
+$(eval $(call gb_Package_add_file,postprocess_images,bin/images_brand.zip,images_brand.zip))
+
+$(if $(filter default,$(WITH_THEMES)),\
+$(eval $(call gb_Package_add_file,postprocess_images,bin/images.zip,images.zip)))
+
+$(foreach theme,$(filter-out default,$(WITH_THEMES)),\
+$(eval $(call gb_Package_add_file,postprocess_images,bin/images_$(theme).zip,images_$(theme).zip)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/postprocess/packimages/README b/postprocess/packimages/README
new file mode 100644
index 000000000000..cf7b96ee286d
--- /dev/null
+++ b/postprocess/packimages/README
@@ -0,0 +1,16 @@
+Packs used images in sorted order into theme .zip files
+
+The essence of this module is contained within [[solenv/bin/packimages.pl]].
+This script takes several sources of information:
+
+* the list of images used in every .src file that is compiled
+* the configuration XML describing every command that is used
+* [[packimages/pack/iamge-sort.lst]] which provides a profile based
+  ordering of images.
+
+It then tries to pack the images together into the .zip file into an
+order that matches / is similar to that which we want at run-time, ie.
+an entire toolbar's images should (ideally) be next to each other in a
+nice linear run, to reduce LibreOffice's working set, and improve
+startup performance: we require all these images to get paged in on
+start.
diff --git a/postprocess/packimages/image-sort.lst b/postprocess/packimages/image-sort.lst
new file mode 100644
index 000000000000..6a84af7a366f
--- /dev/null
+++ b/postprocess/packimages/image-sort.lst
@@ -0,0 +1,344 @@
+#
+# This file exists to help improve the ordering of
+# icons inside the OO.o theme / images.zip file.
+#
+# Sections are processed together, and are delimited
+# by '-- <tag> [small]' a 'group' tage denotes equal
+# importance: icons must be interleaved, 'ordered'
+# denotes a simple best-fit order. 'literal' denotes
+# a list of explicit image loads
+#
+
+res/mainapp_16.png
+res/mainapp_32.png
+sw/res/punkt.png
+sw/res/punkt_h.png
+res/sx03251.png
+res/lx03251.png
+
+-- literal
+
+# 'standard' toolbars
+uiconfig/modules/swriter/toolbar/standardbar.xml
+uiconfig/modules/scalc/toolbar/standardbar.xml
+uiconfig/modules/simpress/toolbar/standardbar.xml
+uiconfig/modules/sdraw/toolbar/standardbar.xml
+-- group
+
+# default / startup toolbars
+uiconfig/modules/swriter/toolbar/textobjectbar.xml
+uiconfig/modules/scalc/toolbar/formatobjectbar.xml
+-- group
+
+uiconfig/modules/simpress/toolbar/drawingobjectbar.xml
+uiconfig/modules/sdraw/toolbar/drawingobjectbar.xml
+-- group
+
+uiconfig/modules/simpress/toolbar/toolbar.xml
+uiconfig/modules/sdraw/toolbar/toolbar.xml
+-- group
+
+uiconfig/modules/simpress/toolbar/commontaskbar.xml
+-- ordered
+
+svtools/res/prnfont.png
+svtools/res/bmpfont.png
+svtools/res/scalfont.png
+svx/res/signet_11x16.png
+svx/res/caution_11x16.png
+svx/res/notcertificate_16.png
+res/sc10223.png
+res/sc10224.png
+res/sx03250.png
+res/sx03249.png
+res/sx03246.png
+res/sx03245.png
+res/sx03139.png
+res/sx03248.png
+res/sx03247.png
+res/sx03255.png
+res/sx03242.png
+-- literal
+
+# default / startup menus:
+uiconfig/modules/swriter/menubar/menubar.xml
+uiconfig/modules/scalc/menubar/menubar.xml
+uiconfig/modules/simpress/menubar/menubar.xml
+uiconfig/modules/sdraw/menubar/menubar.xml
+-- group small
+
+#
+# complete list of other toolbars / menus
+# FIXME: should auto-generate this.
+#
+uiconfig/modules/BasicIDE/toolbar/fullscreenbar.xml
+uiconfig/modules/BasicIDE/toolbar/insertcontrolsbar.xml
+uiconfig/modules/BasicIDE/toolbar/formcontrolsbar.xml
+uiconfig/modules/BasicIDE/toolbar/macrobar.xml
+uiconfig/modules/BasicIDE/toolbar/standardbar.xml
+uiconfig/modules/dbapp/toolbar/formobjectbar.xml
+uiconfig/modules/dbapp/toolbar/queryobjectbar.xml
+uiconfig/modules/dbapp/toolbar/reportobjectbar.xml
+uiconfig/modules/dbapp/toolbar/tableobjectbar.xml
+uiconfig/modules/dbapp/toolbar/toolbar.xml
+#uiconfig/modules/dbbrowser/toolbar/browserobjectbar.xml
+#uiconfig/modules/dbbrowser/toolbar/copyobjectbar.xml
+uiconfig/modules/dbbrowser/toolbar/toolbar.xml
+uiconfig/modules/dbquery/toolbar/designobjectbar.xml
+uiconfig/modules/dbquery/toolbar/sqlobjectbar.xml
+uiconfig/modules/dbquery/toolbar/toolbar.xml
+uiconfig/modules/dbrelation/toolbar/toolbar.xml
+uiconfig/modules/dbtable/toolbar/toolbar.xml
+uiconfig/modules/StartModule/toolbar/standardbar.xml
+uiconfig/modules/schart/toolbar/arrowshapes.xml
+uiconfig/modules/schart/toolbar/basicshapes.xml
+uiconfig/modules/schart/toolbar/calloutshapes.xml
+uiconfig/modules/schart/toolbar/flowchartshapes.xml
+uiconfig/modules/schart/toolbar/standardbar.xml
+uiconfig/modules/schart/toolbar/starshapes.xml
+uiconfig/modules/schart/toolbar/symbolshapes.xml
+uiconfig/modules/schart/toolbar/toolbar.xml
+uiconfig/modules/scalc/toolbar/alignmentbar.xml
+uiconfig/modules/scalc/toolbar/arrowshapes.xml
+uiconfig/modules/scalc/toolbar/basicshapes.xml
+uiconfig/modules/scalc/toolbar/calloutshapes.xml
+uiconfig/modules/scalc/toolbar/colorbar.xml
+uiconfig/modules/scalc/toolbar/drawbar.xml
+uiconfig/modules/scalc/toolbar/drawobjectbar.xml
+uiconfig/modules/scalc/toolbar/extrusionobjectbar.xml
+uiconfig/modules/scalc/toolbar/flowchartshapes.xml
+uiconfig/modules/scalc/toolbar/fontworkobjectbar.xml
+uiconfig/modules/scalc/toolbar/fontworkshapetype.xml
+uiconfig/modules/scalc/toolbar/formatobjectbar.xml
+uiconfig/modules/scalc/toolbar/formcontrols.xml
+uiconfig/modules/scalc/toolbar/formdesign.xml
+uiconfig/modules/scalc/toolbar/formsfilterbar.xml
+uiconfig/modules/scalc/toolbar/formsnavigationbar.xml
+uiconfig/modules/scalc/toolbar/formtextobjectbar.xml
+uiconfig/modules/scalc/toolbar/fullscreenbar.xml
+uiconfig/modules/scalc/toolbar/graffilterbar.xml
+uiconfig/modules/scalc/toolbar/graphicobjectbar.xml
+uiconfig/modules/scalc/toolbar/insertbar.xml
+uiconfig/modules/scalc/toolbar/insertcellsbar.xml
+uiconfig/modules/scalc/toolbar/mediaobjectbar.xml
+uiconfig/modules/scalc/toolbar/moreformcontrols.xml
+uiconfig/modules/scalc/toolbar/previewbar.xml
+uiconfig/modules/scalc/toolbar/standardbar.xml
+uiconfig/modules/scalc/toolbar/starshapes.xml
+uiconfig/modules/scalc/toolbar/symbolshapes.xml
+uiconfig/modules/scalc/toolbar/textobjectbar.xml
+uiconfig/modules/scalc/toolbar/toolbar.xml
+uiconfig/modules/scalc/toolbar/viewerbar.xml
+uiconfig/modules/sdraw/toolbar/3dobjectsbar.xml
+uiconfig/modules/sdraw/toolbar/alignmentbar.xml
+uiconfig/modules/sdraw/toolbar/arrowsbar.xml
+uiconfig/modules/sdraw/toolbar/arrowshapes.xml
+uiconfig/modules/sdraw/toolbar/basicshapes.xml
+uiconfig/modules/sdraw/toolbar/bezierobjectbar.xml
+uiconfig/modules/sdraw/toolbar/calloutshapes.xml
+uiconfig/modules/sdraw/toolbar/choosemodebar.xml
+uiconfig/modules/sdraw/toolbar/colorbar.xml
+uiconfig/modules/sdraw/toolbar/connectorsbar.xml
+uiconfig/modules/sdraw/toolbar/drawingobjectbar.xml
+uiconfig/modules/sdraw/toolbar/ellipsesbar.xml
+uiconfig/modules/sdraw/toolbar/extrusionobjectbar.xml
+uiconfig/modules/sdraw/toolbar/flowchartshapes.xml
+uiconfig/modules/sdraw/toolbar/fontworkobjectbar.xml
+uiconfig/modules/sdraw/toolbar/fontworkshapetype.xml
+uiconfig/modules/sdraw/toolbar/formcontrols.xml
+uiconfig/modules/sdraw/toolbar/formdesign.xml
+uiconfig/modules/sdraw/toolbar/formsfilterbar.xml
+uiconfig/modules/sdraw/toolbar/formsnavigationbar.xml
+uiconfig/modules/sdraw/toolbar/formtextobjectbar.xml
+uiconfig/modules/sdraw/toolbar/fullscreenbar.xml
+uiconfig/modules/sdraw/toolbar/gluepointsobjectbar.xml
+uiconfig/modules/sdraw/toolbar/graffilterbar.xml
+uiconfig/modules/sdraw/toolbar/graphicobjectbar.xml
+uiconfig/modules/sdraw/toolbar/insertbar.xml
+uiconfig/modules/sdraw/toolbar/linesbar.xml
+uiconfig/modules/sdraw/toolbar/masterviewtoolbar.xml
+uiconfig/modules/sdraw/toolbar/mediaobjectbar.xml
+uiconfig/modules/sdraw/toolbar/moreformcontrols.xml
+uiconfig/modules/sdraw/toolbar/optionsbar.xml
+uiconfig/modules/sdraw/toolbar/positionbar.xml
+uiconfig/modules/sdraw/toolbar/standardbar.xml
+uiconfig/modules/sdraw/toolbar/starshapes.xml
+uiconfig/modules/sdraw/toolbar/symbolshapes.xml
+uiconfig/modules/sdraw/toolbar/textbar.xml
+uiconfig/modules/sdraw/toolbar/textobjectbar.xml
+uiconfig/modules/sdraw/toolbar/toolbar.xml
+uiconfig/modules/sdraw/toolbar/viewerbar.xml
+uiconfig/modules/sdraw/toolbar/zoombar.xml
+uiconfig/modules/simpress/toolbar/3dobjectsbar.xml
+uiconfig/modules/simpress/toolbar/alignmentbar.xml
+uiconfig/modules/simpress/toolbar/arrowsbar.xml
+uiconfig/modules/simpress/toolbar/arrowshapes.xml
+uiconfig/modules/simpress/toolbar/basicshapes.xml
+uiconfig/modules/simpress/toolbar/bezierobjectbar.xml
+uiconfig/modules/simpress/toolbar/calloutshapes.xml
+uiconfig/modules/simpress/toolbar/choosemodebar.xml
+uiconfig/modules/simpress/toolbar/colorbar.xml
+uiconfig/modules/simpress/toolbar/commontaskbar.xml
+uiconfig/modules/simpress/toolbar/connectorsbar.xml
+uiconfig/modules/simpress/toolbar/drawingobjectbar.xml
+uiconfig/modules/simpress/toolbar/ellipsesbar.xml
+uiconfig/modules/simpress/toolbar/extrusionobjectbar.xml
+uiconfig/modules/simpress/toolbar/flowchartshapes.xml
+uiconfig/modules/simpress/toolbar/fontworkobjectbar.xml
+uiconfig/modules/simpress/toolbar/fontworkshapetype.xml
+uiconfig/modules/simpress/toolbar/formcontrols.xml
+uiconfig/modules/simpress/toolbar/formdesign.xml
+uiconfig/modules/simpress/toolbar/formsfilterbar.xml
+uiconfig/modules/simpress/toolbar/formsnavigationbar.xml
+uiconfig/modules/simpress/toolbar/formtextobjectbar.xml
+uiconfig/modules/simpress/toolbar/fullscreenbar.xml
+uiconfig/modules/simpress/toolbar/gluepointsobjectbar.xml
+uiconfig/modules/simpress/toolbar/graffilterbar.xml
+uiconfig/modules/simpress/toolbar/graphicobjectbar.xml
+uiconfig/modules/simpress/toolbar/insertbar.xml
+uiconfig/modules/simpress/toolbar/linesbar.xml
+uiconfig/modules/simpress/toolbar/masterviewtoolbar.xml
+uiconfig/modules/simpress/toolbar/mediaobjectbar.xml
+uiconfig/modules/simpress/toolbar/moreformcontrols.xml
+uiconfig/modules/simpress/toolbar/optionsbar.xml
+uiconfig/modules/simpress/toolbar/outlinetoolbar.xml
+uiconfig/modules/simpress/toolbar/positionbar.xml
+uiconfig/modules/simpress/toolbar/slideviewobjectbar.xml
+uiconfig/modules/simpress/toolbar/slideviewtoolbar.xml
+uiconfig/modules/simpress/toolbar/standardbar.xml
+uiconfig/modules/simpress/toolbar/starshapes.xml
+uiconfig/modules/simpress/toolbar/symbolshapes.xml
+uiconfig/modules/simpress/toolbar/textbar.xml
+uiconfig/modules/simpress/toolbar/textobjectbar.xml
+uiconfig/modules/simpress/toolbar/toolbar.xml
+uiconfig/modules/simpress/toolbar/viewerbar.xml
+uiconfig/modules/simpress/toolbar/zoombar.xml
+uiconfig/modules/smath/toolbar/fullscreenbar.xml
+uiconfig/modules/smath/toolbar/standardbar.xml
+uiconfig/modules/smath/toolbar/toolbar.xml
+uiconfig/modules/sglobal/toolbar/alignmentbar.xml
+uiconfig/modules/sglobal/toolbar/arrowshapes.xml
+uiconfig/modules/sglobal/toolbar/basicshapes.xml
+uiconfig/modules/sglobal/toolbar/bezierobjectbar.xml
+uiconfig/modules/sglobal/toolbar/calloutshapes.xml
+uiconfig/modules/sglobal/toolbar/colorbar.xml
+uiconfig/modules/sglobal/toolbar/drawbar.xml
+uiconfig/modules/sglobal/toolbar/drawingobjectbar.xml
+uiconfig/modules/sglobal/toolbar/drawtextobjectbar.xml
+uiconfig/modules/sglobal/toolbar/extrusionobjectbar.xml
+uiconfig/modules/sglobal/toolbar/flowchartshapes.xml
+uiconfig/modules/sglobal/toolbar/fontworkobjectbar.xml
+uiconfig/modules/sglobal/toolbar/fontworkshapetype.xml
+uiconfig/modules/sglobal/toolbar/formcontrols.xml
+uiconfig/modules/sglobal/toolbar/formdesign.xml
+uiconfig/modules/sglobal/toolbar/formsfilterbar.xml
+uiconfig/modules/sglobal/toolbar/formsnavigationbar.xml
+uiconfig/modules/sglobal/toolbar/formtextobjectbar.xml
+uiconfig/modules/sglobal/toolbar/frameobjectbar.xml
+uiconfig/modules/sglobal/toolbar/fullscreenbar.xml
+uiconfig/modules/sglobal/toolbar/graffilterbar.xml
+uiconfig/modules/sglobal/toolbar/graphicobjectbar.xml
+uiconfig/modules/sglobal/toolbar/insertbar.xml
+uiconfig/modules/sglobal/toolbar/mediaobjectbar.xml
+uiconfig/modules/sglobal/toolbar/moreformcontrols.xml
+uiconfig/modules/sglobal/toolbar/numobjectbar.xml
+uiconfig/modules/sglobal/toolbar/oleobjectbar.xml
+uiconfig/modules/sglobal/toolbar/optimizetablebar.xml
+uiconfig/modules/sglobal/toolbar/previewobjectbar.xml
+uiconfig/modules/sglobal/toolbar/standardbar.xml
+uiconfig/modules/sglobal/toolbar/starshapes.xml
+uiconfig/modules/sglobal/toolbar/symbolshapes.xml
+uiconfig/modules/sglobal/toolbar/tableobjectbar.xml
+uiconfig/modules/sglobal/toolbar/textobjectbar.xml
+uiconfig/modules/sglobal/toolbar/toolbar.xml
+uiconfig/modules/sglobal/toolbar/viewerbar.xml
+uiconfig/modules/sweb/toolbar/arrowshapes.xml
+uiconfig/modules/sweb/toolbar/basicshapes.xml
+uiconfig/modules/sweb/toolbar/bezierobjectbar.xml
+uiconfig/modules/sweb/toolbar/calloutshapes.xml
+uiconfig/modules/sweb/toolbar/colorbar.xml
+uiconfig/modules/sweb/toolbar/drawingobjectbar.xml
+uiconfig/modules/sweb/toolbar/drawtextobjectbar.xml
+uiconfig/modules/sweb/toolbar/extrusionobjectbar.xml
+uiconfig/modules/sweb/toolbar/flowchartshapes.xml
+uiconfig/modules/sweb/toolbar/fontworkobjectbar.xml
+uiconfig/modules/sweb/toolbar/fontworkshapetype.xml
+uiconfig/modules/sweb/toolbar/formcontrols.xml
+uiconfig/modules/sweb/toolbar/formdesign.xml
+uiconfig/modules/sweb/toolbar/formsfilterbar.xml
+uiconfig/modules/sweb/toolbar/formsnavigationbar.xml
+uiconfig/modules/sweb/toolbar/formtextobjectbar.xml
+uiconfig/modules/sweb/toolbar/frameobjectbar.xml
+uiconfig/modules/sweb/toolbar/fullscreenbar.xml
+uiconfig/modules/sweb/toolbar/graffilterbar.xml
+uiconfig/modules/sweb/toolbar/graphicobjectbar.xml
+uiconfig/modules/sweb/toolbar/insertbar.xml
+uiconfig/modules/sweb/toolbar/mediaobjectbar.xml
+uiconfig/modules/sweb/toolbar/numobjectbar.xml
+uiconfig/modules/sweb/toolbar/oleobjectbar.xml
+uiconfig/modules/sweb/toolbar/optimizetablebar.xml
+uiconfig/modules/sweb/toolbar/previewobjectbar.xml
+uiconfig/modules/sweb/toolbar/standardbar.xml
+uiconfig/modules/sweb/toolbar/starshapes.xml
+uiconfig/modules/sweb/toolbar/symbolshapes.xml
+uiconfig/modules/sweb/toolbar/tableobjectbar.xml
+uiconfig/modules/sweb/toolbar/textobjectbar.xml
+uiconfig/modules/sweb/toolbar/toolbar.xml
+uiconfig/modules/sweb/toolbar/viewerbar.xml
+uiconfig/modules/swriter/toolbar/alignmentbar.xml
+uiconfig/modules/swriter/toolbar/arrowshapes.xml
+uiconfig/modules/swriter/toolbar/basicshapes.xml
+uiconfig/modules/swriter/toolbar/bezierobjectbar.xml
+uiconfig/modules/swriter/toolbar/calloutshapes.xml
+uiconfig/modules/swriter/toolbar/colorbar.xml
+uiconfig/modules/swriter/toolbar/drawbar.xml
+uiconfig/modules/swriter/toolbar/drawingobjectbar.xml
+uiconfig/modules/swriter/toolbar/drawtextobjectbar.xml
+uiconfig/modules/swriter/toolbar/extrusionobjectbar.xml
+uiconfig/modules/swriter/toolbar/flowchartshapes.xml
+uiconfig/modules/swriter/toolbar/fontworkobjectbar.xml
+uiconfig/modules/swriter/toolbar/fontworkshapetype.xml
+uiconfig/modules/swriter/toolbar/formcontrols.xml
+uiconfig/modules/swriter/toolbar/formdesign.xml
+uiconfig/modules/swriter/toolbar/formsfilterbar.xml
+uiconfig/modules/swriter/toolbar/formsnavigationbar.xml
+uiconfig/modules/swriter/toolbar/formtextobjectbar.xml
+uiconfig/modules/swriter/toolbar/frameobjectbar.xml
+uiconfig/modules/swriter/toolbar/fullscreenbar.xml
+uiconfig/modules/swriter/toolbar/graffilterbar.xml
+uiconfig/modules/swriter/toolbar/graphicobjectbar.xml
+uiconfig/modules/swriter/toolbar/insertbar.xml
+uiconfig/modules/swriter/toolbar/mediaobjectbar.xml
+uiconfig/modules/swriter/toolbar/moreformcontrols.xml
+uiconfig/modules/swriter/toolbar/navigationobjectbar.xml
+uiconfig/modules/swriter/toolbar/numobjectbar.xml
+uiconfig/modules/swriter/toolbar/oleobjectbar.xml
+uiconfig/modules/swriter/toolbar/optimizetablebar.xml
+uiconfig/modules/swriter/toolbar/previewobjectbar.xml
+uiconfig/modules/swriter/toolbar/standardbar.xml
+uiconfig/modules/swriter/toolbar/starshapes.xml
+uiconfig/modules/swriter/toolbar/symbolshapes.xml
+uiconfig/modules/swriter/toolbar/tableobjectbar.xml
+uiconfig/modules/swriter/toolbar/textobjectbar.xml
+uiconfig/modules/swriter/toolbar/toolbar.xml
+uiconfig/modules/swriter/toolbar/viewerbar.xml
+
+-- ordered
+
+uiconfig/modules/BasicIDE/menubar/menubar.xml
+uiconfig/modules/dbapp/menubar/menubar.xml
+#uiconfig/modules/dbbrowser/menubar/menubar.xml
+uiconfig/modules/dbquery/menubar/menubar.xml
+uiconfig/modules/dbrelation/menubar/menubar.xml
+uiconfig/modules/dbtable/menubar/menubar.xml
+uiconfig/modules/StartModule/menubar/menubar.xml
+uiconfig/modules/schart/menubar/menubar.xml
+uiconfig/modules/scalc/menubar/menubar.xml
+uiconfig/modules/sdraw/menubar/menubar.xml
+uiconfig/modules/simpress/menubar/menubar.xml
+uiconfig/modules/smath/menubar/menubar.xml
+uiconfig/modules/sglobal/menubar/menubar.xml
+uiconfig/modules/sweb/menubar/menubar.xml
+uiconfig/modules/swriter/menubar/menubar.xml
+
+-- ordered small