install UI config. files using filelists

Change-Id: I422c8912bc2557c2c03bb885e5c193deb93d1d5e
Reviewed-on: https://gerrit.libreoffice.org/3233
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

5 files changed, 283 insertions, 334 deletions

diff --git a/postprocess/CustomTarget_config.mk b/postprocess/CustomTarget_config.mk
deleted file mode 100644
index 80a415849e1a..000000000000
--- a/postprocess/CustomTarget_config.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,postprocess/config))
-
-$(eval $(call gb_CustomTarget_register_targets,postprocess/config,\
-	uiconfig.zip \
-))
-
-.PHONY: $(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip
-
-# We need this dependency for delivering in package postprocess_config:
-$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig_%.zip : \
-		$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip
-	@true
-
-$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip : \
-		$(SRCDIR)/postprocess/packconfig/packconfig.pl \
-		$(call gb_Postprocess_get_target,AllPackages) \
-		$(call gb_Postprocess_get_target,AllUIs)
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
-	cd $(SRCDIR)/postprocess/packconfig \
-	&& $(PERL) packconfig.pl -i $(OUTDIR)/xml/uiconfig -o $(dir $@)
-
-# vim: set noet sw=4 ts=4:
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 1555b1ac08b3..31591b2d4589 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -87,9 +87,9 @@ $(packimages_DIR)/commandimagelist.ilst :
 
 $(packimages_DIR)/sorted.lst : \
 		$(SRCDIR)/postprocess/packimages/image-sort.lst \
-		$(call gb_Postprocess_get_target,AllPackages)
+		$(call gb_Postprocess_get_target,AllUIConfigs)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
 	$(call gb_Helper_abbreviate_dirs, \
-		$(PERL) $(SOLARENV)/bin/image-sort.pl $< $(OUTDIR)/xml $@)
+		$(PERL) $(SOLARENV)/bin/image-sort.pl $< $(INSTDIR)/$(gb_UIConfig_INSTDIR) $@)
 
 # vim: set noet sw=4 ts=4:
diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk
index 808d7f3a18bb..9ed1a758e587 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -13,10 +13,8 @@ $(eval $(call gb_Module_Module,postprocess))
 # is reused in Package_registry!
 
 $(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_config.mk b/postprocess/Package_config.mk
deleted file mode 100644
index 03350d4b233c..000000000000
--- a/postprocess/Package_config.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,postprocess_config,$(call gb_CustomTarget_get_workdir,postprocess/config)))
-
-$(eval $(call gb_Package_add_file,postprocess_config,bin/uiconfig.zip,uiconfig.zip))
-
-$(eval $(call gb_Package_add_files,postprocess_config,bin,\
-	$(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),uiconfig_$(lang).zip) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/postprocess/packimages/image-sort.lst b/postprocess/packimages/image-sort.lst
index 6a84af7a366f..223668c4c05d 100644
--- a/postprocess/packimages/image-sort.lst
+++ b/postprocess/packimages/image-sort.lst
@@ -19,26 +19,26 @@ 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
+modules/swriter/toolbar/standardbar.xml
+modules/scalc/toolbar/standardbar.xml
+modules/simpress/toolbar/standardbar.xml
+modules/sdraw/toolbar/standardbar.xml
 -- group
 
 # default / startup toolbars
-uiconfig/modules/swriter/toolbar/textobjectbar.xml
-uiconfig/modules/scalc/toolbar/formatobjectbar.xml
+modules/swriter/toolbar/textobjectbar.xml
+modules/scalc/toolbar/formatobjectbar.xml
 -- group
 
-uiconfig/modules/simpress/toolbar/drawingobjectbar.xml
-uiconfig/modules/sdraw/toolbar/drawingobjectbar.xml
+modules/simpress/toolbar/drawingobjectbar.xml
+modules/sdraw/toolbar/drawingobjectbar.xml
 -- group
 
-uiconfig/modules/simpress/toolbar/toolbar.xml
-uiconfig/modules/sdraw/toolbar/toolbar.xml
+modules/simpress/toolbar/toolbar.xml
+modules/sdraw/toolbar/toolbar.xml
 -- group
 
-uiconfig/modules/simpress/toolbar/commontaskbar.xml
+modules/simpress/toolbar/commontaskbar.xml
 -- ordered
 
 svtools/res/prnfont.png
@@ -61,284 +61,284 @@ 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
+modules/swriter/menubar/menubar.xml
+modules/scalc/menubar/menubar.xml
+modules/simpress/menubar/menubar.xml
+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
+modules/BasicIDE/toolbar/fullscreenbar.xml
+modules/BasicIDE/toolbar/insertcontrolsbar.xml
+modules/BasicIDE/toolbar/formcontrolsbar.xml
+modules/BasicIDE/toolbar/macrobar.xml
+modules/BasicIDE/toolbar/standardbar.xml
+modules/dbapp/toolbar/formobjectbar.xml
+modules/dbapp/toolbar/queryobjectbar.xml
+modules/dbapp/toolbar/reportobjectbar.xml
+modules/dbapp/toolbar/tableobjectbar.xml
+modules/dbapp/toolbar/toolbar.xml
+#modules/dbbrowser/toolbar/browserobjectbar.xml
+#modules/dbbrowser/toolbar/copyobjectbar.xml
+modules/dbbrowser/toolbar/toolbar.xml
+modules/dbquery/toolbar/designobjectbar.xml
+modules/dbquery/toolbar/sqlobjectbar.xml
+modules/dbquery/toolbar/toolbar.xml
+modules/dbrelation/toolbar/toolbar.xml
+modules/dbtable/toolbar/toolbar.xml
+modules/StartModule/toolbar/standardbar.xml
+modules/schart/toolbar/arrowshapes.xml
+modules/schart/toolbar/basicshapes.xml
+modules/schart/toolbar/calloutshapes.xml
+modules/schart/toolbar/flowchartshapes.xml
+modules/schart/toolbar/standardbar.xml
+modules/schart/toolbar/starshapes.xml
+modules/schart/toolbar/symbolshapes.xml
+modules/schart/toolbar/toolbar.xml
+modules/scalc/toolbar/alignmentbar.xml
+modules/scalc/toolbar/arrowshapes.xml
+modules/scalc/toolbar/basicshapes.xml
+modules/scalc/toolbar/calloutshapes.xml
+modules/scalc/toolbar/colorbar.xml
+modules/scalc/toolbar/drawbar.xml
+modules/scalc/toolbar/drawobjectbar.xml
+modules/scalc/toolbar/extrusionobjectbar.xml
+modules/scalc/toolbar/flowchartshapes.xml
+modules/scalc/toolbar/fontworkobjectbar.xml
+modules/scalc/toolbar/fontworkshapetype.xml
+modules/scalc/toolbar/formatobjectbar.xml
+modules/scalc/toolbar/formcontrols.xml
+modules/scalc/toolbar/formdesign.xml
+modules/scalc/toolbar/formsfilterbar.xml
+modules/scalc/toolbar/formsnavigationbar.xml
+modules/scalc/toolbar/formtextobjectbar.xml
+modules/scalc/toolbar/fullscreenbar.xml
+modules/scalc/toolbar/graffilterbar.xml
+modules/scalc/toolbar/graphicobjectbar.xml
+modules/scalc/toolbar/insertbar.xml
+modules/scalc/toolbar/insertcellsbar.xml
+modules/scalc/toolbar/mediaobjectbar.xml
+modules/scalc/toolbar/moreformcontrols.xml
+modules/scalc/toolbar/previewbar.xml
+modules/scalc/toolbar/standardbar.xml
+modules/scalc/toolbar/starshapes.xml
+modules/scalc/toolbar/symbolshapes.xml
+modules/scalc/toolbar/textobjectbar.xml
+modules/scalc/toolbar/toolbar.xml
+modules/scalc/toolbar/viewerbar.xml
+modules/sdraw/toolbar/3dobjectsbar.xml
+modules/sdraw/toolbar/alignmentbar.xml
+modules/sdraw/toolbar/arrowsbar.xml
+modules/sdraw/toolbar/arrowshapes.xml
+modules/sdraw/toolbar/basicshapes.xml
+modules/sdraw/toolbar/bezierobjectbar.xml
+modules/sdraw/toolbar/calloutshapes.xml
+modules/sdraw/toolbar/choosemodebar.xml
+modules/sdraw/toolbar/colorbar.xml
+modules/sdraw/toolbar/connectorsbar.xml
+modules/sdraw/toolbar/drawingobjectbar.xml
+modules/sdraw/toolbar/ellipsesbar.xml
+modules/sdraw/toolbar/extrusionobjectbar.xml
+modules/sdraw/toolbar/flowchartshapes.xml
+modules/sdraw/toolbar/fontworkobjectbar.xml
+modules/sdraw/toolbar/fontworkshapetype.xml
+modules/sdraw/toolbar/formcontrols.xml
+modules/sdraw/toolbar/formdesign.xml
+modules/sdraw/toolbar/formsfilterbar.xml
+modules/sdraw/toolbar/formsnavigationbar.xml
+modules/sdraw/toolbar/formtextobjectbar.xml
+modules/sdraw/toolbar/fullscreenbar.xml
+modules/sdraw/toolbar/gluepointsobjectbar.xml
+modules/sdraw/toolbar/graffilterbar.xml
+modules/sdraw/toolbar/graphicobjectbar.xml
+modules/sdraw/toolbar/insertbar.xml
+modules/sdraw/toolbar/linesbar.xml
+modules/sdraw/toolbar/masterviewtoolbar.xml
+modules/sdraw/toolbar/mediaobjectbar.xml
+modules/sdraw/toolbar/moreformcontrols.xml
+modules/sdraw/toolbar/optionsbar.xml
+modules/sdraw/toolbar/positionbar.xml
+modules/sdraw/toolbar/standardbar.xml
+modules/sdraw/toolbar/starshapes.xml
+modules/sdraw/toolbar/symbolshapes.xml
+modules/sdraw/toolbar/textbar.xml
+modules/sdraw/toolbar/textobjectbar.xml
+modules/sdraw/toolbar/toolbar.xml
+modules/sdraw/toolbar/viewerbar.xml
+modules/sdraw/toolbar/zoombar.xml
+modules/simpress/toolbar/3dobjectsbar.xml
+modules/simpress/toolbar/alignmentbar.xml
+modules/simpress/toolbar/arrowsbar.xml
+modules/simpress/toolbar/arrowshapes.xml
+modules/simpress/toolbar/basicshapes.xml
+modules/simpress/toolbar/bezierobjectbar.xml
+modules/simpress/toolbar/calloutshapes.xml
+modules/simpress/toolbar/choosemodebar.xml
+modules/simpress/toolbar/colorbar.xml
+modules/simpress/toolbar/commontaskbar.xml
+modules/simpress/toolbar/connectorsbar.xml
+modules/simpress/toolbar/drawingobjectbar.xml
+modules/simpress/toolbar/ellipsesbar.xml
+modules/simpress/toolbar/extrusionobjectbar.xml
+modules/simpress/toolbar/flowchartshapes.xml
+modules/simpress/toolbar/fontworkobjectbar.xml
+modules/simpress/toolbar/fontworkshapetype.xml
+modules/simpress/toolbar/formcontrols.xml
+modules/simpress/toolbar/formdesign.xml
+modules/simpress/toolbar/formsfilterbar.xml
+modules/simpress/toolbar/formsnavigationbar.xml
+modules/simpress/toolbar/formtextobjectbar.xml
+modules/simpress/toolbar/fullscreenbar.xml
+modules/simpress/toolbar/gluepointsobjectbar.xml
+modules/simpress/toolbar/graffilterbar.xml
+modules/simpress/toolbar/graphicobjectbar.xml
+modules/simpress/toolbar/insertbar.xml
+modules/simpress/toolbar/linesbar.xml
+modules/simpress/toolbar/masterviewtoolbar.xml
+modules/simpress/toolbar/mediaobjectbar.xml
+modules/simpress/toolbar/moreformcontrols.xml
+modules/simpress/toolbar/optionsbar.xml
+modules/simpress/toolbar/outlinetoolbar.xml
+modules/simpress/toolbar/positionbar.xml
+modules/simpress/toolbar/slideviewobjectbar.xml
+modules/simpress/toolbar/slideviewtoolbar.xml
+modules/simpress/toolbar/standardbar.xml
+modules/simpress/toolbar/starshapes.xml
+modules/simpress/toolbar/symbolshapes.xml
+modules/simpress/toolbar/textbar.xml
+modules/simpress/toolbar/textobjectbar.xml
+modules/simpress/toolbar/toolbar.xml
+modules/simpress/toolbar/viewerbar.xml
+modules/simpress/toolbar/zoombar.xml
+modules/smath/toolbar/fullscreenbar.xml
+modules/smath/toolbar/standardbar.xml
+modules/smath/toolbar/toolbar.xml
+modules/sglobal/toolbar/alignmentbar.xml
+modules/sglobal/toolbar/arrowshapes.xml
+modules/sglobal/toolbar/basicshapes.xml
+modules/sglobal/toolbar/bezierobjectbar.xml
+modules/sglobal/toolbar/calloutshapes.xml
+modules/sglobal/toolbar/colorbar.xml
+modules/sglobal/toolbar/drawbar.xml
+modules/sglobal/toolbar/drawingobjectbar.xml
+modules/sglobal/toolbar/drawtextobjectbar.xml
+modules/sglobal/toolbar/extrusionobjectbar.xml
+modules/sglobal/toolbar/flowchartshapes.xml
+modules/sglobal/toolbar/fontworkobjectbar.xml
+modules/sglobal/toolbar/fontworkshapetype.xml
+modules/sglobal/toolbar/formcontrols.xml
+modules/sglobal/toolbar/formdesign.xml
+modules/sglobal/toolbar/formsfilterbar.xml
+modules/sglobal/toolbar/formsnavigationbar.xml
+modules/sglobal/toolbar/formtextobjectbar.xml
+modules/sglobal/toolbar/frameobjectbar.xml
+modules/sglobal/toolbar/fullscreenbar.xml
+modules/sglobal/toolbar/graffilterbar.xml
+modules/sglobal/toolbar/graphicobjectbar.xml
+modules/sglobal/toolbar/insertbar.xml
+modules/sglobal/toolbar/mediaobjectbar.xml
+modules/sglobal/toolbar/moreformcontrols.xml
+modules/sglobal/toolbar/numobjectbar.xml
+modules/sglobal/toolbar/oleobjectbar.xml
+modules/sglobal/toolbar/optimizetablebar.xml
+modules/sglobal/toolbar/previewobjectbar.xml
+modules/sglobal/toolbar/standardbar.xml
+modules/sglobal/toolbar/starshapes.xml
+modules/sglobal/toolbar/symbolshapes.xml
+modules/sglobal/toolbar/tableobjectbar.xml
+modules/sglobal/toolbar/textobjectbar.xml
+modules/sglobal/toolbar/toolbar.xml
+modules/sglobal/toolbar/viewerbar.xml
+modules/sweb/toolbar/arrowshapes.xml
+modules/sweb/toolbar/basicshapes.xml
+modules/sweb/toolbar/bezierobjectbar.xml
+modules/sweb/toolbar/calloutshapes.xml
+modules/sweb/toolbar/colorbar.xml
+modules/sweb/toolbar/drawingobjectbar.xml
+modules/sweb/toolbar/drawtextobjectbar.xml
+modules/sweb/toolbar/extrusionobjectbar.xml
+modules/sweb/toolbar/flowchartshapes.xml
+modules/sweb/toolbar/fontworkobjectbar.xml
+modules/sweb/toolbar/fontworkshapetype.xml
+modules/sweb/toolbar/formcontrols.xml
+modules/sweb/toolbar/formdesign.xml
+modules/sweb/toolbar/formsfilterbar.xml
+modules/sweb/toolbar/formsnavigationbar.xml
+modules/sweb/toolbar/formtextobjectbar.xml
+modules/sweb/toolbar/frameobjectbar.xml
+modules/sweb/toolbar/fullscreenbar.xml
+modules/sweb/toolbar/graffilterbar.xml
+modules/sweb/toolbar/graphicobjectbar.xml
+modules/sweb/toolbar/insertbar.xml
+modules/sweb/toolbar/mediaobjectbar.xml
+modules/sweb/toolbar/numobjectbar.xml
+modules/sweb/toolbar/oleobjectbar.xml
+modules/sweb/toolbar/optimizetablebar.xml
+modules/sweb/toolbar/previewobjectbar.xml
+modules/sweb/toolbar/standardbar.xml
+modules/sweb/toolbar/starshapes.xml
+modules/sweb/toolbar/symbolshapes.xml
+modules/sweb/toolbar/tableobjectbar.xml
+modules/sweb/toolbar/textobjectbar.xml
+modules/sweb/toolbar/toolbar.xml
+modules/sweb/toolbar/viewerbar.xml
+modules/swriter/toolbar/alignmentbar.xml
+modules/swriter/toolbar/arrowshapes.xml
+modules/swriter/toolbar/basicshapes.xml
+modules/swriter/toolbar/bezierobjectbar.xml
+modules/swriter/toolbar/calloutshapes.xml
+modules/swriter/toolbar/colorbar.xml
+modules/swriter/toolbar/drawbar.xml
+modules/swriter/toolbar/drawingobjectbar.xml
+modules/swriter/toolbar/drawtextobjectbar.xml
+modules/swriter/toolbar/extrusionobjectbar.xml
+modules/swriter/toolbar/flowchartshapes.xml
+modules/swriter/toolbar/fontworkobjectbar.xml
+modules/swriter/toolbar/fontworkshapetype.xml
+modules/swriter/toolbar/formcontrols.xml
+modules/swriter/toolbar/formdesign.xml
+modules/swriter/toolbar/formsfilterbar.xml
+modules/swriter/toolbar/formsnavigationbar.xml
+modules/swriter/toolbar/formtextobjectbar.xml
+modules/swriter/toolbar/frameobjectbar.xml
+modules/swriter/toolbar/fullscreenbar.xml
+modules/swriter/toolbar/graffilterbar.xml
+modules/swriter/toolbar/graphicobjectbar.xml
+modules/swriter/toolbar/insertbar.xml
+modules/swriter/toolbar/mediaobjectbar.xml
+modules/swriter/toolbar/moreformcontrols.xml
+modules/swriter/toolbar/navigationobjectbar.xml
+modules/swriter/toolbar/numobjectbar.xml
+modules/swriter/toolbar/oleobjectbar.xml
+modules/swriter/toolbar/optimizetablebar.xml
+modules/swriter/toolbar/previewobjectbar.xml
+modules/swriter/toolbar/standardbar.xml
+modules/swriter/toolbar/starshapes.xml
+modules/swriter/toolbar/symbolshapes.xml
+modules/swriter/toolbar/tableobjectbar.xml
+modules/swriter/toolbar/textobjectbar.xml
+modules/swriter/toolbar/toolbar.xml
+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
+modules/BasicIDE/menubar/menubar.xml
+modules/dbapp/menubar/menubar.xml
+#modules/dbbrowser/menubar/menubar.xml
+modules/dbquery/menubar/menubar.xml
+modules/dbrelation/menubar/menubar.xml
+modules/dbtable/menubar/menubar.xml
+modules/StartModule/menubar/menubar.xml
+modules/schart/menubar/menubar.xml
+modules/scalc/menubar/menubar.xml
+modules/sdraw/menubar/menubar.xml
+modules/simpress/menubar/menubar.xml
+modules/smath/menubar/menubar.xml
+modules/sglobal/menubar/menubar.xml
+modules/sweb/menubar/menubar.xml
+modules/swriter/menubar/menubar.xml
 
 -- ordered small