From 23e1476c9309042d4e6246b57feb829f675d9f5a Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Thu, 24 Nov 2011 13:39:57 +0100 Subject: Cleanup: remove unused artwork, consolidate remaining. * the *.ico files were simply copied around, for the msi templates, and then later customized by copying nologobanner/install onto them * now holding only one copy of the icons, removed later-deleted other *.bmp files --- .../windows/msi_templates/Binary/caution.ico | Bin 0 -> 3262 bytes .../windows/msi_templates/Binary/dontinstall.ico | Bin 0 -> 766 bytes .../windows/msi_templates/Binary/install.ico | Bin 0 -> 766 bytes .../msi_templates/Binary/installfirstuse.ico | Bin 0 -> 3262 bytes .../msi_templates/Binary/installpartial.ico | Bin 0 -> 766 bytes .../msi_templates/Binary/installstatemenu.ico | Bin 0 -> 3262 bytes .../msi_templates/Binary/networkinstall.ico | Bin 0 -> 3262 bytes .../windows/msi_templates/Binary/newfolder.ico | Bin 0 -> 894 bytes .../windows/msi_templates/Binary/openfolder.ico | Bin 0 -> 3262 bytes .../windows/msi_templates/Binary/setup.ico | Bin 0 -> 11502 bytes .../windows/msi_templates/Binary/setupcomplete.ico | Bin 0 -> 3262 bytes .../windows/msi_templates/Binary/setuppartial.ico | Bin 0 -> 3262 bytes .../windows/msi_templates/Binary/setuprepair.ico | Bin 0 -> 3262 bytes .../windows/msi_templates/Binary/trashcan.ico | Bin 0 -> 3262 bytes .../inc_common/windows/msi_templates/Binary/up.ico | Bin 0 -> 894 bytes .../windows/msi_templates/Binary/Banner.bmp | Bin 7106 -> 0 bytes .../windows/msi_templates/Binary/Image.bmp | Bin 52242 -> 0 bytes .../windows/msi_templates/Binary/caution.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/dontinstall.ico | Bin 766 -> 0 bytes .../windows/msi_templates/Binary/install.ico | Bin 766 -> 0 bytes .../msi_templates/Binary/installfirstuse.ico | Bin 3262 -> 0 bytes .../msi_templates/Binary/installpartial.ico | Bin 766 -> 0 bytes .../msi_templates/Binary/installstatemenu.ico | Bin 3262 -> 0 bytes .../msi_templates/Binary/networkinstall.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/newfolder.ico | Bin 894 -> 0 bytes .../windows/msi_templates/Binary/openfolder.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/setup.ico | Bin 11502 -> 0 bytes .../windows/msi_templates/Binary/setupcomplete.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/setuppartial.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/setuprepair.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/trashcan.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/up.ico | Bin 894 -> 0 bytes .../windows/msi_templates/Binary/Banner.bmp | Bin 7106 -> 0 bytes .../windows/msi_templates/Binary/Image.bmp | Bin 52242 -> 0 bytes .../windows/msi_templates/Binary/caution.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/dontinstall.ico | Bin 766 -> 0 bytes .../windows/msi_templates/Binary/install.ico | Bin 766 -> 0 bytes .../msi_templates/Binary/installfirstuse.ico | Bin 3262 -> 0 bytes .../msi_templates/Binary/installpartial.ico | Bin 766 -> 0 bytes .../msi_templates/Binary/installstatemenu.ico | Bin 3262 -> 0 bytes .../msi_templates/Binary/networkinstall.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/newfolder.ico | Bin 894 -> 0 bytes .../windows/msi_templates/Binary/openfolder.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/setup.ico | Bin 11502 -> 0 bytes .../windows/msi_templates/Binary/setupcomplete.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/setuppartial.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/setuprepair.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/trashcan.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/up.ico | Bin 894 -> 0 bytes .../windows/msi_templates/Binary/Banner.bmp | Bin 7106 -> 0 bytes .../windows/msi_templates/Binary/Image.bmp | Bin 52242 -> 0 bytes .../windows/msi_templates/Binary/caution.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/dontinstall.ico | Bin 766 -> 0 bytes .../windows/msi_templates/Binary/install.ico | Bin 766 -> 0 bytes .../msi_templates/Binary/installfirstuse.ico | Bin 3262 -> 0 bytes .../msi_templates/Binary/installpartial.ico | Bin 766 -> 0 bytes .../msi_templates/Binary/installstatemenu.ico | Bin 3262 -> 0 bytes .../msi_templates/Binary/networkinstall.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/newfolder.ico | Bin 894 -> 0 bytes .../windows/msi_templates/Binary/openfolder.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/setup.ico | Bin 11502 -> 0 bytes .../windows/msi_templates/Binary/setupcomplete.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/setuppartial.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/setuprepair.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/trashcan.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/up.ico | Bin 894 -> 0 bytes .../windows/msi_templates/Binary/Banner.bmp | Bin 6400 -> 0 bytes .../windows/msi_templates/Binary/Image.bmp | Bin 154544 -> 0 bytes .../windows/msi_templates/Binary/caution.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/dontinstall.ico | Bin 766 -> 0 bytes .../windows/msi_templates/Binary/install.ico | Bin 766 -> 0 bytes .../msi_templates/Binary/installfirstuse.ico | Bin 3262 -> 0 bytes .../msi_templates/Binary/installpartial.ico | Bin 766 -> 0 bytes .../msi_templates/Binary/installstatemenu.ico | Bin 3262 -> 0 bytes .../msi_templates/Binary/networkinstall.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/newfolder.ico | Bin 894 -> 0 bytes .../windows/msi_templates/Binary/openfolder.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/setup.ico | Bin 11502 -> 0 bytes .../windows/msi_templates/Binary/setupcomplete.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/setuppartial.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/setuprepair.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/trashcan.ico | Bin 3262 -> 0 bytes .../inc_sdkoo/windows/msi_templates/Binary/up.ico | Bin 894 -> 0 bytes .../windows/msi_templates/Binary/Banner.bmp | Bin 7112 -> 0 bytes .../inc_ure/windows/msi_templates/Binary/Image.bmp | Bin 52248 -> 0 bytes .../windows/msi_templates/Binary/caution.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/dontinstall.ico | Bin 766 -> 0 bytes .../windows/msi_templates/Binary/install.ico | Bin 766 -> 0 bytes .../msi_templates/Binary/installfirstuse.ico | Bin 3262 -> 0 bytes .../msi_templates/Binary/installpartial.ico | Bin 766 -> 0 bytes .../msi_templates/Binary/installstatemenu.ico | Bin 3262 -> 0 bytes .../msi_templates/Binary/networkinstall.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/newfolder.ico | Bin 894 -> 0 bytes .../windows/msi_templates/Binary/openfolder.ico | Bin 3262 -> 0 bytes .../inc_ure/windows/msi_templates/Binary/setup.ico | Bin 11502 -> 0 bytes .../windows/msi_templates/Binary/setupcomplete.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/setuppartial.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/setuprepair.ico | Bin 3262 -> 0 bytes .../windows/msi_templates/Binary/trashcan.ico | Bin 3262 -> 0 bytes .../inc_ure/windows/msi_templates/Binary/up.ico | Bin 894 -> 0 bytes instsetoo_native/util/makefile.mk | 21 ++++++--------------- 101 files changed, 6 insertions(+), 15 deletions(-) create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/dontinstall.ico create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/install.ico create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/installfirstuse.ico create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/installpartial.ico create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/installstatemenu.ico create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/networkinstall.ico create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico create mode 100644 instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/caution.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/dontinstall.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/install.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installfirstuse.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installpartial.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installstatemenu.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/networkinstall.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/newfolder.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/openfolder.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setup.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setupcomplete.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuppartial.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuprepair.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/trashcan.ico delete mode 100644 instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/up.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/caution.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/dontinstall.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/install.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installfirstuse.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installpartial.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installstatemenu.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/networkinstall.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/newfolder.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/openfolder.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setup.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setupcomplete.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuppartial.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuprepair.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/trashcan.ico delete mode 100644 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/up.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/caution.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/dontinstall.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/install.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installfirstuse.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installpartial.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installstatemenu.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/networkinstall.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/newfolder.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/openfolder.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setup.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setupcomplete.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuppartial.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuprepair.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/trashcan.ico delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/up.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/caution.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/dontinstall.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/install.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installfirstuse.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installpartial.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installstatemenu.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/networkinstall.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/newfolder.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/openfolder.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setup.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setupcomplete.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuppartial.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuprepair.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/trashcan.ico delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/up.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/Image.bmp delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/caution.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/dontinstall.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/install.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/installfirstuse.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/installpartial.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/installstatemenu.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/networkinstall.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/newfolder.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/openfolder.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/setup.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/setupcomplete.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/setuppartial.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/setuprepair.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/trashcan.ico delete mode 100644 instsetoo_native/inc_ure/windows/msi_templates/Binary/up.ico diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico new file mode 100644 index 000000000000..1c6f14ee08fb Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/dontinstall.ico new file mode 100644 index 000000000000..e7136d0e8b2d Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/dontinstall.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/install.ico new file mode 100644 index 000000000000..2eb32becb63a Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/install.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/installfirstuse.ico new file mode 100644 index 000000000000..dc1e6542ece2 Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/installfirstuse.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/installpartial.ico new file mode 100644 index 000000000000..bd576796943e Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/installpartial.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/installstatemenu.ico new file mode 100644 index 000000000000..914340dbbd88 Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/installstatemenu.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/networkinstall.ico new file mode 100644 index 000000000000..ae11ed11348d Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/networkinstall.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico new file mode 100644 index 000000000000..324adbcba0a0 Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico new file mode 100644 index 000000000000..ef88d2e4731e Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico new file mode 100644 index 000000000000..3580448fe32e Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico new file mode 100644 index 000000000000..609276af083b Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico new file mode 100644 index 000000000000..ac158ab39873 Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico new file mode 100644 index 000000000000..2f4a24d0b696 Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico new file mode 100644 index 000000000000..f1cc8083f0f7 Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico differ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico new file mode 100644 index 000000000000..5dc25fae6a1e Binary files /dev/null and b/instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp deleted file mode 100644 index a453f1fcdd05..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp deleted file mode 100644 index 11acb28b1aad..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/caution.ico deleted file mode 100644 index 1c6f14ee08fb..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/caution.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/dontinstall.ico deleted file mode 100644 index e7136d0e8b2d..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/dontinstall.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/install.ico deleted file mode 100644 index 2eb32becb63a..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/install.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installfirstuse.ico deleted file mode 100644 index dc1e6542ece2..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installfirstuse.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installpartial.ico deleted file mode 100644 index bd576796943e..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installpartial.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installstatemenu.ico deleted file mode 100644 index 914340dbbd88..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installstatemenu.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/networkinstall.ico deleted file mode 100644 index ae11ed11348d..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/networkinstall.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/newfolder.ico deleted file mode 100644 index 324adbcba0a0..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/newfolder.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/openfolder.ico deleted file mode 100644 index ef88d2e4731e..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/openfolder.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setup.ico deleted file mode 100644 index 3580448fe32e..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setup.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setupcomplete.ico deleted file mode 100644 index 609276af083b..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setupcomplete.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuppartial.ico deleted file mode 100644 index ac158ab39873..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuppartial.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuprepair.ico deleted file mode 100644 index 2f4a24d0b696..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuprepair.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/trashcan.ico deleted file mode 100644 index f1cc8083f0f7..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/trashcan.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/up.ico deleted file mode 100644 index 5dc25fae6a1e..000000000000 Binary files a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/up.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp deleted file mode 100644 index a453f1fcdd05..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp deleted file mode 100644 index 25b5b11bed20..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/caution.ico deleted file mode 100644 index 1c6f14ee08fb..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/caution.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/dontinstall.ico deleted file mode 100644 index e7136d0e8b2d..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/dontinstall.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/install.ico deleted file mode 100644 index 2eb32becb63a..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/install.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installfirstuse.ico deleted file mode 100644 index dc1e6542ece2..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installfirstuse.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installpartial.ico deleted file mode 100644 index bd576796943e..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installpartial.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installstatemenu.ico deleted file mode 100644 index 914340dbbd88..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installstatemenu.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/networkinstall.ico deleted file mode 100644 index ae11ed11348d..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/networkinstall.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/newfolder.ico deleted file mode 100644 index 324adbcba0a0..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/newfolder.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/openfolder.ico deleted file mode 100644 index ef88d2e4731e..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/openfolder.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setup.ico deleted file mode 100644 index 3580448fe32e..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setup.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setupcomplete.ico deleted file mode 100644 index 609276af083b..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setupcomplete.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuppartial.ico deleted file mode 100644 index ac158ab39873..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuppartial.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuprepair.ico deleted file mode 100644 index 2f4a24d0b696..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuprepair.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/trashcan.ico deleted file mode 100644 index f1cc8083f0f7..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/trashcan.ico and /dev/null differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/up.ico deleted file mode 100644 index 5dc25fae6a1e..000000000000 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/up.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp deleted file mode 100644 index a453f1fcdd05..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp deleted file mode 100644 index 25b5b11bed20..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/caution.ico deleted file mode 100644 index 1c6f14ee08fb..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/caution.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/dontinstall.ico deleted file mode 100644 index e7136d0e8b2d..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/dontinstall.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/install.ico deleted file mode 100644 index 2eb32becb63a..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/install.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installfirstuse.ico deleted file mode 100644 index dc1e6542ece2..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installfirstuse.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installpartial.ico deleted file mode 100644 index bd576796943e..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installpartial.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installstatemenu.ico deleted file mode 100644 index 914340dbbd88..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installstatemenu.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/networkinstall.ico deleted file mode 100644 index ae11ed11348d..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/networkinstall.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/newfolder.ico deleted file mode 100644 index 324adbcba0a0..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/newfolder.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/openfolder.ico deleted file mode 100644 index ef88d2e4731e..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/openfolder.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setup.ico deleted file mode 100644 index 3580448fe32e..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setup.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setupcomplete.ico deleted file mode 100644 index 609276af083b..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setupcomplete.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuppartial.ico deleted file mode 100644 index ac158ab39873..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuppartial.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuprepair.ico deleted file mode 100644 index 2f4a24d0b696..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuprepair.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/trashcan.ico deleted file mode 100644 index f1cc8083f0f7..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/trashcan.ico and /dev/null differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/up.ico deleted file mode 100644 index 5dc25fae6a1e..000000000000 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/up.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp deleted file mode 100644 index d7f7f635917e..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp deleted file mode 100644 index 86a48d50906a..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/caution.ico deleted file mode 100644 index 1c6f14ee08fb..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/caution.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/dontinstall.ico deleted file mode 100644 index e7136d0e8b2d..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/dontinstall.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/install.ico deleted file mode 100644 index 2eb32becb63a..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/install.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installfirstuse.ico deleted file mode 100644 index dc1e6542ece2..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installfirstuse.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installpartial.ico deleted file mode 100644 index bd576796943e..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installpartial.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installstatemenu.ico deleted file mode 100644 index 914340dbbd88..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installstatemenu.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/networkinstall.ico deleted file mode 100644 index ae11ed11348d..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/networkinstall.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/newfolder.ico deleted file mode 100644 index 324adbcba0a0..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/newfolder.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/openfolder.ico deleted file mode 100644 index ef88d2e4731e..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/openfolder.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setup.ico deleted file mode 100644 index 3580448fe32e..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setup.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setupcomplete.ico deleted file mode 100644 index 609276af083b..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setupcomplete.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuppartial.ico deleted file mode 100644 index ac158ab39873..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuppartial.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuprepair.ico deleted file mode 100644 index 2f4a24d0b696..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuprepair.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/trashcan.ico deleted file mode 100644 index f1cc8083f0f7..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/trashcan.ico and /dev/null differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/up.ico deleted file mode 100644 index 5dc25fae6a1e..000000000000 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/up.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp deleted file mode 100644 index 5078e379c37d..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ure/windows/msi_templates/Binary/Image.bmp deleted file mode 100644 index e69b561f9165..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/Image.bmp and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/caution.ico deleted file mode 100644 index 1c6f14ee08fb..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/caution.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/dontinstall.ico deleted file mode 100644 index e7136d0e8b2d..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/dontinstall.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/install.ico deleted file mode 100644 index 2eb32becb63a..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/install.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/installfirstuse.ico deleted file mode 100644 index dc1e6542ece2..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installfirstuse.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/installpartial.ico deleted file mode 100644 index bd576796943e..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installpartial.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/installstatemenu.ico deleted file mode 100644 index 914340dbbd88..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installstatemenu.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/networkinstall.ico deleted file mode 100644 index ae11ed11348d..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/networkinstall.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/newfolder.ico deleted file mode 100644 index 324adbcba0a0..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/newfolder.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/openfolder.ico deleted file mode 100644 index ef88d2e4731e..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/openfolder.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/setup.ico deleted file mode 100644 index 3580448fe32e..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setup.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/setupcomplete.ico deleted file mode 100644 index 609276af083b..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setupcomplete.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuppartial.ico deleted file mode 100644 index ac158ab39873..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuppartial.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuprepair.ico deleted file mode 100644 index 2f4a24d0b696..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuprepair.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/trashcan.ico deleted file mode 100644 index f1cc8083f0f7..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/trashcan.ico and /dev/null differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/up.ico deleted file mode 100644 index 5dc25fae6a1e..000000000000 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/up.ico and /dev/null differ diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index b2cc69eb804d..6f2643db2433 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -182,6 +182,7 @@ MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates +MSICOMMONTEMPLATESOURCE=$(PRJ)$/inc_common$/windows$/msi_templates NOLOGOSPLASH:=$(BIN)$/intro.zip DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip @@ -350,21 +351,11 @@ hack_msitemplates .PHONY: $(GNUCOPY) -u $(MSIHELPPACKTEMPLATESOURCE)$/*.* $(MSIHELPPACKTEMPLATEDIR) $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR) $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR) - $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary - $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary - $(GNUCOPY) -u $(MSIHELPPACKTEMPLATESOURCE)$/Binary$/*.* $(MSIHELPPACKTEMPLATEDIR)$/Binary - $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary - $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary - $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp - $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp - $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp - $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp - $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp - $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp - $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp - $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp - $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp - $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp + $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSIHELPPACKTEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp -- cgit