Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 345 insertions, 0 deletions

diff --git a/postprocess/packimages/README b/postprocess/packimages/README
new file mode 100644
index 000000000..95d5f3daa
--- /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/image-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 000000000..d0b226c2b
--- /dev/null
+++ b/postprocess/packimages/image-sort.lst
@@ -0,0 +1,329 @@
+#
+# 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' tag 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
+
+-- literal
+
+# 'standard' toolbars
+modules/swriter/toolbar/standardbar.xml
+modules/scalc/toolbar/standardbar.xml
+modules/simpress/toolbar/standardbar.xml
+modules/sdraw/toolbar/standardbar.xml
+-- group
+
+# default / startup toolbars
+modules/swriter/toolbar/textobjectbar.xml
+modules/scalc/toolbar/formatobjectbar.xml
+-- group
+
+modules/simpress/toolbar/drawingobjectbar.xml
+modules/sdraw/toolbar/drawingobjectbar.xml
+-- group
+
+modules/simpress/toolbar/toolbar.xml
+modules/sdraw/toolbar/toolbar.xml
+-- group
+
+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/sx03139.png
+-- literal
+
+# default / startup menus:
+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.
+#
+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/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/datastreams.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/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/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/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/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/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
+
+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