From b924bbb9ce507b618e3cfd76cf9c6f9d72fa398c Mon Sep 17 00:00:00 2001
From: Caolán McNamara <cmc@openoffice.org>
Date: Thu, 11 Feb 2010 14:16:21 +0000
Subject: cmcfixes72: #i109154# upstream javafilter.desktop

---
 sysui/desktop/freedesktop/freedesktop-menus.spec | 1 +
 sysui/desktop/menus/javafilter.desktop           | 9 +++++++++
 sysui/desktop/redhat/redhat-menus.spec           | 2 ++
 sysui/desktop/share/launcher_genericname.ulf     | 3 +++
 sysui/desktop/share/makefile.mk                  | 6 +++---
 sysui/desktop/suse/suse-menus.spec               | 1 +
 6 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 sysui/desktop/menus/javafilter.desktop

(limited to 'sysui')

diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 14a7c7795b..501f8432d9 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -325,6 +325,7 @@ done
 /usr/share/applications/%unixfilename-printeradmin.desktop
 /usr/share/applications/%unixfilename-writer.desktop
 /usr/share/applications/%unixfilename-startcenter.desktop
+/usr/share/applications/%unixfilename-javafilter.desktop
 /usr/share/icons/gnome/*/apps/*png
 /usr/share/icons/gnome/*/mimetypes/*png
 /usr/share/icons/hicolor/*/apps/*png
diff --git a/sysui/desktop/menus/javafilter.desktop b/sysui/desktop/menus/javafilter.desktop
new file mode 100644
index 0000000000..9d230f954a
--- /dev/null
+++ b/sysui/desktop/menus/javafilter.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+Type=Application
+Exec=openoffice -writer %U
+MimeType=application/x-aportisdoc;application/x-pocket-word;application/x-pocket-excel;
+Name=%PRODUCTNAME Small Device Format Importer
+GenericName=Small Device Format Importer
+NoDisplay=true
diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec
index 4ad74ad1b3..e153b55c3f 100644
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
@@ -279,6 +279,7 @@ done
 /usr/share/applications/%unixfilename-base.desktop
 /usr/share/applications/%unixfilename-printeradmin.desktop
 /usr/share/applications/%unixfilename-startcenter.desktop
+/usr/share/applications/%unixfilename-javafilter.desktop
 /usr/share/applnk-redhat/Office/%unixfilename-writer.desktop
 /usr/share/applnk-redhat/Office/%unixfilename-calc.desktop
 /usr/share/applnk-redhat/Office/%unixfilename-draw.desktop
@@ -287,6 +288,7 @@ done
 /usr/share/applnk-redhat/Office/%unixfilename-base.desktop
 /usr/share/applnk-redhat/Office/%unixfilename-printeradmin.desktop
 /usr/share/applnk-redhat/Office/%unixfilename-startcenter.desktop
+/usr/share/applnk-redhat/Office/%unixfilename-javafilter.desktop
 /usr/share/mime-info/*.keys
 /usr/share/mime-info/*.mime
 /usr/share/mimelnk/application/*.desktop
diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf
index ea11da04e0..ff8041a155 100644
--- a/sysui/desktop/share/launcher_genericname.ulf
+++ b/sysui/desktop/share/launcher_genericname.ulf
@@ -18,3 +18,6 @@ en-US = "Drawing Program"
 
 [startcenter] 
 en-US = "Office"
+
+[javafilter]
+en-US = "Small Device Format Importer"
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index a0ed77b179..f1a554912a 100644
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -56,7 +56,7 @@ ULFFILES= \
     launcher_genericname.ulf \
     launcher_name.ulf
 
-LAUNCHERLIST = writer calc draw impress math base printeradmin qstart startcenter
+LAUNCHERLIST = writer calc draw impress math base printeradmin qstart startcenter javafilter
 LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop
 
 LAUNCHERFLAGFILE = $(COMMONMISC)/$(TARGET)/xdg.flag
@@ -130,9 +130,9 @@ MIMEICONLIST = \
     extension
 
 ICONDEPN = \
-    ../icons/hicolor/{16x16 32x32 48x48}/apps/{$(LAUNCHERLIST:s/qstart//)}.png \
+    ../icons/hicolor/{16x16 32x32 48x48}/apps/{$(LAUNCHERLIST:s/qstart//:s/javafilter//)}.png \
     ../icons/hicolor/{16x16 32x32 48x48}/mimetypes/{$(MIMEICONLIST)}.png \
-    ../icons/locolor/{16x16 32x32}/apps/{$(LAUNCHERLIST:s/qstart//)}.png \
+    ../icons/locolor/{16x16 32x32}/apps/{$(LAUNCHERLIST:s/qstart//:s/javafilter//)}.png \
     ../icons/locolor/{16x16 32x32}/mimetypes/{$(MIMEICONLIST)}.png
 
 # --- Targets ------------------------------------------------------
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index a1bd2b0359..7280d9dbae 100644
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -291,6 +291,7 @@ done
 /usr/share/applications/%unixfilename-base.desktop
 /usr/share/applications/%unixfilename-printeradmin.desktop
 /usr/share/applications/%unixfilename-startcenter.desktop
+/usr/share/applications/%unixfilename-javafilter.desktop
 /opt/gnome/share/mime-info/*.keys
 /opt/gnome/share/mime-info/*.mime
 /opt/kde3/share/mimelnk/application/*.desktop
-- 
cgit v1.2.3


From 7803089603345f402251c9eae05b33513884dd1f Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Fri, 5 Mar 2010 10:05:32 +0100
Subject: native287 #i109807# no more soffice.exe into msi database

---
 sysui/prj/d.lst | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sysui')

diff --git a/sysui/prj/d.lst b/sysui/prj/d.lst
index 126376930c..89ce910295 100644
--- a/sysui/prj/d.lst
+++ b/sysui/prj/d.lst
@@ -20,6 +20,9 @@ mkdir: %_DEST%\bin%_EXT%\desktop-integration\pkg
 ..\%__SRC%\bin\soquickstart.exe %_DEST%\bin%_EXT%\so\quickstart.exe
 ..\%__SRC%\bin\soquickstart.exe %_DEST%\bin%_EXT%\so\install_quickstart.exe
 
+..\%__SRC%\misc\ooo3_main_app.ico %_DEST%\bin%_EXT%\soffice.ico
+..\%__SRC%\misc\so9_main_app.ico %_DEST%\bin%_EXT%\so\soffice.ico
+
 ..\%__SRC%\misc\desktopshare\*.desktop %_DEST%\pck%_EXT%\*.desktop
 ..\%__SRC%\misc\PkgInfo %_DEST%\pck%_EXT%\PkgInfo
 ..\%__SRC%\misc\Info.plist %_DEST%\pck%_EXT%\Info.plist
-- 
cgit v1.2.3


From 31b5a96d1c247e85fde465fef7a71192c9a20b32 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Fri, 5 Mar 2010 10:20:54 +0100
Subject: native287 #i109807# no more soffice.exe into msi database

---
 sysui/prj/d.lst | 1 -
 1 file changed, 1 deletion(-)

(limited to 'sysui')

diff --git a/sysui/prj/d.lst b/sysui/prj/d.lst
index 89ce910295..c6019cea9a 100644
--- a/sysui/prj/d.lst
+++ b/sysui/prj/d.lst
@@ -21,7 +21,6 @@ mkdir: %_DEST%\bin%_EXT%\desktop-integration\pkg
 ..\%__SRC%\bin\soquickstart.exe %_DEST%\bin%_EXT%\so\install_quickstart.exe
 
 ..\%__SRC%\misc\ooo3_main_app.ico %_DEST%\bin%_EXT%\soffice.ico
-..\%__SRC%\misc\so9_main_app.ico %_DEST%\bin%_EXT%\so\soffice.ico
 
 ..\%__SRC%\misc\desktopshare\*.desktop %_DEST%\pck%_EXT%\*.desktop
 ..\%__SRC%\misc\PkgInfo %_DEST%\pck%_EXT%\PkgInfo
-- 
cgit v1.2.3


From a43b5febd6f36c3193bf48784bf2a33a7fdb665f Mon Sep 17 00:00:00 2001
From: Mikhail Voitenko <mav@openoffice.org>
Date: Fri, 8 Jan 2010 15:15:59 +0000
Subject: #i108159# new ODF- and nonODF-Icons

---
 sysui/desktop/icons/database.icns                   | Bin 0 -> 48416 bytes
 sysui/desktop/icons/database.ico                    | Bin 0 -> 295606 bytes
 sysui/desktop/icons/drawing-template.icns           | Bin 10935 -> 48006 bytes
 sysui/desktop/icons/drawing-template.ico            | Bin 0 -> 295606 bytes
 sysui/desktop/icons/drawing.icns                    | Bin 11290 -> 46878 bytes
 sysui/desktop/icons/drawing.ico                     | Bin 0 -> 295606 bytes
 sysui/desktop/icons/formula.icns                    | Bin 10380 -> 41940 bytes
 sysui/desktop/icons/formula.ico                     | Bin 0 -> 295606 bytes
 .../icons/hicolor/128x128/mimetypes/database.png    | Bin 0 -> 5874 bytes
 .../hicolor/128x128/mimetypes/drawing-template.png  | Bin 0 -> 6217 bytes
 .../icons/hicolor/128x128/mimetypes/drawing.png     | Bin 0 -> 6387 bytes
 .../icons/hicolor/128x128/mimetypes/formula.png     | Bin 0 -> 4353 bytes
 .../hicolor/128x128/mimetypes/master-document.png   | Bin 0 -> 2662 bytes
 .../hicolor/128x128/mimetypes/oasis-database.png    | Bin 15854 -> 6845 bytes
 .../128x128/mimetypes/oasis-drawing-template.png    | Bin 16120 -> 7206 bytes
 .../hicolor/128x128/mimetypes/oasis-drawing.png     | Bin 16063 -> 7373 bytes
 .../hicolor/128x128/mimetypes/oasis-formula.png     | Bin 12936 -> 5370 bytes
 .../128x128/mimetypes/oasis-master-document.png     | Bin 11992 -> 3703 bytes
 .../mimetypes/oasis-presentation-template.png       | Bin 13955 -> 6193 bytes
 .../128x128/mimetypes/oasis-presentation.png        | Bin 13654 -> 5434 bytes
 .../mimetypes/oasis-spreadsheet-template.png        | Bin 12792 -> 5753 bytes
 .../hicolor/128x128/mimetypes/oasis-spreadsheet.png | Bin 12338 -> 4617 bytes
 .../128x128/mimetypes/oasis-text-template.png       | Bin 12100 -> 6763 bytes
 .../icons/hicolor/128x128/mimetypes/oasis-text.png  | Bin 11770 -> 6847 bytes
 .../128x128/mimetypes/oasis-web-template.png        | Bin 17754 -> 3493 bytes
 .../128x128/mimetypes/presentation-template.png     | Bin 0 -> 5212 bytes
 .../hicolor/128x128/mimetypes/presentation.png      | Bin 0 -> 4459 bytes
 .../128x128/mimetypes/spreadsheet-template.png      | Bin 0 -> 4764 bytes
 .../icons/hicolor/128x128/mimetypes/spreadsheet.png | Bin 0 -> 3598 bytes
 .../hicolor/128x128/mimetypes/text-template.png     | Bin 0 -> 5772 bytes
 .../icons/hicolor/128x128/mimetypes/text.png        | Bin 0 -> 5817 bytes
 .../icons/hicolor/16x16/mimetypes/database.png      | Bin 291 -> 555 bytes
 .../hicolor/16x16/mimetypes/drawing-template.png    | Bin 348 -> 522 bytes
 .../icons/hicolor/16x16/mimetypes/drawing.png       | Bin 354 -> 555 bytes
 .../icons/hicolor/16x16/mimetypes/formula.png       | Bin 252 -> 562 bytes
 .../hicolor/16x16/mimetypes/master-document.png     | Bin 310 -> 450 bytes
 .../hicolor/16x16/mimetypes/oasis-database.png      | Bin 1009 -> 574 bytes
 .../16x16/mimetypes/oasis-drawing-template.png      | Bin 1094 -> 554 bytes
 .../icons/hicolor/16x16/mimetypes/oasis-drawing.png | Bin 1082 -> 572 bytes
 .../icons/hicolor/16x16/mimetypes/oasis-formula.png | Bin 1014 -> 580 bytes
 .../16x16/mimetypes/oasis-master-document.png       | Bin 929 -> 472 bytes
 .../16x16/mimetypes/oasis-presentation-template.png | Bin 1025 -> 532 bytes
 .../hicolor/16x16/mimetypes/oasis-presentation.png  | Bin 960 -> 441 bytes
 .../16x16/mimetypes/oasis-spreadsheet-template.png  | Bin 1018 -> 538 bytes
 .../hicolor/16x16/mimetypes/oasis-spreadsheet.png   | Bin 961 -> 436 bytes
 .../hicolor/16x16/mimetypes/oasis-text-template.png | Bin 986 -> 444 bytes
 .../icons/hicolor/16x16/mimetypes/oasis-text.png    | Bin 923 -> 420 bytes
 .../hicolor/16x16/mimetypes/oasis-web-template.png  | Bin 1023 -> 436 bytes
 .../16x16/mimetypes/presentation-template.png       | Bin 303 -> 515 bytes
 .../icons/hicolor/16x16/mimetypes/presentation.png  | Bin 302 -> 425 bytes
 .../16x16/mimetypes/spreadsheet-template.png        | Bin 287 -> 513 bytes
 .../icons/hicolor/16x16/mimetypes/spreadsheet.png   | Bin 271 -> 412 bytes
 .../icons/hicolor/16x16/mimetypes/text-template.png | Bin 240 -> 413 bytes
 .../desktop/icons/hicolor/16x16/mimetypes/text.png  | Bin 245 -> 392 bytes
 .../icons/hicolor/32x32/mimetypes/database.png      | Bin 529 -> 1319 bytes
 .../hicolor/32x32/mimetypes/drawing-template.png    | Bin 1344 -> 1307 bytes
 .../icons/hicolor/32x32/mimetypes/drawing.png       | Bin 1483 -> 1363 bytes
 .../icons/hicolor/32x32/mimetypes/formula.png       | Bin 1349 -> 1172 bytes
 .../hicolor/32x32/mimetypes/master-document.png     | Bin 1559 -> 909 bytes
 .../hicolor/32x32/mimetypes/oasis-database.png      | Bin 2922 -> 1497 bytes
 .../32x32/mimetypes/oasis-drawing-template.png      | Bin 2957 -> 1506 bytes
 .../icons/hicolor/32x32/mimetypes/oasis-drawing.png | Bin 2828 -> 1548 bytes
 .../icons/hicolor/32x32/mimetypes/oasis-formula.png | Bin 2622 -> 1346 bytes
 .../32x32/mimetypes/oasis-master-document.png       | Bin 2338 -> 1110 bytes
 .../32x32/mimetypes/oasis-presentation-template.png | Bin 2812 -> 1370 bytes
 .../hicolor/32x32/mimetypes/oasis-presentation.png  | Bin 2623 -> 1180 bytes
 .../32x32/mimetypes/oasis-spreadsheet-template.png  | Bin 2856 -> 1130 bytes
 .../hicolor/32x32/mimetypes/oasis-spreadsheet.png   | Bin 2618 -> 917 bytes
 .../hicolor/32x32/mimetypes/oasis-text-template.png | Bin 2575 -> 1153 bytes
 .../icons/hicolor/32x32/mimetypes/oasis-text.png    | Bin 2311 -> 1106 bytes
 .../hicolor/32x32/mimetypes/oasis-web-template.png  | Bin 2908 -> 966 bytes
 .../32x32/mimetypes/presentation-template.png       | Bin 1403 -> 1166 bytes
 .../icons/hicolor/32x32/mimetypes/presentation.png  | Bin 1515 -> 982 bytes
 .../32x32/mimetypes/spreadsheet-template.png        | Bin 1211 -> 919 bytes
 .../icons/hicolor/32x32/mimetypes/spreadsheet.png   | Bin 1301 -> 692 bytes
 .../icons/hicolor/32x32/mimetypes/text-template.png | Bin 1211 -> 941 bytes
 .../desktop/icons/hicolor/32x32/mimetypes/text.png  | Bin 1406 -> 903 bytes
 .../icons/hicolor/48x48/mimetypes/database.png      | Bin 652 -> 1862 bytes
 .../hicolor/48x48/mimetypes/drawing-template.png    | Bin 1819 -> 1923 bytes
 .../icons/hicolor/48x48/mimetypes/drawing.png       | Bin 1913 -> 1962 bytes
 .../icons/hicolor/48x48/mimetypes/formula.png       | Bin 1803 -> 1589 bytes
 .../hicolor/48x48/mimetypes/master-document.png     | Bin 2003 -> 1160 bytes
 .../hicolor/48x48/mimetypes/oasis-database.png      | Bin 5032 -> 2430 bytes
 .../48x48/mimetypes/oasis-drawing-template.png      | Bin 4919 -> 2482 bytes
 .../icons/hicolor/48x48/mimetypes/oasis-drawing.png | Bin 4935 -> 2518 bytes
 .../icons/hicolor/48x48/mimetypes/oasis-formula.png | Bin 4422 -> 2171 bytes
 .../48x48/mimetypes/oasis-master-document.png       | Bin 3808 -> 1741 bytes
 .../48x48/mimetypes/oasis-presentation-template.png | Bin 4650 -> 2376 bytes
 .../hicolor/48x48/mimetypes/oasis-presentation.png  | Bin 4611 -> 2125 bytes
 .../48x48/mimetypes/oasis-spreadsheet-template.png  | Bin 4409 -> 2400 bytes
 .../hicolor/48x48/mimetypes/oasis-spreadsheet.png   | Bin 4211 -> 2079 bytes
 .../hicolor/48x48/mimetypes/oasis-text-template.png | Bin 4023 -> 2125 bytes
 .../icons/hicolor/48x48/mimetypes/oasis-text.png    | Bin 3785 -> 2094 bytes
 .../hicolor/48x48/mimetypes/oasis-web-template.png  | Bin 4854 -> 1537 bytes
 .../48x48/mimetypes/presentation-template.png       | Bin 2044 -> 1792 bytes
 .../icons/hicolor/48x48/mimetypes/presentation.png  | Bin 2043 -> 1551 bytes
 .../48x48/mimetypes/spreadsheet-template.png        | Bin 1599 -> 1829 bytes
 .../icons/hicolor/48x48/mimetypes/spreadsheet.png   | Bin 1684 -> 1476 bytes
 .../icons/hicolor/48x48/mimetypes/text-template.png | Bin 1687 -> 1552 bytes
 .../desktop/icons/hicolor/48x48/mimetypes/text.png  | Bin 1764 -> 1525 bytes
 sysui/desktop/icons/master-document.icns            | Bin 11003 -> 41443 bytes
 sysui/desktop/icons/master-document.ico             | Bin 0 -> 295606 bytes
 sysui/desktop/icons/oasis-database.icns             | Bin 53983 -> 51503 bytes
 sysui/desktop/icons/oasis-database.ico              | Bin 0 -> 295606 bytes
 sysui/desktop/icons/oasis-drawing-template.icns     | Bin 53400 -> 51093 bytes
 sysui/desktop/icons/oasis-drawing-template.ico      | Bin 0 -> 295606 bytes
 sysui/desktop/icons/oasis-drawing.icns              | Bin 52603 -> 49965 bytes
 sysui/desktop/icons/oasis-drawing.ico               | Bin 0 -> 295606 bytes
 sysui/desktop/icons/oasis-formula.icns              | Bin 50335 -> 45027 bytes
 sysui/desktop/icons/oasis-formula.ico               | Bin 0 -> 295606 bytes
 sysui/desktop/icons/oasis-master-document.icns      | Bin 48904 -> 44531 bytes
 sysui/desktop/icons/oasis-master-document.ico       | Bin 0 -> 295606 bytes
 .../desktop/icons/oasis-presentation-template.icns  | Bin 51890 -> 47163 bytes
 sysui/desktop/icons/oasis-presentation-template.ico | Bin 0 -> 295606 bytes
 sysui/desktop/icons/oasis-presentation.icns         | Bin 51073 -> 43638 bytes
 sysui/desktop/icons/oasis-presentation.ico          | Bin 0 -> 295606 bytes
 sysui/desktop/icons/oasis-spreadsheet-template.icns | Bin 51919 -> 52924 bytes
 sysui/desktop/icons/oasis-spreadsheet-template.ico  | Bin 0 -> 295606 bytes
 sysui/desktop/icons/oasis-spreadsheet.icns          | Bin 50953 -> 51578 bytes
 sysui/desktop/icons/oasis-spreadsheet.ico           | Bin 0 -> 295606 bytes
 sysui/desktop/icons/oasis-text-template.icns        | Bin 49196 -> 49722 bytes
 sysui/desktop/icons/oasis-text-template.ico         | Bin 0 -> 295606 bytes
 sysui/desktop/icons/oasis-text.icns                 | Bin 47545 -> 48791 bytes
 sysui/desktop/icons/oasis-text.ico                  | Bin 0 -> 295606 bytes
 sysui/desktop/icons/oasis-web-template.icns         | Bin 55853 -> 42146 bytes
 sysui/desktop/icons/oasis-web-template.ico          | Bin 0 -> 295606 bytes
 sysui/desktop/icons/presentation-template.icns      | Bin 10690 -> 44076 bytes
 sysui/desktop/icons/presentation-template.ico       | Bin 0 -> 295606 bytes
 sysui/desktop/icons/presentation.icns               | Bin 10947 -> 40551 bytes
 sysui/desktop/icons/presentation.ico                | Bin 0 -> 295606 bytes
 sysui/desktop/icons/spreadsheet-template.icns       | Bin 10085 -> 49837 bytes
 sysui/desktop/icons/spreadsheet-template.ico        | Bin 0 -> 295606 bytes
 sysui/desktop/icons/spreadsheet.icns                | Bin 10457 -> 48491 bytes
 sysui/desktop/icons/spreadsheet.ico                 | Bin 0 -> 295606 bytes
 sysui/desktop/icons/text-template.icns              | Bin 10095 -> 46635 bytes
 sysui/desktop/icons/text-template.ico               | Bin 0 -> 295606 bytes
 sysui/desktop/icons/text.icns                       | Bin 10401 -> 45704 bytes
 sysui/desktop/icons/text.ico                        | Bin 0 -> 295606 bytes
 138 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 sysui/desktop/icons/database.icns
 create mode 100644 sysui/desktop/icons/database.ico
 create mode 100644 sysui/desktop/icons/drawing-template.ico
 create mode 100644 sysui/desktop/icons/drawing.ico
 create mode 100644 sysui/desktop/icons/formula.ico
 create mode 100644 sysui/desktop/icons/hicolor/128x128/mimetypes/database.png
 create mode 100644 sysui/desktop/icons/hicolor/128x128/mimetypes/drawing-template.png
 create mode 100644 sysui/desktop/icons/hicolor/128x128/mimetypes/drawing.png
 create mode 100644 sysui/desktop/icons/hicolor/128x128/mimetypes/formula.png
 create mode 100644 sysui/desktop/icons/hicolor/128x128/mimetypes/master-document.png
 create mode 100644 sysui/desktop/icons/hicolor/128x128/mimetypes/presentation-template.png
 create mode 100644 sysui/desktop/icons/hicolor/128x128/mimetypes/presentation.png
 create mode 100644 sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet-template.png
 create mode 100644 sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet.png
 create mode 100644 sysui/desktop/icons/hicolor/128x128/mimetypes/text-template.png
 create mode 100644 sysui/desktop/icons/hicolor/128x128/mimetypes/text.png
 create mode 100644 sysui/desktop/icons/master-document.ico
 create mode 100644 sysui/desktop/icons/oasis-database.ico
 create mode 100644 sysui/desktop/icons/oasis-drawing-template.ico
 create mode 100644 sysui/desktop/icons/oasis-drawing.ico
 create mode 100644 sysui/desktop/icons/oasis-formula.ico
 create mode 100644 sysui/desktop/icons/oasis-master-document.ico
 create mode 100644 sysui/desktop/icons/oasis-presentation-template.ico
 create mode 100644 sysui/desktop/icons/oasis-presentation.ico
 create mode 100644 sysui/desktop/icons/oasis-spreadsheet-template.ico
 create mode 100644 sysui/desktop/icons/oasis-spreadsheet.ico
 create mode 100644 sysui/desktop/icons/oasis-text-template.ico
 create mode 100644 sysui/desktop/icons/oasis-text.ico
 create mode 100644 sysui/desktop/icons/oasis-web-template.ico
 create mode 100644 sysui/desktop/icons/presentation-template.ico
 create mode 100644 sysui/desktop/icons/presentation.ico
 create mode 100644 sysui/desktop/icons/spreadsheet-template.ico
 create mode 100644 sysui/desktop/icons/spreadsheet.ico
 create mode 100644 sysui/desktop/icons/text-template.ico
 create mode 100644 sysui/desktop/icons/text.ico

(limited to 'sysui')

diff --git a/sysui/desktop/icons/database.icns b/sysui/desktop/icons/database.icns
new file mode 100644
index 0000000000..115dc859cd
Binary files /dev/null and b/sysui/desktop/icons/database.icns differ
diff --git a/sysui/desktop/icons/database.ico b/sysui/desktop/icons/database.ico
new file mode 100644
index 0000000000..171d39bb96
Binary files /dev/null and b/sysui/desktop/icons/database.ico differ
diff --git a/sysui/desktop/icons/drawing-template.icns b/sysui/desktop/icons/drawing-template.icns
index 359164f314..407484582f 100644
Binary files a/sysui/desktop/icons/drawing-template.icns and b/sysui/desktop/icons/drawing-template.icns differ
diff --git a/sysui/desktop/icons/drawing-template.ico b/sysui/desktop/icons/drawing-template.ico
new file mode 100644
index 0000000000..5b5a74e99f
Binary files /dev/null and b/sysui/desktop/icons/drawing-template.ico differ
diff --git a/sysui/desktop/icons/drawing.icns b/sysui/desktop/icons/drawing.icns
index 81777c7f92..5322625b05 100644
Binary files a/sysui/desktop/icons/drawing.icns and b/sysui/desktop/icons/drawing.icns differ
diff --git a/sysui/desktop/icons/drawing.ico b/sysui/desktop/icons/drawing.ico
new file mode 100644
index 0000000000..1065490a28
Binary files /dev/null and b/sysui/desktop/icons/drawing.ico differ
diff --git a/sysui/desktop/icons/formula.icns b/sysui/desktop/icons/formula.icns
index 61cd00a0e0..4620688c79 100644
Binary files a/sysui/desktop/icons/formula.icns and b/sysui/desktop/icons/formula.icns differ
diff --git a/sysui/desktop/icons/formula.ico b/sysui/desktop/icons/formula.ico
new file mode 100644
index 0000000000..e06aef1877
Binary files /dev/null and b/sysui/desktop/icons/formula.ico differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/database.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/database.png
new file mode 100644
index 0000000000..93b8e60cb2
Binary files /dev/null and b/sysui/desktop/icons/hicolor/128x128/mimetypes/database.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing-template.png
new file mode 100644
index 0000000000..15b80e0393
Binary files /dev/null and b/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing.png
new file mode 100644
index 0000000000..9d47f747df
Binary files /dev/null and b/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/formula.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/formula.png
new file mode 100644
index 0000000000..184dd0ca6c
Binary files /dev/null and b/sysui/desktop/icons/hicolor/128x128/mimetypes/formula.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/master-document.png
new file mode 100644
index 0000000000..acf19ff835
Binary files /dev/null and b/sysui/desktop/icons/hicolor/128x128/mimetypes/master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png
index 1429d82ce8..f95bbf137a 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png
index 4fdde3c34c..630a51ebb4 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png
index 7272482a04..82ac8d15bf 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png
index 9e4c72eab7..c838eaa128 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png
index 6f191e2cf0..640e2d9861 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png
index bf8229c1f5..c4954802e8 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png
index 2b3a5bb900..1d5acededb 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png
index 18c00ad4bb..01781db415 100644
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png
index ca480522d8..bc46714afa 100644
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png
index ef5b5dd7a5..569bd514fc 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png
index 178d4e26d9..b45244ac1a 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png
index 7edd66d369..8e6c4580e9 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png and b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation-template.png
new file mode 100644
index 0000000000..c8a3813188
Binary files /dev/null and b/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation.png
new file mode 100644
index 0000000000..2a0552eb62
Binary files /dev/null and b/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet-template.png
new file mode 100644
index 0000000000..cc7aa51bcb
Binary files /dev/null and b/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet.png
new file mode 100644
index 0000000000..c701fd7b5d
Binary files /dev/null and b/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/text-template.png
new file mode 100644
index 0000000000..652c1ce480
Binary files /dev/null and b/sysui/desktop/icons/hicolor/128x128/mimetypes/text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/text.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/text.png
new file mode 100644
index 0000000000..f881aca218
Binary files /dev/null and b/sysui/desktop/icons/hicolor/128x128/mimetypes/text.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png
index bbf485561e..fb32e00a1b 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png
index 74770d5d48..f045190f39 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png
index 30303797ba..3bd7b7d29c 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png
index 3eb7f884f9..e7e95875ef 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png
index c424e4fbf4..e442a0c098 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png
index 2f2d56dd0d..e4ae28570f 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png
index 94f4ac9ec5..eaad54fcdf 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png
index d65439afbc..3d66cc97eb 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png
index 9c628ce789..4cefbb690d 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png
index 137778d11f..12aab4a27c 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png
index 3153d8e3c7..9f281836d7 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png
index c642127abc..46942cba28 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png
index 689bb5aef4..4781bfc3a6 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png
index f51a29a854..abc38d4310 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png
index 1c20ed072b..9836814c6c 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png
index 8b095bfcba..06c1f30c8f 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png
index 795d92615e..01c04a0ea6 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png
index bb20d139e1..df1d5293a8 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png
index b82ddf7209..6803ae4c74 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png
index 3546349b59..5be785e40f 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png
index df164ff2ca..46c72242a0 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png
index 4d89528825..2827f29f3a 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png
index 6ff2517af4..c0d1cd3dcc 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png and b/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png
index 709903d46c..6e0a4b8f60 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png
index 76e5abdab9..a341632dab 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png
index 380c60a7df..4abe5c0f80 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png
index 37306ac617..d989593924 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png
index 1f3e799276..d4b033f4aa 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png
index ddfcd7d195..461bdf37b7 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png
index e742adc402..cdc2f2df0f 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png
index 8d78d91c18..55dda2143e 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png
index 302c7ab633..6b8f2f7322 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png
index fc032402b7..234bac461e 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png
index 03c96f8dd8..0125160652 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png
index 465583b9b0..fedeb0620a 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png
index 383906a70a..9d63063e67 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png
index 67da85c10b..020d95bef3 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png
index feb935cc1d..983b39e611 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png
index 571e6a0e4a..ac350cb409 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png
index e3bd788ea1..8e906f8be1 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png
index 0edabbc86f..5163f44103 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png
index 0eee1162ce..730f86f0ba 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png
index 158a63a58c..d81cd27dd9 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png
index f7352ab517..dc9bd083c2 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png
index cfba261023..7c738c21eb 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png
index 77f87e777b..1454b20fd5 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png and b/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png
index 224943b0e9..b385ed9db5 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png
index 043dd5dfae..b7da9bfa2c 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png
index 8857034ce2..85499fd219 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png
index 45f6d91938..bcc61b432b 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png
index 191a619f7c..7a7b869565 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png
index 2c2ffb86e6..77e684960e 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png
index 655a938f82..8cb4dd3fa7 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png
index c1bbdc4de6..258b3b2fc1 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png
index fbdede243a..f6508de453 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png
index d06b5ca8b1..1923fc9b9f 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png
index f77c9c6e9a..00d3113175 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png
index 7336f35303..635953e1c7 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png
index 850250c71a..7c4beda53d 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png
index 6f6328cece..4c407a0f5f 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png
index ac0d373a03..64b8694088 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png
index 8c2b714b29..0c04210a0c 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png
index a7cf8d0f7d..0ff92ec7a2 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png
index 2193c98931..d9651bf654 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png
index bd59fbbbaf..e058d25f82 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png
index 34c60c2819..5d5e46e21b 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png
index 6868f577ce..c352966320 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png
index 52a28fb3af..ad51297748 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png
index 7ead079cad..2a1707006d 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png and b/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png differ
diff --git a/sysui/desktop/icons/master-document.icns b/sysui/desktop/icons/master-document.icns
index 2089b9a660..33fdae3d47 100644
Binary files a/sysui/desktop/icons/master-document.icns and b/sysui/desktop/icons/master-document.icns differ
diff --git a/sysui/desktop/icons/master-document.ico b/sysui/desktop/icons/master-document.ico
new file mode 100644
index 0000000000..2c581f59a2
Binary files /dev/null and b/sysui/desktop/icons/master-document.ico differ
diff --git a/sysui/desktop/icons/oasis-database.icns b/sysui/desktop/icons/oasis-database.icns
index f64c6d2570..4d70286b0d 100644
Binary files a/sysui/desktop/icons/oasis-database.icns and b/sysui/desktop/icons/oasis-database.icns differ
diff --git a/sysui/desktop/icons/oasis-database.ico b/sysui/desktop/icons/oasis-database.ico
new file mode 100644
index 0000000000..3157568c32
Binary files /dev/null and b/sysui/desktop/icons/oasis-database.ico differ
diff --git a/sysui/desktop/icons/oasis-drawing-template.icns b/sysui/desktop/icons/oasis-drawing-template.icns
index bb357bae58..dcb55db8e9 100644
Binary files a/sysui/desktop/icons/oasis-drawing-template.icns and b/sysui/desktop/icons/oasis-drawing-template.icns differ
diff --git a/sysui/desktop/icons/oasis-drawing-template.ico b/sysui/desktop/icons/oasis-drawing-template.ico
new file mode 100644
index 0000000000..f98a2d6f44
Binary files /dev/null and b/sysui/desktop/icons/oasis-drawing-template.ico differ
diff --git a/sysui/desktop/icons/oasis-drawing.icns b/sysui/desktop/icons/oasis-drawing.icns
index 80adc9feaa..3802af5ef3 100644
Binary files a/sysui/desktop/icons/oasis-drawing.icns and b/sysui/desktop/icons/oasis-drawing.icns differ
diff --git a/sysui/desktop/icons/oasis-drawing.ico b/sysui/desktop/icons/oasis-drawing.ico
new file mode 100644
index 0000000000..b24f2dadbe
Binary files /dev/null and b/sysui/desktop/icons/oasis-drawing.ico differ
diff --git a/sysui/desktop/icons/oasis-formula.icns b/sysui/desktop/icons/oasis-formula.icns
index a7bded196c..657ea29eb9 100644
Binary files a/sysui/desktop/icons/oasis-formula.icns and b/sysui/desktop/icons/oasis-formula.icns differ
diff --git a/sysui/desktop/icons/oasis-formula.ico b/sysui/desktop/icons/oasis-formula.ico
new file mode 100644
index 0000000000..8ba738304e
Binary files /dev/null and b/sysui/desktop/icons/oasis-formula.ico differ
diff --git a/sysui/desktop/icons/oasis-master-document.icns b/sysui/desktop/icons/oasis-master-document.icns
index 1891c129ad..c39cb8963c 100644
Binary files a/sysui/desktop/icons/oasis-master-document.icns and b/sysui/desktop/icons/oasis-master-document.icns differ
diff --git a/sysui/desktop/icons/oasis-master-document.ico b/sysui/desktop/icons/oasis-master-document.ico
new file mode 100644
index 0000000000..2104eafef5
Binary files /dev/null and b/sysui/desktop/icons/oasis-master-document.ico differ
diff --git a/sysui/desktop/icons/oasis-presentation-template.icns b/sysui/desktop/icons/oasis-presentation-template.icns
index 337df2fa7b..57455ada70 100644
Binary files a/sysui/desktop/icons/oasis-presentation-template.icns and b/sysui/desktop/icons/oasis-presentation-template.icns differ
diff --git a/sysui/desktop/icons/oasis-presentation-template.ico b/sysui/desktop/icons/oasis-presentation-template.ico
new file mode 100644
index 0000000000..ef561b8215
Binary files /dev/null and b/sysui/desktop/icons/oasis-presentation-template.ico differ
diff --git a/sysui/desktop/icons/oasis-presentation.icns b/sysui/desktop/icons/oasis-presentation.icns
index 4b9ba4231f..cf768ac47b 100644
Binary files a/sysui/desktop/icons/oasis-presentation.icns and b/sysui/desktop/icons/oasis-presentation.icns differ
diff --git a/sysui/desktop/icons/oasis-presentation.ico b/sysui/desktop/icons/oasis-presentation.ico
new file mode 100644
index 0000000000..6f2c1602ef
Binary files /dev/null and b/sysui/desktop/icons/oasis-presentation.ico differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet-template.icns b/sysui/desktop/icons/oasis-spreadsheet-template.icns
index 2bae7e38a8..8235e52878 100644
Binary files a/sysui/desktop/icons/oasis-spreadsheet-template.icns and b/sysui/desktop/icons/oasis-spreadsheet-template.icns differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet-template.ico b/sysui/desktop/icons/oasis-spreadsheet-template.ico
new file mode 100644
index 0000000000..1124d9f433
Binary files /dev/null and b/sysui/desktop/icons/oasis-spreadsheet-template.ico differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet.icns b/sysui/desktop/icons/oasis-spreadsheet.icns
index 69b46c2a1d..5facf50dbc 100644
Binary files a/sysui/desktop/icons/oasis-spreadsheet.icns and b/sysui/desktop/icons/oasis-spreadsheet.icns differ
diff --git a/sysui/desktop/icons/oasis-spreadsheet.ico b/sysui/desktop/icons/oasis-spreadsheet.ico
new file mode 100644
index 0000000000..160ab0cbf3
Binary files /dev/null and b/sysui/desktop/icons/oasis-spreadsheet.ico differ
diff --git a/sysui/desktop/icons/oasis-text-template.icns b/sysui/desktop/icons/oasis-text-template.icns
index 1986a329cb..0f0fe3f897 100644
Binary files a/sysui/desktop/icons/oasis-text-template.icns and b/sysui/desktop/icons/oasis-text-template.icns differ
diff --git a/sysui/desktop/icons/oasis-text-template.ico b/sysui/desktop/icons/oasis-text-template.ico
new file mode 100644
index 0000000000..602124fabe
Binary files /dev/null and b/sysui/desktop/icons/oasis-text-template.ico differ
diff --git a/sysui/desktop/icons/oasis-text.icns b/sysui/desktop/icons/oasis-text.icns
index 21a44a91d6..2d031fe499 100644
Binary files a/sysui/desktop/icons/oasis-text.icns and b/sysui/desktop/icons/oasis-text.icns differ
diff --git a/sysui/desktop/icons/oasis-text.ico b/sysui/desktop/icons/oasis-text.ico
new file mode 100644
index 0000000000..d2bd594316
Binary files /dev/null and b/sysui/desktop/icons/oasis-text.ico differ
diff --git a/sysui/desktop/icons/oasis-web-template.icns b/sysui/desktop/icons/oasis-web-template.icns
index 66b0db74ad..ee6d299991 100644
Binary files a/sysui/desktop/icons/oasis-web-template.icns and b/sysui/desktop/icons/oasis-web-template.icns differ
diff --git a/sysui/desktop/icons/oasis-web-template.ico b/sysui/desktop/icons/oasis-web-template.ico
new file mode 100644
index 0000000000..63ac9f348f
Binary files /dev/null and b/sysui/desktop/icons/oasis-web-template.ico differ
diff --git a/sysui/desktop/icons/presentation-template.icns b/sysui/desktop/icons/presentation-template.icns
index 5cdf700d97..f4d01878b9 100644
Binary files a/sysui/desktop/icons/presentation-template.icns and b/sysui/desktop/icons/presentation-template.icns differ
diff --git a/sysui/desktop/icons/presentation-template.ico b/sysui/desktop/icons/presentation-template.ico
new file mode 100644
index 0000000000..471940369a
Binary files /dev/null and b/sysui/desktop/icons/presentation-template.ico differ
diff --git a/sysui/desktop/icons/presentation.icns b/sysui/desktop/icons/presentation.icns
index 3f6e268c68..091be5b136 100644
Binary files a/sysui/desktop/icons/presentation.icns and b/sysui/desktop/icons/presentation.icns differ
diff --git a/sysui/desktop/icons/presentation.ico b/sysui/desktop/icons/presentation.ico
new file mode 100644
index 0000000000..360ef79e18
Binary files /dev/null and b/sysui/desktop/icons/presentation.ico differ
diff --git a/sysui/desktop/icons/spreadsheet-template.icns b/sysui/desktop/icons/spreadsheet-template.icns
index 058a147b50..d2dfa84929 100644
Binary files a/sysui/desktop/icons/spreadsheet-template.icns and b/sysui/desktop/icons/spreadsheet-template.icns differ
diff --git a/sysui/desktop/icons/spreadsheet-template.ico b/sysui/desktop/icons/spreadsheet-template.ico
new file mode 100644
index 0000000000..be267eb21b
Binary files /dev/null and b/sysui/desktop/icons/spreadsheet-template.ico differ
diff --git a/sysui/desktop/icons/spreadsheet.icns b/sysui/desktop/icons/spreadsheet.icns
index 8594b9ba86..5c89354195 100644
Binary files a/sysui/desktop/icons/spreadsheet.icns and b/sysui/desktop/icons/spreadsheet.icns differ
diff --git a/sysui/desktop/icons/spreadsheet.ico b/sysui/desktop/icons/spreadsheet.ico
new file mode 100644
index 0000000000..a88045e9c1
Binary files /dev/null and b/sysui/desktop/icons/spreadsheet.ico differ
diff --git a/sysui/desktop/icons/text-template.icns b/sysui/desktop/icons/text-template.icns
index 0f7c006b42..8b9694ac75 100644
Binary files a/sysui/desktop/icons/text-template.icns and b/sysui/desktop/icons/text-template.icns differ
diff --git a/sysui/desktop/icons/text-template.ico b/sysui/desktop/icons/text-template.ico
new file mode 100644
index 0000000000..07986929a6
Binary files /dev/null and b/sysui/desktop/icons/text-template.ico differ
diff --git a/sysui/desktop/icons/text.icns b/sysui/desktop/icons/text.icns
index 169ef0961d..401d2b9dbf 100644
Binary files a/sysui/desktop/icons/text.icns and b/sysui/desktop/icons/text.icns differ
diff --git a/sysui/desktop/icons/text.ico b/sysui/desktop/icons/text.ico
new file mode 100644
index 0000000000..f19a7812b1
Binary files /dev/null and b/sysui/desktop/icons/text.ico differ
-- 
cgit v1.2.3


From 08847112a9a13956c078317f1f05dc0fc88a8639 Mon Sep 17 00:00:00 2001
From: Mikhail Voitenko <mav@openoffice.org>
Date: Fri, 15 Jan 2010 12:36:19 +0000
Subject: #i108159# ODF-Icons for OOo build

---
 sysui/desktop/icons/makefile.mk | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'sysui')

diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk
index f98b235d12..1af3f4367f 100644
--- a/sysui/desktop/icons/makefile.mk
+++ b/sysui/desktop/icons/makefile.mk
@@ -37,6 +37,33 @@ TARGET=icons
 # --- Targets -------------------------------------------------------------
 
 all: \
+    $(MISC)$/oasis-database.ico \
+    $(MISC)$/oasis-drawing-template.ico \
+    $(MISC)$/oasis-drawing.ico \
+    $(MISC)$/oasis-empty-template.ico \
+    $(MISC)$/oasis-empty-document.ico \
+    $(MISC)$/oasis-formula.ico \
+    $(MISC)$/oasis-master-document.ico \
+    $(MISC)$/oasis-presentation-template.ico \
+    $(MISC)$/oasis-presentation.ico \
+    $(MISC)$/oasis-spreadsheet-template.ico \
+    $(MISC)$/oasis-spreadsheet.ico \
+    $(MISC)$/oasis-text-template.ico \
+    $(MISC)$/oasis-text.ico \
+    $(MISC)$/oasis-web-template.ico \
+    $(MISC)$/database.ico \
+    $(MISC)$/drawing-template.ico \
+    $(MISC)$/drawing.ico \
+    $(MISC)$/empty-template.ico \
+    $(MISC)$/empty-document.ico \
+    $(MISC)$/formula.ico \
+    $(MISC)$/master-document.ico \
+    $(MISC)$/presentation-template.ico \
+    $(MISC)$/presentation.ico \
+    $(MISC)$/spreadsheet-template.ico \
+    $(MISC)$/spreadsheet.ico \
+    $(MISC)$/text-template.ico \
+    $(MISC)$/text.ico \
     $(MISC)$/ooo-base-app.ico \
     $(MISC)$/ooo-base-doc.ico \
     $(MISC)$/ooo-calc-app.ico \
-- 
cgit v1.2.3


From a01ba99fa081bbdb66912140761844f5469df2cb Mon Sep 17 00:00:00 2001
From: Mikhail Voitenko <mav@openoffice.org>
Date: Fri, 15 Jan 2010 16:33:00 +0000
Subject: #i108159# ODF-Icons for OOo build

---
 sysui/desktop/icons/oasis-empty-template.icns | Bin 0 -> 42146 bytes
 sysui/desktop/icons/oasis-empty-template.ico  | Bin 0 -> 295606 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 sysui/desktop/icons/oasis-empty-template.icns
 create mode 100644 sysui/desktop/icons/oasis-empty-template.ico

(limited to 'sysui')

diff --git a/sysui/desktop/icons/oasis-empty-template.icns b/sysui/desktop/icons/oasis-empty-template.icns
new file mode 100644
index 0000000000..ee6d299991
Binary files /dev/null and b/sysui/desktop/icons/oasis-empty-template.icns differ
diff --git a/sysui/desktop/icons/oasis-empty-template.ico b/sysui/desktop/icons/oasis-empty-template.ico
new file mode 100644
index 0000000000..63ac9f348f
Binary files /dev/null and b/sysui/desktop/icons/oasis-empty-template.ico differ
-- 
cgit v1.2.3


From 054f0f13e1d8e8f2593f29ec65acb4702cdbec21 Mon Sep 17 00:00:00 2001
From: Mikhail Voitenko <mav@openoffice.org>
Date: Fri, 15 Jan 2010 16:33:42 +0000
Subject: #i108159# ODF-Icons for OOo build

---
 sysui/desktop/icons/oasis-empty-document.icns | Bin 0 -> 40589 bytes
 sysui/desktop/icons/oasis-empty-document.ico  | Bin 0 -> 295606 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 sysui/desktop/icons/oasis-empty-document.icns
 create mode 100644 sysui/desktop/icons/oasis-empty-document.ico

(limited to 'sysui')

diff --git a/sysui/desktop/icons/oasis-empty-document.icns b/sysui/desktop/icons/oasis-empty-document.icns
new file mode 100644
index 0000000000..c52970324b
Binary files /dev/null and b/sysui/desktop/icons/oasis-empty-document.icns differ
diff --git a/sysui/desktop/icons/oasis-empty-document.ico b/sysui/desktop/icons/oasis-empty-document.ico
new file mode 100644
index 0000000000..a12b54c2a2
Binary files /dev/null and b/sysui/desktop/icons/oasis-empty-document.ico differ
-- 
cgit v1.2.3


From 5cd1b8d9b2b085d8a6b37074f343ba22414d1470 Mon Sep 17 00:00:00 2001
From: Mikhail Voitenko <mav@openoffice.org>
Date: Fri, 15 Jan 2010 16:35:06 +0000
Subject: #i108159# ODF-Icons for OOo build

---
 sysui/desktop/icons/empty-document.icns | Bin 50465 -> 37502 bytes
 sysui/desktop/icons/empty-document.ico  | Bin 0 -> 295606 bytes
 sysui/desktop/icons/empty-template.icns | Bin 47059 -> 39059 bytes
 sysui/desktop/icons/empty-template.ico  | Bin 0 -> 295606 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 sysui/desktop/icons/empty-document.ico
 create mode 100644 sysui/desktop/icons/empty-template.ico

(limited to 'sysui')

diff --git a/sysui/desktop/icons/empty-document.icns b/sysui/desktop/icons/empty-document.icns
index 18d1133eb6..ab676f6ef8 100644
Binary files a/sysui/desktop/icons/empty-document.icns and b/sysui/desktop/icons/empty-document.icns differ
diff --git a/sysui/desktop/icons/empty-document.ico b/sysui/desktop/icons/empty-document.ico
new file mode 100644
index 0000000000..4115c30896
Binary files /dev/null and b/sysui/desktop/icons/empty-document.ico differ
diff --git a/sysui/desktop/icons/empty-template.icns b/sysui/desktop/icons/empty-template.icns
index 034d30bccb..50e63b9425 100644
Binary files a/sysui/desktop/icons/empty-template.icns and b/sysui/desktop/icons/empty-template.icns differ
diff --git a/sysui/desktop/icons/empty-template.ico b/sysui/desktop/icons/empty-template.ico
new file mode 100644
index 0000000000..dec147610a
Binary files /dev/null and b/sysui/desktop/icons/empty-template.ico differ
-- 
cgit v1.2.3


From 76c70f1c7edf36928a83a9255e36d3ddb90e1615 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Tue, 12 Jan 2010 18:49:59 +0100
Subject: sb118: #i108269# first step of removing tcsh support

---
 connectivity/util/makefile.mk       | 2 --
 officecfg/util/makefile.mk          | 2 --
 readlicense_oo/util/makefile.pmk    | 4 ----
 sysui/desktop/slackware/makefile.mk | 6 +-----
 4 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'sysui')

diff --git a/connectivity/util/makefile.mk b/connectivity/util/makefile.mk
index 805aa0110f..e446a371c5 100755
--- a/connectivity/util/makefile.mk
+++ b/connectivity/util/makefile.mk
@@ -70,9 +70,7 @@ $(MISC)$/$(TARGET)_delzip :
 
 $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip : $(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS)
     cd $(DIR_FILTERCFGOUT)$/$(@:b:s/fcfg_drivers_//) && zip -ru ..$/..$/..$/bin$/fcfg_drivers_$(@:b:s/fcfg_drivers_//).zip org/*
-.IF "$(USE_SHELL)"!="4nt"
     $(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 
 ALLTAR: \
     $(MISC)$/$(TARGET)_delzip \
diff --git a/officecfg/util/makefile.mk b/officecfg/util/makefile.mk
index d022c92537..f9a44d2e25 100644
--- a/officecfg/util/makefile.mk
+++ b/officecfg/util/makefile.mk
@@ -45,9 +45,7 @@ $(MISC)$/$(TARGET)_delzip :
 
 $(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip
     cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru ..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/*
-.IF "$(USE_SHELL)"!="4nt"
     $(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 
 ALLTAR: \
     $(MISC)$/$(TARGET)_delzip \
diff --git a/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk
index 1b2e1de513..ebad08c363 100755
--- a/readlicense_oo/util/makefile.pmk
+++ b/readlicense_oo/util/makefile.pmk
@@ -55,11 +55,7 @@ $(COMMONMISC)$/readme.dtd : ..$/readme.dtd
 virtual : $(MERGEDXRM) $(COMMONMISC)$/readme.dtd $(PRJ)$/docs/readme.xsl
 
 $(MISC)$/readme_text.xsl : virtual
-.IF "$(USE_SHELL)"!="4nt"
      $(SED) 's#method="html".*>#method="text"/>#' < ..$/readme.xsl > $@
-.ELSE			# "$(USE_SHELL)"!="4nt"
-    $(SED) "s/method=\"html\".*>/method=\"text\"\/>/" < ..$/readme.xsl > $@
-.ENDIF			# "$(USE_SHELL)"!="4nt"
 
 $(MISC)$/$(GUI)$/$(eq,$(GUI),WNT readme README)_%.html : 'virtual'
     @@-$(MKDIRHIER) $(@:d)
diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk
index 8d8fc071d2..d689c1d38c 100644
--- a/sysui/desktop/slackware/makefile.mk
+++ b/sysui/desktop/slackware/makefile.mk
@@ -46,10 +46,6 @@ TARGET=slackware
 
 MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.3-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
 
-.IF "$(USE_SHELL)"=="bash"
-ECHOPARAM=-e
-.ENDIF
-
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
@@ -78,7 +74,7 @@ $(MISC)/$(TARGET)/usr/share/applications/ :
     @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//)) )" >> $@
     @echo "( cd usr/bin ; rm -rf soffice )" >> $@
     @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))/program/soffice soffice )" >> $@
-    @echo $(ECHOPARAM) $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.3//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))-$i )") >> $@
+    @echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.3//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.3//))-$i )") >> $@
     @cat $< >> $@
 
 %$/install$/slack-desc : slack-desc
-- 
cgit v1.2.3


From 6586ac02d9223cf1616016fbad881f08bab3029f Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Fri, 12 Mar 2010 14:10:52 +0100
Subject: native0: #161756# New splash screen, about box and icons for OOo

---
 desktop/zipintro/makefile.mk                       |  13 ++++++++-----
 sysui/desktop/icons/hicolor/128x128/apps/base.png  | Bin 16745 -> 17674 bytes
 sysui/desktop/icons/hicolor/128x128/apps/calc.png  | Bin 12968 -> 15582 bytes
 sysui/desktop/icons/hicolor/128x128/apps/draw.png  | Bin 16732 -> 16479 bytes
 .../desktop/icons/hicolor/128x128/apps/impress.png | Bin 14614 -> 17785 bytes
 sysui/desktop/icons/hicolor/128x128/apps/main.png  | Bin 12442 -> 15601 bytes
 sysui/desktop/icons/hicolor/128x128/apps/math.png  | Bin 12934 -> 15536 bytes
 .../desktop/icons/hicolor/128x128/apps/writer.png  | Bin 11861 -> 14510 bytes
 sysui/desktop/icons/hicolor/16x16/apps/base.png    | Bin 3618 -> 869 bytes
 sysui/desktop/icons/hicolor/16x16/apps/calc.png    | Bin 3629 -> 779 bytes
 sysui/desktop/icons/hicolor/16x16/apps/draw.png    | Bin 3606 -> 875 bytes
 sysui/desktop/icons/hicolor/16x16/apps/impress.png | Bin 3608 -> 837 bytes
 sysui/desktop/icons/hicolor/16x16/apps/main.png    | Bin 0 -> 893 bytes
 sysui/desktop/icons/hicolor/16x16/apps/math.png    | Bin 3607 -> 791 bytes
 sysui/desktop/icons/hicolor/16x16/apps/writer.png  | Bin 3586 -> 776 bytes
 sysui/desktop/icons/hicolor/32x32/apps/base.png    | Bin 3153 -> 2594 bytes
 sysui/desktop/icons/hicolor/32x32/apps/calc.png    | Bin 2731 -> 2258 bytes
 sysui/desktop/icons/hicolor/32x32/apps/draw.png    | Bin 3147 -> 2491 bytes
 sysui/desktop/icons/hicolor/32x32/apps/impress.png | Bin 2903 -> 2576 bytes
 sysui/desktop/icons/hicolor/32x32/apps/main.png    | Bin 0 -> 2429 bytes
 sysui/desktop/icons/hicolor/32x32/apps/math.png    | Bin 2715 -> 2371 bytes
 sysui/desktop/icons/hicolor/32x32/apps/writer.png  | Bin 2485 -> 2158 bytes
 sysui/desktop/icons/hicolor/48x48/apps/base.png    | Bin 5196 -> 4740 bytes
 sysui/desktop/icons/hicolor/48x48/apps/calc.png    | Bin 4319 -> 4298 bytes
 sysui/desktop/icons/hicolor/48x48/apps/draw.png    | Bin 5207 -> 4415 bytes
 sysui/desktop/icons/hicolor/48x48/apps/impress.png | Bin 4974 -> 4672 bytes
 sysui/desktop/icons/hicolor/48x48/apps/main.png    | Bin 0 -> 4184 bytes
 sysui/desktop/icons/hicolor/48x48/apps/math.png    | Bin 4489 -> 4263 bytes
 sysui/desktop/icons/hicolor/48x48/apps/writer.png  | Bin 3938 -> 3983 bytes
 sysui/desktop/icons/main.icns                      | Bin 45712 -> 51889 bytes
 sysui/desktop/icons/ooo3_base_app.ico              | Bin 295606 -> 295606 bytes
 sysui/desktop/icons/ooo3_calc_app.ico              | Bin 295606 -> 295606 bytes
 sysui/desktop/icons/ooo3_draw_app.ico              | Bin 295606 -> 295606 bytes
 sysui/desktop/icons/ooo3_impress_app.ico           | Bin 295606 -> 295606 bytes
 sysui/desktop/icons/ooo3_main_app.ico              | Bin 295606 -> 295606 bytes
 sysui/desktop/icons/ooo3_math_app.ico              | Bin 295606 -> 295606 bytes
 sysui/desktop/icons/ooo3_writer_app.ico            | Bin 295606 -> 295606 bytes
 37 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100755 sysui/desktop/icons/hicolor/16x16/apps/main.png
 create mode 100755 sysui/desktop/icons/hicolor/32x32/apps/main.png
 create mode 100755 sysui/desktop/icons/hicolor/48x48/apps/main.png
 mode change 100644 => 100755 sysui/desktop/icons/main.icns
 mode change 100644 => 100755 sysui/desktop/icons/ooo3_base_app.ico
 mode change 100644 => 100755 sysui/desktop/icons/ooo3_calc_app.ico
 mode change 100644 => 100755 sysui/desktop/icons/ooo3_draw_app.ico
 mode change 100644 => 100755 sysui/desktop/icons/ooo3_impress_app.ico
 mode change 100644 => 100755 sysui/desktop/icons/ooo3_main_app.ico
 mode change 100644 => 100755 sysui/desktop/icons/ooo3_math_app.ico
 mode change 100644 => 100755 sysui/desktop/icons/ooo3_writer_app.ico

(limited to 'sysui')

diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index 6a1ff592d6..a382d51e79 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -37,16 +37,16 @@ DEFAULT_FLAVOURS=dev dev_nologo nologo broffice dev_broffice nologo_broffice nol
 
 ZIP1LIST= \
     $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS))
+    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS))
 ZIP2LIST= \
     $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_nologo$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS))
+    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS))
 ZIP3LIST= \
     $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/nologo$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS))
+    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS))
 ZIP4LIST= \
-    $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS))
+    $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.png $(INTRO_BITMAPS)) \
+    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS))
 ZIP5LIST= \
     $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \
     $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.bmp $(ABOUT_BITMAPS))
@@ -129,3 +129,6 @@ $(MISC)$/%.bmp : $(SOLARSRC)$/%.bmp
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
+$(MISC)$/%.png : $(SOLARSRC)$/%.png
+    @@-$(MKDIRHIER) $(@:d)
+    $(COPY) $< $@
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/base.png b/sysui/desktop/icons/hicolor/128x128/apps/base.png
index 42b027626c..398c2f058d 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/base.png and b/sysui/desktop/icons/hicolor/128x128/apps/base.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/calc.png b/sysui/desktop/icons/hicolor/128x128/apps/calc.png
index 368fb03e2d..8156308833 100644
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/calc.png and b/sysui/desktop/icons/hicolor/128x128/apps/calc.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/draw.png b/sysui/desktop/icons/hicolor/128x128/apps/draw.png
index 72b67c8312..3f71b25fe1 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/draw.png and b/sysui/desktop/icons/hicolor/128x128/apps/draw.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/impress.png b/sysui/desktop/icons/hicolor/128x128/apps/impress.png
index 32ad785e16..b62b449e57 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/impress.png and b/sysui/desktop/icons/hicolor/128x128/apps/impress.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/main.png b/sysui/desktop/icons/hicolor/128x128/apps/main.png
index fd68a10960..1b51a60bdd 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/main.png and b/sysui/desktop/icons/hicolor/128x128/apps/main.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/math.png b/sysui/desktop/icons/hicolor/128x128/apps/math.png
index 79e71ce223..d37c98aa40 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/math.png and b/sysui/desktop/icons/hicolor/128x128/apps/math.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/writer.png b/sysui/desktop/icons/hicolor/128x128/apps/writer.png
index 0d057fa4ba..b991a6d2e2 100755
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/writer.png and b/sysui/desktop/icons/hicolor/128x128/apps/writer.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/base.png b/sysui/desktop/icons/hicolor/16x16/apps/base.png
index 3a08ee1182..57a4477cc6 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/base.png and b/sysui/desktop/icons/hicolor/16x16/apps/base.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/calc.png b/sysui/desktop/icons/hicolor/16x16/apps/calc.png
index 2dc540711b..78f923d0ed 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/calc.png and b/sysui/desktop/icons/hicolor/16x16/apps/calc.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/draw.png b/sysui/desktop/icons/hicolor/16x16/apps/draw.png
index afc037060d..7779dd46f3 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/draw.png and b/sysui/desktop/icons/hicolor/16x16/apps/draw.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/impress.png b/sysui/desktop/icons/hicolor/16x16/apps/impress.png
index f1957da748..ff07597b1d 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/impress.png and b/sysui/desktop/icons/hicolor/16x16/apps/impress.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/main.png b/sysui/desktop/icons/hicolor/16x16/apps/main.png
new file mode 100755
index 0000000000..3aa8f08a8c
Binary files /dev/null and b/sysui/desktop/icons/hicolor/16x16/apps/main.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/math.png b/sysui/desktop/icons/hicolor/16x16/apps/math.png
index de1488226a..10c71e6caa 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/math.png and b/sysui/desktop/icons/hicolor/16x16/apps/math.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/writer.png b/sysui/desktop/icons/hicolor/16x16/apps/writer.png
index 8304269862..2b82110e18 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/writer.png and b/sysui/desktop/icons/hicolor/16x16/apps/writer.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/base.png b/sysui/desktop/icons/hicolor/32x32/apps/base.png
index f30fe4a53c..f4772d75da 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/base.png and b/sysui/desktop/icons/hicolor/32x32/apps/base.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/calc.png b/sysui/desktop/icons/hicolor/32x32/apps/calc.png
index 4e7e423d71..a1eae7b37a 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/calc.png and b/sysui/desktop/icons/hicolor/32x32/apps/calc.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/draw.png b/sysui/desktop/icons/hicolor/32x32/apps/draw.png
index f34faf5b51..4dc928a351 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/draw.png and b/sysui/desktop/icons/hicolor/32x32/apps/draw.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/impress.png b/sysui/desktop/icons/hicolor/32x32/apps/impress.png
index 7b8ec6432f..9abced7df4 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/impress.png and b/sysui/desktop/icons/hicolor/32x32/apps/impress.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/main.png b/sysui/desktop/icons/hicolor/32x32/apps/main.png
new file mode 100755
index 0000000000..296c6f4c58
Binary files /dev/null and b/sysui/desktop/icons/hicolor/32x32/apps/main.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/math.png b/sysui/desktop/icons/hicolor/32x32/apps/math.png
index 6c3c3b68f0..146a7dea71 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/math.png and b/sysui/desktop/icons/hicolor/32x32/apps/math.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/writer.png b/sysui/desktop/icons/hicolor/32x32/apps/writer.png
index 8a59432558..97b9d3f5cf 100644
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/writer.png and b/sysui/desktop/icons/hicolor/32x32/apps/writer.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/base.png b/sysui/desktop/icons/hicolor/48x48/apps/base.png
index d68e712812..382ad3e6ec 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/base.png and b/sysui/desktop/icons/hicolor/48x48/apps/base.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/calc.png b/sysui/desktop/icons/hicolor/48x48/apps/calc.png
index 33690ba3c2..d94aae38fb 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/calc.png and b/sysui/desktop/icons/hicolor/48x48/apps/calc.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/draw.png b/sysui/desktop/icons/hicolor/48x48/apps/draw.png
index 2acb57226d..1a2d252c7c 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/draw.png and b/sysui/desktop/icons/hicolor/48x48/apps/draw.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/impress.png b/sysui/desktop/icons/hicolor/48x48/apps/impress.png
index a46324e006..35d3b25c55 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/impress.png and b/sysui/desktop/icons/hicolor/48x48/apps/impress.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/main.png b/sysui/desktop/icons/hicolor/48x48/apps/main.png
new file mode 100755
index 0000000000..86bcf59955
Binary files /dev/null and b/sysui/desktop/icons/hicolor/48x48/apps/main.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/math.png b/sysui/desktop/icons/hicolor/48x48/apps/math.png
index 691ef832b1..3572d76b6b 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/math.png and b/sysui/desktop/icons/hicolor/48x48/apps/math.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/writer.png b/sysui/desktop/icons/hicolor/48x48/apps/writer.png
index 9ae7402374..8041a209dd 100644
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/writer.png and b/sysui/desktop/icons/hicolor/48x48/apps/writer.png differ
diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns
old mode 100644
new mode 100755
index c7ee5d7552..8357c09c0c
Binary files a/sysui/desktop/icons/main.icns and b/sysui/desktop/icons/main.icns differ
diff --git a/sysui/desktop/icons/ooo3_base_app.ico b/sysui/desktop/icons/ooo3_base_app.ico
old mode 100644
new mode 100755
index c728e83027..ba96b79876
Binary files a/sysui/desktop/icons/ooo3_base_app.ico and b/sysui/desktop/icons/ooo3_base_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_calc_app.ico b/sysui/desktop/icons/ooo3_calc_app.ico
old mode 100644
new mode 100755
index f46433ec08..c960415415
Binary files a/sysui/desktop/icons/ooo3_calc_app.ico and b/sysui/desktop/icons/ooo3_calc_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_draw_app.ico b/sysui/desktop/icons/ooo3_draw_app.ico
old mode 100644
new mode 100755
index 74abe03ace..6e00cb8937
Binary files a/sysui/desktop/icons/ooo3_draw_app.ico and b/sysui/desktop/icons/ooo3_draw_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_impress_app.ico b/sysui/desktop/icons/ooo3_impress_app.ico
old mode 100644
new mode 100755
index 1eed9c1f17..23ee3ecc5e
Binary files a/sysui/desktop/icons/ooo3_impress_app.ico and b/sysui/desktop/icons/ooo3_impress_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_main_app.ico b/sysui/desktop/icons/ooo3_main_app.ico
old mode 100644
new mode 100755
index f858d92bdd..98fcea3748
Binary files a/sysui/desktop/icons/ooo3_main_app.ico and b/sysui/desktop/icons/ooo3_main_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_math_app.ico b/sysui/desktop/icons/ooo3_math_app.ico
old mode 100644
new mode 100755
index a712362795..605814c96e
Binary files a/sysui/desktop/icons/ooo3_math_app.ico and b/sysui/desktop/icons/ooo3_math_app.ico differ
diff --git a/sysui/desktop/icons/ooo3_writer_app.ico b/sysui/desktop/icons/ooo3_writer_app.ico
old mode 100644
new mode 100755
index 3e7efa610b..005bd58766
Binary files a/sysui/desktop/icons/ooo3_writer_app.ico and b/sysui/desktop/icons/ooo3_writer_app.ico differ
-- 
cgit v1.2.3


From 7d9e49ae2bfa0d309ec4caed947115746f13f3e7 Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Mon, 15 Mar 2010 15:06:28 +0100
Subject: native0: #161779# New icons for the quickstart application

---
 sysui/desktop/icons/makefile.mk                |   2 +-
 sysui/desktop/icons/so7-base-doc.ico           | Bin
 sysui/desktop/icons/so7-calc-doc.ico           | Bin
 sysui/desktop/icons/so7-calc-tem.ico           | Bin
 sysui/desktop/icons/so7-chart-doc.ico          | Bin
 sysui/desktop/icons/so7-draw-doc.ico           | Bin
 sysui/desktop/icons/so7-draw-tem.ico           | Bin
 sysui/desktop/icons/so7-impress-doc.ico        | Bin
 sysui/desktop/icons/so7-impress-tem.ico        | Bin
 sysui/desktop/icons/so7-master-doc.ico         | Bin
 sysui/desktop/icons/so7-math-doc.ico           | Bin
 sysui/desktop/icons/so7-writer-doc.ico         | Bin
 sysui/desktop/icons/so7-writer-tem.ico         | Bin
 sysui/desktop/icons/so8-base-app.ico           | Bin
 sysui/desktop/icons/so8-base-doc.ico           | Bin
 sysui/desktop/icons/so8-calc-app.ico           | Bin
 sysui/desktop/icons/so8-calc-doc.ico           | Bin
 sysui/desktop/icons/so8-calc-tem.ico           | Bin
 sysui/desktop/icons/so8-chart-doc.ico          | Bin
 sysui/desktop/icons/so8-configuration.ico      | Bin
 sysui/desktop/icons/so8-draw-app.ico           | Bin
 sysui/desktop/icons/so8-draw-doc.ico           | Bin
 sysui/desktop/icons/so8-draw-tem.ico           | Bin
 sysui/desktop/icons/so8-empty-doc.ico          | Bin
 sysui/desktop/icons/so8-empty-tem.ico          | Bin
 sysui/desktop/icons/so8-image-doc.ico          | Bin
 sysui/desktop/icons/so8-impress-app.ico        | Bin
 sysui/desktop/icons/so8-impress-doc.ico        | Bin
 sysui/desktop/icons/so8-impress-tem.ico        | Bin
 sysui/desktop/icons/so8-macro-doc.ico          | Bin
 sysui/desktop/icons/so8-main-app.ico           | Bin
 sysui/desktop/icons/so8-master-doc.ico         | Bin
 sysui/desktop/icons/so8-math-app.ico           | Bin
 sysui/desktop/icons/so8-math-doc.ico           | Bin
 sysui/desktop/icons/so8-open.ico               | Bin
 sysui/desktop/icons/so8-printer.ico            | Bin
 sysui/desktop/icons/so8-web-doc.ico            | Bin
 sysui/desktop/icons/so8-writer-app.ico         | Bin
 sysui/desktop/icons/so8-writer-doc.ico         | Bin
 sysui/desktop/icons/so8-writer-tem.ico         | Bin
 sysui/desktop/icons/so9_base_app.ico           | Bin 295606 -> 295606 bytes
 sysui/desktop/icons/so9_base_doc.ico           | Bin
 sysui/desktop/icons/so9_calc_app.ico           | Bin 295606 -> 295606 bytes
 sysui/desktop/icons/so9_calc_doc.ico           | Bin
 sysui/desktop/icons/so9_calc_tem.ico           | Bin
 sysui/desktop/icons/so9_chart_doc.ico          | Bin
 sysui/desktop/icons/so9_draw_app.ico           | Bin 295606 -> 295606 bytes
 sysui/desktop/icons/so9_draw_doc.ico           | Bin
 sysui/desktop/icons/so9_draw_tem.ico           | Bin
 sysui/desktop/icons/so9_empty_doc.ico          | Bin
 sysui/desktop/icons/so9_empty_tem.ico          | Bin
 sysui/desktop/icons/so9_global_doc.ico         | Bin
 sysui/desktop/icons/so9_html_doc.ico           | Bin
 sysui/desktop/icons/so9_impress_app.ico        | Bin 295606 -> 295606 bytes
 sysui/desktop/icons/so9_impress_doc.ico        | Bin
 sysui/desktop/icons/so9_impress_tem.ico        | Bin
 sysui/desktop/icons/so9_macro_doc.ico          | Bin
 sysui/desktop/icons/so9_main_app.ico           | Bin 295606 -> 295606 bytes
 sysui/desktop/icons/so9_math_app.ico           | Bin 295606 -> 295606 bytes
 sysui/desktop/icons/so9_math_doc.ico           | Bin
 sysui/desktop/icons/so9_writer_app.ico         | Bin 295606 -> 295606 bytes
 sysui/desktop/icons/so9_writer_doc.ico         | Bin
 sysui/desktop/icons/so9_writer_tem.ico         | Bin
 sysui/source/win32/QuickStart/so/QuickStart.rc |  10 +++++-----
 64 files changed, 6 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 sysui/desktop/icons/so7-base-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so7-calc-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so7-calc-tem.ico
 mode change 100644 => 100755 sysui/desktop/icons/so7-chart-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so7-draw-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so7-draw-tem.ico
 mode change 100644 => 100755 sysui/desktop/icons/so7-impress-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so7-impress-tem.ico
 mode change 100644 => 100755 sysui/desktop/icons/so7-master-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so7-math-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so7-writer-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so7-writer-tem.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-base-app.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-base-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-calc-app.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-calc-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-calc-tem.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-chart-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-configuration.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-draw-app.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-draw-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-draw-tem.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-empty-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-empty-tem.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-image-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-impress-app.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-impress-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-impress-tem.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-macro-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-main-app.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-master-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-math-app.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-math-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-open.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-printer.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-web-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-writer-app.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-writer-doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so8-writer-tem.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_base_app.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_base_doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_calc_app.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_calc_doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_calc_tem.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_chart_doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_draw_app.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_draw_doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_draw_tem.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_empty_doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_empty_tem.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_global_doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_html_doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_impress_app.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_impress_doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_impress_tem.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_macro_doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_main_app.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_math_app.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_math_doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_writer_app.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_writer_doc.ico
 mode change 100644 => 100755 sysui/desktop/icons/so9_writer_tem.ico

(limited to 'sysui')

diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk
index 1af3f4367f..a533c24899 100644
--- a/sysui/desktop/icons/makefile.mk
+++ b/sysui/desktop/icons/makefile.mk
@@ -188,7 +188,7 @@ all: \
     $(MISC)$/so7-math-doc.ico \
     $(MISC)$/so7-writer-doc.ico \
     $(MISC)$/so7-writer-tem.ico \
-    $(MISC)$/oxt-extension.ico
+    $(MISC)$/oxt-extension.ico	
 
 $(MISC)$/%.ico: %.ico
     $(COPY) $< $@
diff --git a/sysui/desktop/icons/so7-base-doc.ico b/sysui/desktop/icons/so7-base-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so7-calc-doc.ico b/sysui/desktop/icons/so7-calc-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so7-calc-tem.ico b/sysui/desktop/icons/so7-calc-tem.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so7-chart-doc.ico b/sysui/desktop/icons/so7-chart-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so7-draw-doc.ico b/sysui/desktop/icons/so7-draw-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so7-draw-tem.ico b/sysui/desktop/icons/so7-draw-tem.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so7-impress-doc.ico b/sysui/desktop/icons/so7-impress-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so7-impress-tem.ico b/sysui/desktop/icons/so7-impress-tem.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so7-master-doc.ico b/sysui/desktop/icons/so7-master-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so7-math-doc.ico b/sysui/desktop/icons/so7-math-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so7-writer-doc.ico b/sysui/desktop/icons/so7-writer-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so7-writer-tem.ico b/sysui/desktop/icons/so7-writer-tem.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-base-app.ico b/sysui/desktop/icons/so8-base-app.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-base-doc.ico b/sysui/desktop/icons/so8-base-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-calc-app.ico b/sysui/desktop/icons/so8-calc-app.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-calc-doc.ico b/sysui/desktop/icons/so8-calc-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-calc-tem.ico b/sysui/desktop/icons/so8-calc-tem.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-chart-doc.ico b/sysui/desktop/icons/so8-chart-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-configuration.ico b/sysui/desktop/icons/so8-configuration.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-draw-app.ico b/sysui/desktop/icons/so8-draw-app.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-draw-doc.ico b/sysui/desktop/icons/so8-draw-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-draw-tem.ico b/sysui/desktop/icons/so8-draw-tem.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-empty-doc.ico b/sysui/desktop/icons/so8-empty-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-empty-tem.ico b/sysui/desktop/icons/so8-empty-tem.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-image-doc.ico b/sysui/desktop/icons/so8-image-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-impress-app.ico b/sysui/desktop/icons/so8-impress-app.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-impress-doc.ico b/sysui/desktop/icons/so8-impress-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-impress-tem.ico b/sysui/desktop/icons/so8-impress-tem.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-macro-doc.ico b/sysui/desktop/icons/so8-macro-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-main-app.ico b/sysui/desktop/icons/so8-main-app.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-master-doc.ico b/sysui/desktop/icons/so8-master-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-math-app.ico b/sysui/desktop/icons/so8-math-app.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-math-doc.ico b/sysui/desktop/icons/so8-math-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-open.ico b/sysui/desktop/icons/so8-open.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-printer.ico b/sysui/desktop/icons/so8-printer.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-web-doc.ico b/sysui/desktop/icons/so8-web-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-writer-app.ico b/sysui/desktop/icons/so8-writer-app.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-writer-doc.ico b/sysui/desktop/icons/so8-writer-doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so8-writer-tem.ico b/sysui/desktop/icons/so8-writer-tem.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_base_app.ico b/sysui/desktop/icons/so9_base_app.ico
old mode 100644
new mode 100755
index 56a323c07e..aa7036eb90
Binary files a/sysui/desktop/icons/so9_base_app.ico and b/sysui/desktop/icons/so9_base_app.ico differ
diff --git a/sysui/desktop/icons/so9_base_doc.ico b/sysui/desktop/icons/so9_base_doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_calc_app.ico b/sysui/desktop/icons/so9_calc_app.ico
old mode 100644
new mode 100755
index 81e6948d39..d7182cad09
Binary files a/sysui/desktop/icons/so9_calc_app.ico and b/sysui/desktop/icons/so9_calc_app.ico differ
diff --git a/sysui/desktop/icons/so9_calc_doc.ico b/sysui/desktop/icons/so9_calc_doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_calc_tem.ico b/sysui/desktop/icons/so9_calc_tem.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_chart_doc.ico b/sysui/desktop/icons/so9_chart_doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_draw_app.ico b/sysui/desktop/icons/so9_draw_app.ico
old mode 100644
new mode 100755
index a2c108ad6f..a8b3c3270f
Binary files a/sysui/desktop/icons/so9_draw_app.ico and b/sysui/desktop/icons/so9_draw_app.ico differ
diff --git a/sysui/desktop/icons/so9_draw_doc.ico b/sysui/desktop/icons/so9_draw_doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_draw_tem.ico b/sysui/desktop/icons/so9_draw_tem.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_empty_doc.ico b/sysui/desktop/icons/so9_empty_doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_empty_tem.ico b/sysui/desktop/icons/so9_empty_tem.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_global_doc.ico b/sysui/desktop/icons/so9_global_doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_html_doc.ico b/sysui/desktop/icons/so9_html_doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_impress_app.ico b/sysui/desktop/icons/so9_impress_app.ico
old mode 100644
new mode 100755
index 0fe4cea9f2..cf10331c5f
Binary files a/sysui/desktop/icons/so9_impress_app.ico and b/sysui/desktop/icons/so9_impress_app.ico differ
diff --git a/sysui/desktop/icons/so9_impress_doc.ico b/sysui/desktop/icons/so9_impress_doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_impress_tem.ico b/sysui/desktop/icons/so9_impress_tem.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_macro_doc.ico b/sysui/desktop/icons/so9_macro_doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_main_app.ico b/sysui/desktop/icons/so9_main_app.ico
old mode 100644
new mode 100755
index 197b924d33..90f193d80d
Binary files a/sysui/desktop/icons/so9_main_app.ico and b/sysui/desktop/icons/so9_main_app.ico differ
diff --git a/sysui/desktop/icons/so9_math_app.ico b/sysui/desktop/icons/so9_math_app.ico
old mode 100644
new mode 100755
index 4d947c2e59..11fbbf9a49
Binary files a/sysui/desktop/icons/so9_math_app.ico and b/sysui/desktop/icons/so9_math_app.ico differ
diff --git a/sysui/desktop/icons/so9_math_doc.ico b/sysui/desktop/icons/so9_math_doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_writer_app.ico b/sysui/desktop/icons/so9_writer_app.ico
old mode 100644
new mode 100755
index 2df20830d9..10c964dba9
Binary files a/sysui/desktop/icons/so9_writer_app.ico and b/sysui/desktop/icons/so9_writer_app.ico differ
diff --git a/sysui/desktop/icons/so9_writer_doc.ico b/sysui/desktop/icons/so9_writer_doc.ico
old mode 100644
new mode 100755
diff --git a/sysui/desktop/icons/so9_writer_tem.ico b/sysui/desktop/icons/so9_writer_tem.ico
old mode 100644
new mode 100755
diff --git a/sysui/source/win32/QuickStart/so/QuickStart.rc b/sysui/source/win32/QuickStart/so/QuickStart.rc
index 48da2388b1..c48dc2358d 100644
--- a/sysui/source/win32/QuickStart/so/QuickStart.rc
+++ b/sysui/source/win32/QuickStart/so/QuickStart.rc
@@ -31,10 +31,10 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-ICON_ACTIVE             ICON    DISCARDABLE     "../../../desktop/icons/so8-main-app.ico"
-IDI_QUICKSTART          ICON    DISCARDABLE     "../../../desktop/icons/so8-main-app.ico"
-IDI_SMALL               ICON    DISCARDABLE     "../../../desktop/icons/so8-main-app.ico"
-ICON_INACTIVE           ICON    DISCARDABLE     "../../../desktop/icons/so8-main-app.ico"
+ICON_ACTIVE             ICON    DISCARDABLE     "../../../desktop/icons/so9_main_app.ico"
+IDI_QUICKSTART          ICON    DISCARDABLE     "../../../desktop/icons/so9_main_app.ico"
+IDI_SMALL               ICON    DISCARDABLE     "../../../desktop/icons/so9_main_app.ico"
+ICON_INACTIVE           ICON    DISCARDABLE     "../../../desktop/icons/so9_main_app.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -105,7 +105,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_APP_TITLE           "SoQuickStart"
     IDC_QUICKSTART          "QUICKSTART"
-    IDS_TOOLTIP             "StarOffice 6.0 QuickStart"
+    IDS_TOOLTIP             "Oracle Open Office 3.2 QuickStart"
 END
 
 STRINGTABLE DISCARDABLE 
-- 
cgit v1.2.3


From 38db14177294904bf696945e673b3b265d65e3b8 Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Mon, 15 Mar 2010 15:37:26 +0100
Subject: native0: #161779# New icons for the quickstart application - don't
 copy custom icons

---
 sysui/desktop/icons/makefile.mk | 62 -----------------------------------------
 1 file changed, 62 deletions(-)

(limited to 'sysui')

diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk
index a533c24899..c963dfbcbc 100644
--- a/sysui/desktop/icons/makefile.mk
+++ b/sysui/desktop/icons/makefile.mk
@@ -126,68 +126,6 @@ all: \
     $(MISC)$/ooo11-math-doc.ico \
     $(MISC)$/ooo11-writer-doc.ico \
     $(MISC)$/ooo11-writer-tem.ico \
-    $(MISC)$/so8-base-app.ico \
-    $(MISC)$/so8-base-doc.ico \
-    $(MISC)$/so8-calc-app.ico \
-    $(MISC)$/so8-calc-doc.ico \
-    $(MISC)$/so8-calc-tem.ico \
-    $(MISC)$/so8-chart-doc.ico \
-    $(MISC)$/so8-configuration.ico \
-    $(MISC)$/so8-draw-app.ico \
-    $(MISC)$/so8-draw-doc.ico \
-    $(MISC)$/so8-draw-tem.ico \
-    $(MISC)$/so8-empty-doc.ico \
-    $(MISC)$/so8-empty-tem.ico \
-    $(MISC)$/so8-image-doc.ico \
-    $(MISC)$/so8-impress-app.ico \
-    $(MISC)$/so8-impress-doc.ico \
-    $(MISC)$/so8-impress-tem.ico \
-    $(MISC)$/so8-macro-doc.ico \
-    $(MISC)$/so8-main-app.ico \
-    $(MISC)$/so8-master-doc.ico \
-    $(MISC)$/so8-math-app.ico \
-    $(MISC)$/so8-math-doc.ico \
-    $(MISC)$/so8-open.ico \
-    $(MISC)$/so8-printer.ico \
-    $(MISC)$/so8-web-doc.ico \
-    $(MISC)$/so8-writer-app.ico \
-    $(MISC)$/so8-writer-doc.ico \
-    $(MISC)$/so8-writer-tem.ico \
-    $(MISC)$/so9_empty_tem.ico \
-    $(MISC)$/so9_math_app.ico \
-    $(MISC)$/so9_global_doc.ico \
-    $(MISC)$/so9_main_app.ico \
-    $(MISC)$/so9_empty_doc.ico \
-    $(MISC)$/so9_math_doc.ico \
-    $(MISC)$/so9_base_app.ico \
-    $(MISC)$/so9_html_doc.ico \
-    $(MISC)$/so9_impress_doc.ico \
-    $(MISC)$/so9_draw_tem.ico \
-    $(MISC)$/so9_writer_tem.ico \
-    $(MISC)$/so9_impress_app.ico \
-    $(MISC)$/so9_calc_tem.ico \
-    $(MISC)$/so9_base_doc.ico \
-    $(MISC)$/so9_macro_doc.ico \
-    $(MISC)$/so9_calc_doc.ico \
-    $(MISC)$/so9_draw_doc.ico \
-    $(MISC)$/so9_writer_doc.ico \
-    $(MISC)$/so9_calc_app.ico \
-    $(MISC)$/so9_impress_tem.ico \
-    $(MISC)$/so9_chart_doc.ico \
-    $(MISC)$/so9_writer_app.ico \
-    $(MISC)$/so9_draw_app.ico \
-    $(MISC)$/so7-base-doc.ico \
-    $(MISC)$/so7-calc-doc.ico \
-    $(MISC)$/so7-calc-tem.ico \
-    $(MISC)$/so7-chart-doc.ico \
-    $(MISC)$/so7-draw-doc.ico \
-    $(MISC)$/so7-draw-tem.ico \
-    $(MISC)$/so7-impress-doc.ico \
-    $(MISC)$/so7-impress-tem.ico \
-    $(MISC)$/so7-master-doc.ico \
-    $(MISC)$/so7-math-doc.ico \
-    $(MISC)$/so7-writer-doc.ico \
-    $(MISC)$/so7-writer-tem.ico \
     $(MISC)$/oxt-extension.ico	
 
 $(MISC)$/%.ico: %.ico
-- 
cgit v1.2.3


From 181f4e49782c9731046ed9481bd941819a5f2a94 Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Tue, 16 Mar 2010 13:34:38 +0100
Subject: native0: #161700# New chart icons and custom images must be delivered

---
 sysui/desktop/icons/makefile.mk | 64 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

(limited to 'sysui')

diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk
index c963dfbcbc..1af3f4367f 100644
--- a/sysui/desktop/icons/makefile.mk
+++ b/sysui/desktop/icons/makefile.mk
@@ -126,7 +126,69 @@ all: \
     $(MISC)$/ooo11-math-doc.ico \
     $(MISC)$/ooo11-writer-doc.ico \
     $(MISC)$/ooo11-writer-tem.ico \
-    $(MISC)$/oxt-extension.ico	
+    $(MISC)$/so8-base-app.ico \
+    $(MISC)$/so8-base-doc.ico \
+    $(MISC)$/so8-calc-app.ico \
+    $(MISC)$/so8-calc-doc.ico \
+    $(MISC)$/so8-calc-tem.ico \
+    $(MISC)$/so8-chart-doc.ico \
+    $(MISC)$/so8-configuration.ico \
+    $(MISC)$/so8-draw-app.ico \
+    $(MISC)$/so8-draw-doc.ico \
+    $(MISC)$/so8-draw-tem.ico \
+    $(MISC)$/so8-empty-doc.ico \
+    $(MISC)$/so8-empty-tem.ico \
+    $(MISC)$/so8-image-doc.ico \
+    $(MISC)$/so8-impress-app.ico \
+    $(MISC)$/so8-impress-doc.ico \
+    $(MISC)$/so8-impress-tem.ico \
+    $(MISC)$/so8-macro-doc.ico \
+    $(MISC)$/so8-main-app.ico \
+    $(MISC)$/so8-master-doc.ico \
+    $(MISC)$/so8-math-app.ico \
+    $(MISC)$/so8-math-doc.ico \
+    $(MISC)$/so8-open.ico \
+    $(MISC)$/so8-printer.ico \
+    $(MISC)$/so8-web-doc.ico \
+    $(MISC)$/so8-writer-app.ico \
+    $(MISC)$/so8-writer-doc.ico \
+    $(MISC)$/so8-writer-tem.ico \
+    $(MISC)$/so9_empty_tem.ico \
+    $(MISC)$/so9_math_app.ico \
+    $(MISC)$/so9_global_doc.ico \
+    $(MISC)$/so9_main_app.ico \
+    $(MISC)$/so9_empty_doc.ico \
+    $(MISC)$/so9_math_doc.ico \
+    $(MISC)$/so9_base_app.ico \
+    $(MISC)$/so9_html_doc.ico \
+    $(MISC)$/so9_impress_doc.ico \
+    $(MISC)$/so9_draw_tem.ico \
+    $(MISC)$/so9_writer_tem.ico \
+    $(MISC)$/so9_impress_app.ico \
+    $(MISC)$/so9_calc_tem.ico \
+    $(MISC)$/so9_base_doc.ico \
+    $(MISC)$/so9_macro_doc.ico \
+    $(MISC)$/so9_calc_doc.ico \
+    $(MISC)$/so9_draw_doc.ico \
+    $(MISC)$/so9_writer_doc.ico \
+    $(MISC)$/so9_calc_app.ico \
+    $(MISC)$/so9_impress_tem.ico \
+    $(MISC)$/so9_chart_doc.ico \
+    $(MISC)$/so9_writer_app.ico \
+    $(MISC)$/so9_draw_app.ico \
+    $(MISC)$/so7-base-doc.ico \
+    $(MISC)$/so7-calc-doc.ico \
+    $(MISC)$/so7-calc-tem.ico \
+    $(MISC)$/so7-chart-doc.ico \
+    $(MISC)$/so7-draw-doc.ico \
+    $(MISC)$/so7-draw-tem.ico \
+    $(MISC)$/so7-impress-doc.ico \
+    $(MISC)$/so7-impress-tem.ico \
+    $(MISC)$/so7-master-doc.ico \
+    $(MISC)$/so7-math-doc.ico \
+    $(MISC)$/so7-writer-doc.ico \
+    $(MISC)$/so7-writer-tem.ico \
+    $(MISC)$/oxt-extension.ico
 
 $(MISC)$/%.ico: %.ico
     $(COPY) $< $@
-- 
cgit v1.2.3


From eca77cdaa0b129e166f33a2c5d5f0ee7f3aa5390 Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Thu, 18 Mar 2010 11:33:46 +0100
Subject: native0: #161779# New app-icon for quickstart.exe

---
 sysui/source/win32/QuickStart/OOQuickStart.rc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'sysui')

diff --git a/sysui/source/win32/QuickStart/OOQuickStart.rc b/sysui/source/win32/QuickStart/OOQuickStart.rc
index ebeed2560d..0dc4dab256 100644
--- a/sysui/source/win32/QuickStart/OOQuickStart.rc
+++ b/sysui/source/win32/QuickStart/OOQuickStart.rc
@@ -31,10 +31,10 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-ICON_ACTIVE             ICON    DISCARDABLE     "../../desktop/icons/ooo-main-app.ico"
-IDI_QUICKSTART          ICON    DISCARDABLE     "../../desktop/icons/ooo-main-app.ico"
-IDI_SMALL               ICON    DISCARDABLE     "../../desktop/icons/ooo-main-app.ico"
-ICON_INACTIVE           ICON    DISCARDABLE     "../../desktop/icons/ooo-main-app.ico"
+ICON_ACTIVE             ICON    DISCARDABLE     "../../desktop/icons/ooo3_main_app.ico"
+IDI_QUICKSTART          ICON    DISCARDABLE     "../../desktop/icons/ooo3_main_app.ico"
+IDI_SMALL               ICON    DISCARDABLE     "../../desktop/icons/ooo3_main_app.ico"
+ICON_INACTIVE           ICON    DISCARDABLE     "../../desktop/icons/ooo3_main_app.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 69472c2c0b627d3bf8aa4a3e19cbd97ea019f8eb Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Tue, 30 Mar 2010 11:02:34 +0200
Subject: nativea: #161739# New icons for printer administration application

---
 .../desktop/icons/hicolor/16x16/apps/printeradmin.png | Bin 963 -> 4259 bytes
 .../desktop/icons/hicolor/32x32/apps/printeradmin.png | Bin 2534 -> 5595 bytes
 .../desktop/icons/hicolor/48x48/apps/printeradmin.png | Bin 4058 -> 7337 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png
 mode change 100644 => 100755 sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png
 mode change 100644 => 100755 sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png

(limited to 'sysui')

diff --git a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png b/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png
old mode 100644
new mode 100755
index 4e8eb0e49d..399076c993
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png and b/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png b/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png
old mode 100644
new mode 100755
index 2c7a0c03f8..b09999c7d0
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png and b/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png differ
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png b/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png
old mode 100644
new mode 100755
index 41971c9652..a11cbe5ab1
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png and b/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png differ
-- 
cgit v1.2.3


From 544f238cc6f28985a934e3edba98b34c65a84767 Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Tue, 30 Mar 2010 15:39:42 +0200
Subject: nativea: #161787# Exchange folder with application icon

---
 desktop/util/ooverinfo.rc         |   2 +-
 desktop/util/verinfo.rc           |   2 +-
 sysui/desktop/icons/makefile.mk   |   2 ++
 sysui/desktop/icons/ooo3_open.ico | Bin 0 -> 295606 bytes
 sysui/desktop/icons/so9_open.ico  | Bin 0 -> 295606 bytes
 5 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100755 sysui/desktop/icons/ooo3_open.ico
 create mode 100755 sysui/desktop/icons/so9_open.ico

(limited to 'sysui')

diff --git a/desktop/util/ooverinfo.rc b/desktop/util/ooverinfo.rc
index 28b1e0d4a8..ab613443f5 100644
--- a/desktop/util/ooverinfo.rc
+++ b/desktop/util/ooverinfo.rc
@@ -113,7 +113,7 @@ VS_VERSION_INFO versioninfo
 16 ICON "icons\\empty-template.ico"
 17 ICON "icons\\empty-document.ico"
 18 ICON "icons\\ooo-configuration.ico"
-19 ICON "icons\\ooo-open.ico"
+19 ICON "icons\\ooo3_open.ico"
 20 ICON "icons\\empty-document.ico"
 21 ICON "icons\\ooo3_writer_app.ico"
 22 ICON "icons\\ooo3_calc_app.ico"
diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc
index d614935684..154b99f33c 100644
--- a/desktop/util/verinfo.rc
+++ b/desktop/util/verinfo.rc
@@ -118,7 +118,7 @@ VS_VERSION_INFO versioninfo
 16 ICON "icons\\empty-template.ico"
 17 ICON "icons\\empty-document.ico"
 18 ICON "icons\\so8-configuration.ico"
-19 ICON "icons\\so8-open.ico"
+19 ICON "icons\\so9_open.ico"
 20 ICON "icons\\empty-document.ico"
 21 ICON "icons\\so9_writer_app.ico"
 22 ICON "icons\\so9_calc_app.ico"
diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk
index 1af3f4367f..ac32cdbe45 100644
--- a/sysui/desktop/icons/makefile.mk
+++ b/sysui/desktop/icons/makefile.mk
@@ -114,6 +114,7 @@ all: \
     $(MISC)$/ooo3_math_doc.ico \
     $(MISC)$/ooo3_writer_tem.ico \
     $(MISC)$/ooo3_empty_tem.ico \
+    $(MISC)$/ooo3_open.ico \
     $(MISC)$/ooo11-base-doc.ico \
     $(MISC)$/ooo11-calc-doc.ico \
     $(MISC)$/ooo11-calc-tem.ico \
@@ -176,6 +177,7 @@ all: \
     $(MISC)$/so9_chart_doc.ico \
     $(MISC)$/so9_writer_app.ico \
     $(MISC)$/so9_draw_app.ico \
+    $(MISC)$/so9_open.ico \
     $(MISC)$/so7-base-doc.ico \
     $(MISC)$/so7-calc-doc.ico \
     $(MISC)$/so7-calc-tem.ico \
diff --git a/sysui/desktop/icons/ooo3_open.ico b/sysui/desktop/icons/ooo3_open.ico
new file mode 100755
index 0000000000..98fcea3748
Binary files /dev/null and b/sysui/desktop/icons/ooo3_open.ico differ
diff --git a/sysui/desktop/icons/so9_open.ico b/sysui/desktop/icons/so9_open.ico
new file mode 100755
index 0000000000..90f193d80d
Binary files /dev/null and b/sysui/desktop/icons/so9_open.ico differ
-- 
cgit v1.2.3


From 5dc0e22084c3ca0782f94e27de4a481822d2bad6 Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Wed, 31 Mar 2010 15:47:30 +0200
Subject: nativea: #161909# Exchange names and URLs

---
 desktop/source/app/desktop.src               | 2 +-
 desktop/win32/source/applauncher/makefile.mk | 2 +-
 framework/source/classes/resource.src        | 2 +-
 svx/source/dialog/docrecovery.src            | 4 ++--
 sysui/desktop/share/launcher_comment.ulf     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'sysui')

diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index f172efb309..e333c44181 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -209,7 +209,7 @@ InfoBox INFOBOX_EXPIRED
 {
     Buttons = WB_OK ;
     DefButton = WB_DEF_OK ;
-    Message [ en-US ] = "This Evaluation Version has expired. To find out more about %PRODUCTNAME,\nvisit www.sun.com/%PRODUCTNAME.";
+    Message [ en-US ] = "This Evaluation Version has expired. To find out more about %PRODUCTNAME,\nvisit http://www.oracle.com/us/products/applications/open-office.";
 };
 
 String STR_TITLE_EXPIRED
diff --git a/desktop/win32/source/applauncher/makefile.mk b/desktop/win32/source/applauncher/makefile.mk
index 4285476475..f0f5743f38 100644
--- a/desktop/win32/source/applauncher/makefile.mk
+++ b/desktop/win32/source/applauncher/makefile.mk
@@ -129,7 +129,7 @@ APP6PRODUCTDEF+=-DRES_APP_NAME=smath
 APP7TARGET=so$/sweb
 APP7NOSAL=TRUE
 APP7LINKRES=$(MISC)$/$(TARGET)7.res
-APP7ICON=$(SOLARRESDIR)$/icons/so9_html_doc.ico
+APP7ICON=$(SOLARRESDIR)$/icons/so9_writer_app.ico
 APP7OBJS = \
         $(OBJ)$/launcher.obj\
         $(OBJ)$/sweb.obj
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index d9c9c558ad..c8114e7129 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -124,7 +124,7 @@ String STR_TOOLBAR_TITLE_ADDON
 
 String STR_STATUSBAR_LOGOTEXT
 {
-    Text [ en-US ] = "A %PRODUCTNAME product by Sun Microsystems, Inc.";
+    Text [ en-US ] = "A %PRODUCTNAME product by Oracle";
 };
 
 // ***********************************************************************
diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src
index 67df927ee8..32c3560031 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -370,7 +370,7 @@ TabPage RID_SVXPAGE_ERR_REP_WELCOME
         Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW2 );
         Size = MAP_APPFONT( RECOV_CONTROLWIDTH, (RECOV_ROW7-RECOV_ROW2-RSC_SP_CTRL_Y) );
         WordBreak = TRUE;
-        Text[ en-US ] = "This error report tool gathers information about how %PRODUCTNAME is working and sends it to Sun Microsystems to help improve future versions.\n\nIt's easy - just send the report without any further effort on your part by clicking 'Send' in the next dialog, or you can briefly describe how the error occurred and then click 'Send'. If you want to see the report, click the 'Show Report' button. No data will be sent if you click 'Do Not Send'.\n\nCustomer Privacy\nThe information gathered is limited to data concerning the state of %PRODUCTNAME %PRODUCTVERSION when the error occurred. Other information about passwords or document contents is not collected.\n\nThe information will only be used to improve the quality of %PRODUCTNAME and will not be shared with third parties.\nFor more information on Sun Microsystems' privacy policy, visit\nhttp://www.sun.com/privacy/";
+        Text[ en-US ] = "This error report tool gathers information about how %PRODUCTNAME is working and sends it to Oracle to help improve future versions.\n\nIt's easy - just send the report without any further effort on your part by clicking 'Send' in the next dialog, or you can briefly describe how the error occurred and then click 'Send'. If you want to see the report, click the 'Show Report' button. No data will be sent if you click 'Do Not Send'.\n\nCustomer Privacy\nThe information gathered is limited to data concerning the state of %PRODUCTNAME %PRODUCTVERSION when the error occurred. Other information about passwords or document contents is not collected.\n\nThe information will only be used to improve the quality of %PRODUCTNAME and will not be shared with third parties.\nFor more information on Oracle's privacy policy, visit\nwww.oracle.com/html/services-privacy-policy.html";
     };
     FixedLine FL_RECOV_BOTTOM
     {
@@ -472,7 +472,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND
         Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW12 );
         Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_CHECKBOX_HEIGHT );
         Check = FALSE;
-        Text[ en-US ] = "~I allow Sun Microsystems to contact me regarding this report.";
+        Text[ en-US ] = "~I allow Oracle to contact me regarding this report.";
     };
     FixedText FT_ERRSEND_EMAILADDR
     {
diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf
index e3abc7c7ea..6aeab6d94c 100644
--- a/sysui/desktop/share/launcher_comment.ulf
+++ b/sysui/desktop/share/launcher_comment.ulf
@@ -17,5 +17,5 @@ en-US = "Create and edit scientific formulas and equations by using Math."
 en-US = "Manage databases, create queries and reports to track and manage your information by using Base."
 
 [startcenter]
-en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Sun Microsystems."
+en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Oracle."
 
-- 
cgit v1.2.3