[Libreoffice-commits] .: 2 commits - default_images/brand default_images/framework instsetoo_native/inc_common instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure instsetoo_native/util

Thorsten Behrens thorsten at kemper.freedesktop.org
Thu Nov 24 12:43:31 PST 2011 

 dev/null                                                                      |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/caution.ico          |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/dontinstall.ico      |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/install.ico          |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/installfirstuse.ico  |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/installpartial.ico   |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/installstatemenu.ico |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/networkinstall.ico   |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/newfolder.ico        |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/openfolder.ico       |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/setup.ico            |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/setupcomplete.ico    |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/setuppartial.ico     |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/setuprepair.ico      |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/trashcan.ico         |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/up.ico               |binary
 instsetoo_native/util/makefile.mk                                             |   21 ++--------
 17 files changed, 6 insertions(+), 15 deletions(-)

New commits:
commit b6e5f5da292f89782f3084753de4c0c172dd4517
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Thu Nov 24 14:05:53 2011 +0100

    Cleanup: unused / duplicated artwork
    
     * the framework/res stuff was stale, only the brand/ thing is used
       nowadays
     * framework/source/services/backingwindow.cxx only used
       left/right/space, the rest can go

diff --git a/default_images/brand/shell/backing.png b/default_images/brand/shell/backing.png
deleted file mode 100644
index 4b830ba..0000000
Binary files a/default_images/brand/shell/backing.png and /dev/null differ
diff --git a/default_images/brand/shell/backing_left_hc.png b/default_images/brand/shell/backing_left_hc.png
deleted file mode 100644
index 4b830ba..0000000
Binary files a/default_images/brand/shell/backing_left_hc.png and /dev/null differ
diff --git a/default_images/framework/res/backing.png b/default_images/framework/res/backing.png
deleted file mode 100644
index 4b830ba..0000000
Binary files a/default_images/framework/res/backing.png and /dev/null differ
diff --git a/default_images/framework/res/backing_right.png b/default_images/framework/res/backing_right.png
deleted file mode 100644
index b95e877..0000000
Binary files a/default_images/framework/res/backing_right.png and /dev/null differ
diff --git a/default_images/framework/res/backing_rtl_left.png b/default_images/framework/res/backing_rtl_left.png
deleted file mode 100644
index 4b830ba..0000000
Binary files a/default_images/framework/res/backing_rtl_left.png and /dev/null differ
diff --git a/default_images/framework/res/backing_rtl_right.png b/default_images/framework/res/backing_rtl_right.png
deleted file mode 100644
index b95e877..0000000
Binary files a/default_images/framework/res/backing_rtl_right.png and /dev/null differ
diff --git a/default_images/framework/res/backing_space.png b/default_images/framework/res/backing_space.png
deleted file mode 100644
index 1f3060c..0000000
Binary files a/default_images/framework/res/backing_space.png and /dev/null differ
commit 23e1476c9309042d4e6246b57feb829f675d9f5a
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Thu Nov 24 13:39:57 2011 +0100

    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

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 0000000..1c6f14e
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 0000000..e7136d0
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 0000000..2eb32be
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 0000000..dc1e654
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 0000000..bd57679
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 0000000..914340d
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 0000000..ae11ed1
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 0000000..324adbc
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 0000000..ef88d2e
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 0000000..3580448
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 0000000..609276a
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 0000000..ac158ab
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 0000000..2f4a24d
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 0000000..f1cc808
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 0000000..5dc25fa
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 a453f1f..0000000
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 11acb28..0000000
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 1c6f14e..0000000
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 e7136d0..0000000
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 2eb32be..0000000
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 dc1e654..0000000
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 bd57679..0000000
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 914340d..0000000
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 ae11ed1..0000000
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 324adbc..0000000
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 ef88d2e..0000000
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 3580448..0000000
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 609276a..0000000
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 ac158ab..0000000
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 2f4a24d..0000000
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 f1cc808..0000000
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 5dc25fa..0000000
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 a453f1f..0000000
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 25b5b11..0000000
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 1c6f14e..0000000
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 e7136d0..0000000
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 2eb32be..0000000
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 dc1e654..0000000
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 bd57679..0000000
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 914340d..0000000
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 ae11ed1..0000000
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 324adbc..0000000
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 ef88d2e..0000000
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 3580448..0000000
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 609276a..0000000
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 ac158ab..0000000
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 2f4a24d..0000000
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 f1cc808..0000000
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 5dc25fa..0000000
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 a453f1f..0000000
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 25b5b11..0000000
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 1c6f14e..0000000
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 e7136d0..0000000
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 2eb32be..0000000
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 dc1e654..0000000
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 bd57679..0000000
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 914340d..0000000
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 ae11ed1..0000000
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 324adbc..0000000
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 ef88d2e..0000000
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 3580448..0000000
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 609276a..0000000
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 ac158ab..0000000
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 2f4a24d..0000000
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 f1cc808..0000000
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 5dc25fa..0000000
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 d7f7f63..0000000
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 86a48d5..0000000
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 1c6f14e..0000000
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 e7136d0..0000000
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 2eb32be..0000000
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 dc1e654..0000000
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 bd57679..0000000
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 914340d..0000000
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 ae11ed1..0000000
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 324adbc..0000000
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 ef88d2e..0000000
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 3580448..0000000
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 609276a..0000000
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 ac158ab..0000000
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 2f4a24d..0000000
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 f1cc808..0000000
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 5dc25fa..0000000
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 5078e37..0000000
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 e69b561..0000000
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 1c6f14e..0000000
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 e7136d0..0000000
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 2eb32be..0000000
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 dc1e654..0000000
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 bd57679..0000000
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 914340d..0000000
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 ae11ed1..0000000
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 324adbc..0000000
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 ef88d2e..0000000
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 3580448..0000000
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 609276a..0000000
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 ac158ab..0000000
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 2f4a24d..0000000
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 f1cc808..0000000
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 5dc25fa..0000000
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 b2cc69e..6f2643d 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

More information about the Libreoffice-commits mailing list