[Libreoffice-commits] .: android/prj instsetoo_native/prj Makefile.top packimages/CustomTarget_images.mk packimages/Makefile packimages/Module_packimages.mk packimages/pack packimages/Package_images.mk packimages/prj packimages/README postprocess/CustomTarget_images.mk postprocess/Module_postprocess.mk postprocess/Package_images.mk postprocess/packimages RepositoryModule_ooo.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 24 10:20:43 PST 2012
Makefile.top | 8
RepositoryModule_ooo.mk | 1
android/prj/build.lst | 2
instsetoo_native/prj/build.lst | 2
packimages/CustomTarget_images.mk | 84 --------
packimages/Makefile | 7
packimages/Module_packimages.mk | 35 ---
packimages/Package_images.mk | 38 ---
packimages/README | 16 -
packimages/pack/image-sort.lst | 344 ----------------------------------
packimages/prj/build.lst | 2
postprocess/CustomTarget_images.mk | 84 ++++++++
postprocess/Module_postprocess.mk | 2
postprocess/Package_images.mk | 38 +++
postprocess/packimages/README | 16 +
postprocess/packimages/image-sort.lst | 344 ++++++++++++++++++++++++++++++++++
16 files changed, 490 insertions(+), 533 deletions(-)
New commits:
commit 505d5836fcb49a4cf3b5e487d7e1dd23c0e607c6
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Dec 16 02:06:31 2012 +0100
merge packimages into postprocess
Change-Id: Ie00c7cbc012a605e95ceafcad384a67b599fc758
Reviewed-on: https://gerrit.libreoffice.org/1476
Reviewed-by: Peter Foley <pefoley2 at verizon.net>
Tested-by: Peter Foley <pefoley2 at verizon.net>
diff --git a/Makefile.top b/Makefile.top
index 13ff6b4..ed0dda2 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -26,7 +26,7 @@ endif
endif
# This list tells which modules are gbuild ones. It does *not* tell which modules to build. That is directed
-# by the module being mentioned in packimages/prj/build.lst, etc, recursively.
+# by the module being mentioned in postprocess/prj/build.lst, etc, recursively.
$(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake) $(BUILDDIR)/config_host.mk
mkdir -p $(dir $@)
echo -n "gbuild_modules:= tail_build \\" > $@
@@ -222,7 +222,7 @@ $(WORKDIR)/bootstrap:
#
# Build
#
-build-packimages: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
+build-postprocess: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
ifeq ($(DISABLE_SCRIPTING),TRUE)
# We must get the headers from vbahelper "delivered" because
# as we don't link to any libs from there they won't otherwise be, or
@@ -235,11 +235,11 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
# Ditto for dbconnectivity in the --disable-database-connectivity case
cd connectivity && sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$$/\1"\2"/' <../config_host.mk >conftmp.sh && . conftmp.sh && rm conftmp.sh && $(SOLARENV)/bin/deliver.pl
endif
- cd $(SRC_ROOT)/packimages && unset MAKEFLAGS && \
+ cd $(SRC_ROOT)/postprocess && unset MAKEFLAGS && \
$(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) && \
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
-build: build-packimages
+build: build-postprocess
ifeq ($(OS_FOR_BUILD),WNT)
cd $(SRC_ROOT)/instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl
else
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index cdb908f..e747178 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -137,7 +137,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
oox \
$(call gb_Helper_optional,OPENLDAP,openldap) \
package \
- packimages \
padmin \
$(call gb_Helper_optional,POSTGRESQL,postgresql) \
postprocess \
diff --git a/android/prj/build.lst b/android/prj/build.lst
index 1a0c8c2..90d51a2 100644
--- a/android/prj/build.lst
+++ b/android/prj/build.lst
@@ -1,2 +1,2 @@
-an android :: packimages postprocess NULL
+an android :: postprocess NULL
an android\prj nmake - all an_prj NULL
diff --git a/instsetoo_native/prj/build.lst b/instsetoo_native/prj/build.lst
index 46b09be..56d88ea 100644
--- a/instsetoo_native/prj/build.lst
+++ b/instsetoo_native/prj/build.lst
@@ -1,4 +1,4 @@
-oon instsetoo_native :: postprocess packimages NULL
+oon instsetoo_native :: postprocess NULL
oon instsetoo_native usr1 - all oon_mkout NULL
oon instsetoo_native\inc_openoffice\unix nmake - u oon_unix NULL
oon instsetoo_native\inc_openoffice\windows\msi_languages nmake - all oon_msilang NULL
diff --git a/packimages/CustomTarget_images.mk b/packimages/CustomTarget_images.mk
deleted file mode 100644
index 2c40d34..0000000
--- a/packimages/CustomTarget_images.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- 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 at 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,packimages/images))
-
-packimages_DIR := $(call gb_CustomTarget_get_workdir,packimages/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,packimages/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)/packimages/pack/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/packimages/Makefile b/packimages/Makefile
deleted file mode 100644
index ccb1c85..0000000
--- a/packimages/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/packimages/Module_packimages.mk b/packimages/Module_packimages.mk
deleted file mode 100644
index ec424c4..0000000
--- a/packimages/Module_packimages.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- 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 at 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_Module_Module,packimages))
-
-$(eval $(call gb_Module_add_targets,packimages,\
- CustomTarget_images \
- Package_images \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/packimages/Package_images.mk b/packimages/Package_images.mk
deleted file mode 100644
index a57c7e4..0000000
--- a/packimages/Package_images.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- 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 at 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,packimages_images,$(call gb_CustomTarget_get_workdir,packimages/images)))
-
-$(eval $(call gb_Package_add_file,packimages_images,bin/images_brand.zip,images_brand.zip))
-
-$(if $(filter default,$(WITH_THEMES)),\
-$(eval $(call gb_Package_add_file,packimages_images,bin/images.zip,images.zip)))
-
-$(foreach theme,$(filter-out default,$(WITH_THEMES)),\
-$(eval $(call gb_Package_add_file,packimages_images,bin/images_$(theme).zip,images_$(theme).zip)))
-
-# vim: set noet sw=4 ts=4:
diff --git a/packimages/README b/packimages/README
deleted file mode 100644
index cf7b96e..0000000
--- a/packimages/README
+++ /dev/null
@@ -1,16 +0,0 @@
-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/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst
deleted file mode 100644
index 6a84af7..0000000
--- a/packimages/pack/image-sort.lst
+++ /dev/null
@@ -1,344 +0,0 @@
-#
-# 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
diff --git a/packimages/prj/build.lst b/packimages/prj/build.lst
deleted file mode 100644
index 8eecfee..0000000
--- a/packimages/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-pim packimages :: postprocess NULL
-pim packimages\prj nmake - all pim_prj NULL
diff --git a/packimages/prj/d.lst b/packimages/prj/d.lst
deleted file mode 100644
index e69de29..0000000
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
new file mode 100644
index 0000000..73dd16e
--- /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 at 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 6e1c7c2..0716ae7 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 0000000..6d60590
--- /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 at 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 0000000..cf7b96e
--- /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 0000000..6a84af7
--- /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
More information about the Libreoffice-commits
mailing list