diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2011-11-24 13:39:57 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2011-11-24 21:43:05 +0100 |
| commit | 23e1476c9309042d4e6246b57feb829f675d9f5a (patch) | |
| tree | 9ca5676b10f20c080ccbee5a6e62e0644ad55b6e /instsetoo_native | |
| parent | 50171e51373800bfe598e461d551f873aff87f09 (diff) | |
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
Diffstat (limited to 'instsetoo_native')
86 files changed, 6 insertions, 15 deletions
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico Binary files differindex 1c6f14ee08fb..1c6f14ee08fb 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/caution.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/dontinstall.ico Binary files differindex e7136d0e8b2d..e7136d0e8b2d 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/dontinstall.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/dontinstall.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/install.ico Binary files differindex 2eb32becb63a..2eb32becb63a 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/install.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/install.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/installfirstuse.ico Binary files differindex dc1e6542ece2..dc1e6542ece2 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installfirstuse.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/installfirstuse.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/installpartial.ico Binary files differindex bd576796943e..bd576796943e 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installpartial.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/installpartial.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/installstatemenu.ico Binary files differindex 914340dbbd88..914340dbbd88 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installstatemenu.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/installstatemenu.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/networkinstall.ico Binary files differindex ae11ed11348d..ae11ed11348d 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/networkinstall.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/networkinstall.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico Binary files differindex 324adbcba0a0..324adbcba0a0 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/newfolder.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico Binary files differindex ef88d2e4731e..ef88d2e4731e 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/openfolder.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico Binary files differindex 3580448fe32e..3580448fe32e 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setup.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico Binary files differindex 609276af083b..609276af083b 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setupcomplete.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico Binary files differindex ac158ab39873..ac158ab39873 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuppartial.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico Binary files differindex 2f4a24d0b696..2f4a24d0b696 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuprepair.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico Binary files differindex f1cc8083f0f7..f1cc8083f0f7 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/trashcan.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico Binary files differindex 5dc25fae6a1e..5dc25fae6a1e 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/up.ico +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp Binary files differdeleted file mode 100644 index a453f1fcdd05..000000000000 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp +++ /dev/null diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp Binary files differdeleted file mode 100644 index 11acb28b1aad..000000000000 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp Binary files differdeleted file mode 100644 index a453f1fcdd05..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp Binary files differdeleted file mode 100644 index 25b5b11bed20..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/caution.ico Binary files differdeleted file mode 100644 index 1c6f14ee08fb..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/caution.ico +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/dontinstall.ico Binary files differdeleted file mode 100644 index e7136d0e8b2d..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/dontinstall.ico +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/install.ico Binary files differdeleted file mode 100644 index 2eb32becb63a..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/install.ico +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installfirstuse.ico Binary files differdeleted file mode 100644 index dc1e6542ece2..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installfirstuse.ico +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installpartial.ico Binary files differdeleted file mode 100644 index bd576796943e..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installpartial.ico +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installstatemenu.ico Binary files differdeleted file mode 100644 index 914340dbbd88..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/installstatemenu.ico +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/networkinstall.ico Binary files differdeleted file mode 100644 index ae11ed11348d..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/networkinstall.ico +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/newfolder.ico Binary files differdeleted file mode 100644 index 324adbcba0a0..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/newfolder.ico +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/openfolder.ico Binary files differdeleted file mode 100644 index ef88d2e4731e..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/openfolder.ico +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setup.ico Binary files differdeleted file mode 100644 index 3580448fe32e..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setup.ico +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setupcomplete.ico Binary files differdeleted file mode 100644 index 609276af083b..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setupcomplete.ico +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuppartial.ico Binary files differdeleted file mode 100644 index ac158ab39873..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuppartial.ico +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuprepair.ico Binary files differdeleted file mode 100644 index 2f4a24d0b696..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/setuprepair.ico +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/trashcan.ico Binary files differdeleted file mode 100644 index f1cc8083f0f7..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/trashcan.ico +++ /dev/null diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/up.ico Binary files differdeleted file mode 100644 index 5dc25fae6a1e..000000000000 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/up.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp Binary files differdeleted file mode 100644 index a453f1fcdd05..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp Binary files differdeleted file mode 100644 index 25b5b11bed20..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/caution.ico Binary files differdeleted file mode 100644 index 1c6f14ee08fb..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/caution.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/dontinstall.ico Binary files differdeleted file mode 100644 index e7136d0e8b2d..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/dontinstall.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/install.ico Binary files differdeleted file mode 100644 index 2eb32becb63a..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/install.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installfirstuse.ico Binary files differdeleted file mode 100644 index dc1e6542ece2..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installfirstuse.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installpartial.ico Binary files differdeleted file mode 100644 index bd576796943e..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installpartial.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installstatemenu.ico Binary files differdeleted file mode 100644 index 914340dbbd88..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/installstatemenu.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/networkinstall.ico Binary files differdeleted file mode 100644 index ae11ed11348d..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/networkinstall.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/newfolder.ico Binary files differdeleted file mode 100644 index 324adbcba0a0..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/newfolder.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/openfolder.ico Binary files differdeleted file mode 100644 index ef88d2e4731e..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/openfolder.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setup.ico Binary files differdeleted file mode 100644 index 3580448fe32e..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setup.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setupcomplete.ico Binary files differdeleted file mode 100644 index 609276af083b..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setupcomplete.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuppartial.ico Binary files differdeleted file mode 100644 index ac158ab39873..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuppartial.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuprepair.ico Binary files differdeleted file mode 100644 index 2f4a24d0b696..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/setuprepair.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/trashcan.ico Binary files differdeleted file mode 100644 index f1cc8083f0f7..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/trashcan.ico +++ /dev/null diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/up.ico Binary files differdeleted file mode 100644 index 5dc25fae6a1e..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/up.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp Binary files differdeleted file mode 100644 index d7f7f635917e..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp Binary files differdeleted file mode 100644 index 86a48d50906a..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/caution.ico Binary files differdeleted file mode 100644 index 1c6f14ee08fb..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/caution.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/dontinstall.ico Binary files differdeleted file mode 100644 index e7136d0e8b2d..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/dontinstall.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/install.ico Binary files differdeleted file mode 100644 index 2eb32becb63a..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/install.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installfirstuse.ico Binary files differdeleted file mode 100644 index dc1e6542ece2..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installfirstuse.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installpartial.ico Binary files differdeleted file mode 100644 index bd576796943e..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installpartial.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installstatemenu.ico Binary files differdeleted file mode 100644 index 914340dbbd88..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/installstatemenu.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/networkinstall.ico Binary files differdeleted file mode 100644 index ae11ed11348d..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/networkinstall.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/newfolder.ico Binary files differdeleted file mode 100644 index 324adbcba0a0..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/newfolder.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/openfolder.ico Binary files differdeleted file mode 100644 index ef88d2e4731e..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/openfolder.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setup.ico Binary files differdeleted file mode 100644 index 3580448fe32e..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setup.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setupcomplete.ico Binary files differdeleted file mode 100644 index 609276af083b..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setupcomplete.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuppartial.ico Binary files differdeleted file mode 100644 index ac158ab39873..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuppartial.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuprepair.ico Binary files differdeleted file mode 100644 index 2f4a24d0b696..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/setuprepair.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/trashcan.ico Binary files differdeleted file mode 100644 index f1cc8083f0f7..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/trashcan.ico +++ /dev/null diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/up.ico Binary files differdeleted file mode 100644 index 5dc25fae6a1e..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/up.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp Binary files differdeleted file mode 100644 index 5078e379c37d..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ure/windows/msi_templates/Binary/Image.bmp Binary files differdeleted file mode 100644 index e69b561f9165..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/Image.bmp +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/caution.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/caution.ico Binary files differdeleted file mode 100644 index 1c6f14ee08fb..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/caution.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/dontinstall.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/dontinstall.ico Binary files differdeleted file mode 100644 index e7136d0e8b2d..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/dontinstall.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/install.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/install.ico Binary files differdeleted file mode 100644 index 2eb32becb63a..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/install.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installfirstuse.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/installfirstuse.ico Binary files differdeleted file mode 100644 index dc1e6542ece2..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installfirstuse.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installpartial.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/installpartial.ico Binary files differdeleted file mode 100644 index bd576796943e..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installpartial.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installstatemenu.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/installstatemenu.ico Binary files differdeleted file mode 100644 index 914340dbbd88..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/installstatemenu.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/networkinstall.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/networkinstall.ico Binary files differdeleted file mode 100644 index ae11ed11348d..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/networkinstall.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/newfolder.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/newfolder.ico Binary files differdeleted file mode 100644 index 324adbcba0a0..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/newfolder.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/openfolder.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/openfolder.ico Binary files differdeleted file mode 100644 index ef88d2e4731e..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/openfolder.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setup.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/setup.ico Binary files differdeleted file mode 100644 index 3580448fe32e..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setup.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setupcomplete.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/setupcomplete.ico Binary files differdeleted file mode 100644 index 609276af083b..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setupcomplete.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuppartial.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuppartial.ico Binary files differdeleted file mode 100644 index ac158ab39873..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuppartial.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuprepair.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuprepair.ico Binary files differdeleted file mode 100644 index 2f4a24d0b696..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/setuprepair.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/trashcan.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/trashcan.ico Binary files differdeleted file mode 100644 index f1cc8083f0f7..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/trashcan.ico +++ /dev/null diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/up.ico b/instsetoo_native/inc_ure/windows/msi_templates/Binary/up.ico Binary files differdeleted file mode 100644 index 5dc25fae6a1e..000000000000 --- a/instsetoo_native/inc_ure/windows/msi_templates/Binary/up.ico +++ /dev/null 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 |
