diff options
Diffstat (limited to 'sysui')
563 files changed, 175 insertions, 106 deletions
diff --git a/sysui/desktop/cleanversion/makefile.mk b/sysui/desktop/cleanversion/makefile.mk index 40651af2d17b..40651af2d17b 100644..100755 --- a/sysui/desktop/cleanversion/makefile.mk +++ b/sysui/desktop/cleanversion/makefile.mk diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control index 608496d9e2f4..da25ee454292 100644..100755 --- a/sysui/desktop/debian/control +++ b/sysui/desktop/debian/control @@ -1,6 +1,6 @@ Description: %productname desktop integration -Maintainer: OpenOffice.org +Maintainer: LibreOffice Architecture: all -Provides: openoffice.org-desktop-integration, openoffice.org-unbundled -Conflicts: openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled -Replaces: openofficeorg-desktop-integration, openofficeorg-debian-menus +Provides: libreoffice-desktop-integration, libreoffice-unbundled +Conflicts: libreoffice-desktop-integration, libreoffice-debian-menus, libreoffice-bundled +Replaces: libreoffice-desktop-integration, libreoffice-debian-menus diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk index 45e0f331f714..45e0f331f714 100644..100755 --- a/sysui/desktop/debian/makefile.mk +++ b/sysui/desktop/debian/makefile.mk diff --git a/sysui/desktop/debian/openoffice.org-debian-menus b/sysui/desktop/debian/openoffice.org-debian-menus index bf30a918cf0b..c477d7363546 100644..100755 --- a/sysui/desktop/debian/openoffice.org-debian-menus +++ b/sysui/desktop/debian/openoffice.org-debian-menus @@ -1,39 +1,39 @@ -?package(openoffice.org-writer):needs="X11" section="Apps/Editors"\ +?package(libreoffice-writer):needs="X11" section="Apps/Editors"\ title="%PRODUCTNAME Writer" command="%PREFIX -writer"\ hints="Word Processors"\ kderemove="y"\ icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-writer.png"\ icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-writer.png" -?package(openoffice.org-calc):needs="X11" section="Apps/Math"\ +?package(libreoffice-calc):needs="X11" section="Apps/Math"\ title="%PRODUCTNAME Calc" command="%PREFIX -calc"\ hints="Spreadsheets"\ kderemove="y"\ icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-calc.png"\ icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-calc.png" -?package(openoffice.org-draw):needs="X11" section="Apps/Graphics"\ +?package(libreoffice-draw):needs="X11" section="Apps/Graphics"\ title="%PRODUCTNAME Draw" command="%PREFIX -draw"\ hints="Drawing"\ kderemove="y"\ icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-draw.png"\ icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-draw.png" -?package(openoffice.org-impress):needs="X11" section="Apps/Graphics"\ +?package(libreoffice-impress):needs="X11" section="Apps/Graphics"\ title="%PRODUCTNAME Impress" command="%PREFIX -impress"\ hints="Presentation"\ kderemove="y"\ icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-impress.png"\ icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-impress.png" -?package(openoffice.org-base):needs="X11" section="Apps/Databases"\ +?package(libreoffice-base):needs="X11" section="Apps/Databases"\ title="%PRODUCTNAME Base" command="%PREFIX -base"\ hints="Database"\ kderemove="y"\ icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-base.png"\ icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-base.png" -?package(openoffice.org-core02):needs="X11" section="Apps/System"\ +?package(libreoffice-core02):needs="X11" section="Apps/System"\ title="%PRODUCTNAME Printer Administration"\ command="%PREFIX-printeradmin"\ hints="Setup,Printer,Config"\ diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst index 19753b529e97..67161dfa2ef6 100644..100755 --- a/sysui/desktop/debian/postinst +++ b/sysui/desktop/debian/postinst @@ -80,7 +80,7 @@ if [ "$1" = "configure" ] then # backing out existing entries to avoid duplicates sed ' -/^# OpenOffice.org/d +/^# LibreOffice/d /^application\/vnd\.oasis\.opendocument/d /^application\/vnd\.openofficeorg/d /^application\/vnd\.sun/d @@ -96,7 +96,7 @@ then # now append our stuff to the temporary file cat >> /etc/mailcap.tmp$$ << END -# OpenOffice.org +# LibreOffice application/vnd.oasis.opendocument.text; %PREFIX -view %s application/vnd.oasis.opendocument.text-template; %PREFIX -view %s application/vnd.oasis.opendocument.text-web; %PREFIX -view %s diff --git a/sysui/desktop/debian/postrm b/sysui/desktop/debian/postrm index adb9cf448e95..adb9cf448e95 100644..100755 --- a/sysui/desktop/debian/postrm +++ b/sysui/desktop/debian/postrm diff --git a/sysui/desktop/debian/prerm b/sysui/desktop/debian/prerm index d83e09f841f4..d83e09f841f4 100644..100755 --- a/sysui/desktop/debian/prerm +++ b/sysui/desktop/debian/prerm diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index 1649971dad99..30c2dd61e839 100644..100755 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -7,7 +7,7 @@ Name: %pkgprefix-freedesktop-menus #BuildRequires: perl Group: Office License: LGPL -Provides: openoffice.org3-desktop-integration +Provides: libreoffice-desktop-integration Conflicts: %pkgprefix-suse-menus Conflicts: %pkgprefix-debian-menus Conflicts: %pkgprefix-redhat-menus @@ -187,7 +187,7 @@ if [ "$1" = 1 ] then # backing out existing entries to avoid duplicates sed ' -/^# OpenOffice.org/d +/^# LibreOffice/d /^application\/vnd\.oasis\.opendocument/d /^application\/vnd\.openofficeorg/d /^application\/vnd\.sun/d @@ -203,7 +203,7 @@ then # now append our stuff to the temporary file cat >> /etc/mailcap.tmp$$ << END -# OpenOffice.org +# LibreOffice application/vnd.oasis.opendocument.text; %unixfilename -view %s application/vnd.oasis.opendocument.text-template; %unixfilename -view %s application/vnd.oasis.opendocument.text-web; %unixfilename -view %s @@ -318,6 +318,10 @@ done # glibc breaks rpm unless rpm is build with internal glob-matching (issue 49374) # https://bugzilla.redhat.com/beta/show_bug.cgi?id=134362 %defattr(-, root, root) +%if %unixfilename != libreoffice +# compat symlinks +%attr(0755, root, root) /opt/%unixfilename +%endif %attr(0755, root, root) /usr/bin/* /usr/share/applications/%unixfilename-base.desktop /usr/share/applications/%unixfilename-calc.desktop diff --git a/sysui/desktop/freedesktop/makefile.mk b/sysui/desktop/freedesktop/makefile.mk index a93aafd71ac1..a93aafd71ac1 100644..100755 --- a/sysui/desktop/freedesktop/makefile.mk +++ b/sysui/desktop/freedesktop/makefile.mk diff --git a/sysui/desktop/icons/base.icns b/sysui/desktop/icons/base.icns Binary files differindex e1ed62c2628b..e1ed62c2628b 100644..100755 --- a/sysui/desktop/icons/base.icns +++ b/sysui/desktop/icons/base.icns diff --git a/sysui/desktop/icons/calc.icns b/sysui/desktop/icons/calc.icns Binary files differindex a3d4edc5728a..a3d4edc5728a 100644..100755 --- a/sysui/desktop/icons/calc.icns +++ b/sysui/desktop/icons/calc.icns diff --git a/sysui/desktop/icons/configuration.icns b/sysui/desktop/icons/configuration.icns Binary files differindex fe0f0946826a..fe0f0946826a 100644..100755 --- a/sysui/desktop/icons/configuration.icns +++ b/sysui/desktop/icons/configuration.icns diff --git a/sysui/desktop/icons/database.icns b/sysui/desktop/icons/database.icns Binary files differindex 115dc859cdcd..9fa0bbf3ed67 100644..100755 --- a/sysui/desktop/icons/database.icns +++ b/sysui/desktop/icons/database.icns diff --git a/sysui/desktop/icons/database.ico b/sysui/desktop/icons/database.ico Binary files differindex 171d39bb9643..02cf7a484023 100644..100755 --- a/sysui/desktop/icons/database.ico +++ b/sysui/desktop/icons/database.ico diff --git a/sysui/desktop/icons/draw.icns b/sysui/desktop/icons/draw.icns Binary files differindex da511e30dd79..da511e30dd79 100644..100755 --- a/sysui/desktop/icons/draw.icns +++ b/sysui/desktop/icons/draw.icns diff --git a/sysui/desktop/icons/drawing-template.icns b/sysui/desktop/icons/drawing-template.icns Binary files differindex 407484582f93..64c373ecaa33 100644..100755 --- a/sysui/desktop/icons/drawing-template.icns +++ b/sysui/desktop/icons/drawing-template.icns diff --git a/sysui/desktop/icons/drawing-template.ico b/sysui/desktop/icons/drawing-template.ico Binary files differindex 5b5a74e99f41..af2e9ffd93d9 100644..100755 --- a/sysui/desktop/icons/drawing-template.ico +++ b/sysui/desktop/icons/drawing-template.ico diff --git a/sysui/desktop/icons/drawing.icns b/sysui/desktop/icons/drawing.icns Binary files differindex 5322625b0507..d179d041a6ca 100644..100755 --- a/sysui/desktop/icons/drawing.icns +++ b/sysui/desktop/icons/drawing.icns diff --git a/sysui/desktop/icons/drawing.ico b/sysui/desktop/icons/drawing.ico Binary files differindex 1065490a2807..5297daeee5b6 100644..100755 --- a/sysui/desktop/icons/drawing.ico +++ b/sysui/desktop/icons/drawing.ico diff --git a/sysui/desktop/icons/empty-document.icns b/sysui/desktop/icons/empty-document.icns Binary files differindex ab676f6ef8f1..c5c80a01e799 100644..100755 --- a/sysui/desktop/icons/empty-document.icns +++ b/sysui/desktop/icons/empty-document.icns diff --git a/sysui/desktop/icons/empty-document.ico b/sysui/desktop/icons/empty-document.ico Binary files differindex 4115c3089682..20e665faa5e8 100644..100755 --- a/sysui/desktop/icons/empty-document.ico +++ b/sysui/desktop/icons/empty-document.ico diff --git a/sysui/desktop/icons/empty-template.icns b/sysui/desktop/icons/empty-template.icns Binary files differindex 50e63b94256d..c5c80a01e799 100644..100755 --- a/sysui/desktop/icons/empty-template.icns +++ b/sysui/desktop/icons/empty-template.icns diff --git a/sysui/desktop/icons/empty-template.ico b/sysui/desktop/icons/empty-template.ico Binary files differindex dec147610af4..20e665faa5e8 100644..100755 --- a/sysui/desktop/icons/empty-template.ico +++ b/sysui/desktop/icons/empty-template.ico diff --git a/sysui/desktop/icons/formula.icns b/sysui/desktop/icons/formula.icns Binary files differindex 4620688c79c6..f6dc588095f4 100644..100755 --- a/sysui/desktop/icons/formula.icns +++ b/sysui/desktop/icons/formula.icns diff --git a/sysui/desktop/icons/formula.ico b/sysui/desktop/icons/formula.ico Binary files differindex e06aef187734..fb2f6515bdb2 100644..100755 --- a/sysui/desktop/icons/formula.ico +++ b/sysui/desktop/icons/formula.ico diff --git a/sysui/desktop/icons/hicolor/128x128/apps/base.png b/sysui/desktop/icons/hicolor/128x128/apps/base.png Binary files differindex 398c2f058d92..d2c94583e667 100755 --- a/sysui/desktop/icons/hicolor/128x128/apps/base.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/base.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/calc.png b/sysui/desktop/icons/hicolor/128x128/apps/calc.png Binary files differindex 8156308833f7..9614ca81d6af 100644..100755 --- a/sysui/desktop/icons/hicolor/128x128/apps/calc.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/calc.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/draw.png b/sysui/desktop/icons/hicolor/128x128/apps/draw.png Binary files differindex 3f71b25fe107..b1405c52888a 100755 --- a/sysui/desktop/icons/hicolor/128x128/apps/draw.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/draw.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/impress.png b/sysui/desktop/icons/hicolor/128x128/apps/impress.png Binary files differindex b62b449e574f..1d0fdc08af2f 100755 --- a/sysui/desktop/icons/hicolor/128x128/apps/impress.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/impress.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/main.png b/sysui/desktop/icons/hicolor/128x128/apps/main.png Binary files differindex 1b51a60bddea..59efe6991dfb 100755 --- a/sysui/desktop/icons/hicolor/128x128/apps/main.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/main.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/math.png b/sysui/desktop/icons/hicolor/128x128/apps/math.png Binary files differindex d37c98aa405e..9a17a15f855c 100755 --- a/sysui/desktop/icons/hicolor/128x128/apps/math.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/math.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png Binary files differindex 1b51a60bddea..59efe6991dfb 100644..100755 --- a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/writer.png b/sysui/desktop/icons/hicolor/128x128/apps/writer.png Binary files differindex b991a6d2e233..3fa71f4dc140 100755 --- a/sysui/desktop/icons/hicolor/128x128/apps/writer.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/writer.png diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/database.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/database.png Binary files differdeleted file mode 100644 index 93b8e60cb276..000000000000 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/database.png +++ /dev/null diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing-template.png Binary files differdeleted file mode 100644 index 15b80e039313..000000000000 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing-template.png +++ /dev/null diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing.png Binary files differdeleted file mode 100644 index 9d47f747dffa..000000000000 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/drawing.png +++ /dev/null diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/formula.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/formula.png Binary files differdeleted file mode 100644 index 184dd0ca6ca8..000000000000 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/formula.png +++ /dev/null diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/master-document.png Binary files differdeleted file mode 100644 index acf19ff835f2..000000000000 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/master-document.png +++ /dev/null diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png Binary files differindex f95bbf137a5b..d2c94583e667 100755 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png +++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-database.png diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png Binary files differindex 630a51ebb430..1925cee34f4f 100755 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png +++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png Binary files differindex 82ac8d15bfc3..b1405c52888a 100755 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png +++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-drawing.png diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png Binary files differindex c838eaa12851..9a17a15f855c 100755 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png +++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-formula.png diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png Binary files differindex 640e2d98614c..aa94c4b1b3cd 100755 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png +++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-master-document.png diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png Binary files differindex c4954802e82c..eff3f17b6b18 100755 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png +++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png Binary files differindex 1d5acededb94..1d0fdc08af2f 100755 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png +++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-presentation.png diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png Binary files differindex 01781db415fa..e396624efe52 100644..100755 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png +++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png Binary files differindex bc46714afa92..9614ca81d6af 100644..100755 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png +++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png Binary files differindex 569bd514fcb7..0daebdf256ce 100755 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png +++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png Binary files differindex b45244ac1a4b..3fa71f4dc140 100755 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png +++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png Binary files differindex 8e6c4580e9fd..09ccf5f74569 100755 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png +++ b/sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-web-template.png diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation-template.png Binary files differdeleted file mode 100644 index c8a3813188de..000000000000 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation-template.png +++ /dev/null diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation.png Binary files differdeleted file mode 100644 index 2a0552eb62b4..000000000000 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/presentation.png +++ /dev/null diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet-template.png Binary files differdeleted file mode 100644 index cc7aa51bcb3c..000000000000 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet-template.png +++ /dev/null diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet.png Binary files differdeleted file mode 100644 index c701fd7b5d46..000000000000 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/spreadsheet.png +++ /dev/null diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/text-template.png Binary files differdeleted file mode 100644 index 652c1ce480c9..000000000000 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/text-template.png +++ /dev/null diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/text.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/text.png Binary files differdeleted file mode 100644 index f881aca21839..000000000000 --- a/sysui/desktop/icons/hicolor/128x128/mimetypes/text.png +++ /dev/null diff --git a/sysui/desktop/icons/hicolor/16x16/apps/base.png b/sysui/desktop/icons/hicolor/16x16/apps/base.png Binary files differindex 57a4477cc662..3465f32dde01 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/apps/base.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/base.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/calc.png b/sysui/desktop/icons/hicolor/16x16/apps/calc.png Binary files differindex 78f923d0edf7..3f1f4ae93cc5 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/apps/calc.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/calc.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/draw.png b/sysui/desktop/icons/hicolor/16x16/apps/draw.png Binary files differindex 7779dd46f374..94bc2aa8564b 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/apps/draw.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/draw.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/impress.png b/sysui/desktop/icons/hicolor/16x16/apps/impress.png Binary files differindex ff07597b1d5e..75d94f0030ab 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/apps/impress.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/impress.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/main.png b/sysui/desktop/icons/hicolor/16x16/apps/main.png Binary files differindex 3aa8f08a8c5d..2459b2a5d6dc 100755 --- a/sysui/desktop/icons/hicolor/16x16/apps/main.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/main.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/math.png b/sysui/desktop/icons/hicolor/16x16/apps/math.png Binary files differindex 10c71e6caa2e..ab945b1ecf88 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/apps/math.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/math.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png b/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png Binary files differindex 399076c9934d..4e8eb0e49dd8 100755 --- a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png Binary files differindex 3aa8f08a8c5d..2459b2a5d6dc 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/writer.png b/sysui/desktop/icons/hicolor/16x16/apps/writer.png Binary files differindex 2b82110e180b..1aacbb52b5c0 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/apps/writer.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/writer.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png Binary files differindex fb32e00a1ba6..bbf485561e19 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/database.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png Binary files differindex f045190f395a..74770d5d482f 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing-template.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png Binary files differindex 3bd7b7d29cb1..30303797baf7 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/drawing.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png Binary files differindex e7e95875efed..3eb7f884f91d 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/formula.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png Binary files differindex e442a0c0985d..c424e4fbf430 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/master-document.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png Binary files differindex e4ae28570f08..3465f32dde01 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-database.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png Binary files differindex eaad54fcdf7e..456b8108b6e3 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png Binary files differindex 3d66cc97eb5e..94bc2aa8564b 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-drawing.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png Binary files differindex 4cefbb690d10..ab945b1ecf88 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png Binary files differindex 12aab4a27c32..40777f7276dc 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-master-document.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png Binary files differindex 9f281836d793..99d38d75afbb 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png Binary files differindex 46942cba2852..75d94f0030ab 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-presentation.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png Binary files differindex 4781bfc3a6fc..74c312c2724d 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png Binary files differindex abc38d4310c9..3f1f4ae93cc5 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png Binary files differindex 9836814c6c2c..9d7c277546fd 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png Binary files differindex 06c1f30c8fa2..1aacbb52b5c0 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png Binary files differindex 01c04a0ea697..16bf02e1b5b2 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-web-template.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png Binary files differindex df1d5293a83d..bb20d139e1a5 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation-template.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png Binary files differindex 6803ae4c7492..b82ddf720912 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/presentation.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png Binary files differindex 5be785e40f64..3546349b59a3 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet-template.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png Binary files differindex 46c72242a02a..df164ff2caae 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/spreadsheet.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png Binary files differindex 2827f29f3a4e..4d895288251e 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/text-template.png diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png b/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png Binary files differindex c0d1cd3dcc7a..6ff2517af44d 100644..100755 --- a/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png +++ b/sysui/desktop/icons/hicolor/16x16/mimetypes/text.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/base.png b/sysui/desktop/icons/hicolor/32x32/apps/base.png Binary files differindex f4772d75dac3..549bcb7eea5c 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/apps/base.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/base.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/calc.png b/sysui/desktop/icons/hicolor/32x32/apps/calc.png Binary files differindex a1eae7b37a17..162f69c44766 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/apps/calc.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/calc.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/draw.png b/sysui/desktop/icons/hicolor/32x32/apps/draw.png Binary files differindex 4dc928a35168..2e05ffe8e571 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/apps/draw.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/draw.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/impress.png b/sysui/desktop/icons/hicolor/32x32/apps/impress.png Binary files differindex 9abced7df4ba..a046ed3fda9d 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/apps/impress.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/impress.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/main.png b/sysui/desktop/icons/hicolor/32x32/apps/main.png Binary files differindex 296c6f4c58b1..dba5f4e030a7 100755 --- a/sysui/desktop/icons/hicolor/32x32/apps/main.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/main.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/math.png b/sysui/desktop/icons/hicolor/32x32/apps/math.png Binary files differindex 146a7dea71b6..f392014275ee 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/apps/math.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/math.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png b/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png Binary files differindex b09999c7d083..2c7a0c03f8fd 100755 --- a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png Binary files differindex 296c6f4c58b1..dba5f4e030a7 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/writer.png b/sysui/desktop/icons/hicolor/32x32/apps/writer.png Binary files differindex 97b9d3f5cfb3..1942e73d021f 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/apps/writer.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/writer.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png Binary files differindex 6e0a4b8f60ba..709903d46c21 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/database.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png Binary files differindex a341632dabb7..76e5abdab9f0 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing-template.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png Binary files differindex 4abe5c0f80af..380c60a7df2c 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/drawing.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png Binary files differindex d989593924c2..37306ac617ec 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/formula.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png Binary files differindex d4b033f4aab8..1f3e79927608 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/master-document.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png Binary files differindex 461bdf37b774..549bcb7eea5c 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-database.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png Binary files differindex cdc2f2df0fc8..3bd738714aee 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png Binary files differindex 55dda2143e57..2e05ffe8e571 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-drawing.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png Binary files differindex 6b8f2f732201..f392014275ee 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-formula.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png Binary files differindex 234bac461e74..2cf6741bbfe3 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-master-document.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png Binary files differindex 012516065215..ea8579d40519 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png Binary files differindex fedeb0620a75..a046ed3fda9d 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-presentation.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png Binary files differindex 9d63063e67d0..0b2b6c537952 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png Binary files differindex 020d95bef310..162f69c44766 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png Binary files differindex 983b39e611ae..cfd3907193ee 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png Binary files differindex ac350cb409d1..1942e73d021f 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png Binary files differindex 8e906f8be1df..c08fd88c0447 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-web-template.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png Binary files differindex 5163f441039a..0edabbc86f16 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation-template.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png Binary files differindex 730f86f0ba63..0eee1162ce15 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/presentation.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png Binary files differindex d81cd27dd93f..158a63a58c92 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet-template.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png Binary files differindex dc9bd083c218..f7352ab51783 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/spreadsheet.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png Binary files differindex 7c738c21eb59..cfba26102380 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/text-template.png diff --git a/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png b/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png Binary files differindex 1454b20fd5db..77f87e777b7a 100644..100755 --- a/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png +++ b/sysui/desktop/icons/hicolor/32x32/mimetypes/text.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/base.png b/sysui/desktop/icons/hicolor/48x48/apps/base.png Binary files differindex 382ad3e6ec54..4851d31c5542 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/apps/base.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/base.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/calc.png b/sysui/desktop/icons/hicolor/48x48/apps/calc.png Binary files differindex d94aae38fbdd..c3deeb0737a4 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/apps/calc.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/calc.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/draw.png b/sysui/desktop/icons/hicolor/48x48/apps/draw.png Binary files differindex 1a2d252c7cbf..56a835cf9cf1 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/apps/draw.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/draw.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/impress.png b/sysui/desktop/icons/hicolor/48x48/apps/impress.png Binary files differindex 35d3b25c5566..09bbb42baec0 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/apps/impress.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/impress.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/main.png b/sysui/desktop/icons/hicolor/48x48/apps/main.png Binary files differindex 86bcf599553f..7f3c00c4a307 100755 --- a/sysui/desktop/icons/hicolor/48x48/apps/main.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/main.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/math.png b/sysui/desktop/icons/hicolor/48x48/apps/math.png Binary files differindex 3572d76b6bd9..8e2c0a1c1b5d 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/apps/math.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/math.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png b/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png Binary files differindex a11cbe5ab107..41971c9652a2 100755 --- a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png Binary files differindex 86bcf599553f..7f3c00c4a307 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/writer.png b/sysui/desktop/icons/hicolor/48x48/apps/writer.png Binary files differindex 8041a209ddda..37c931ce31b5 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/apps/writer.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/writer.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png Binary files differindex b385ed9db537..224943b0e9ea 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/database.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png Binary files differindex b7da9bfa2c81..043dd5dfae71 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing-template.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png Binary files differindex 85499fd2199f..8857034ce262 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/drawing.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png Binary files differindex bcc61b432b94..45f6d919387c 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/formula.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png Binary files differindex 7a7b86956537..191a619f7cf3 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/master-document.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png Binary files differindex 77e684960ec2..4851d31c5542 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-database.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png Binary files differindex 8cb4dd3fa7d0..e4bec3bff9fd 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png Binary files differindex 258b3b2fc1e2..56a835cf9cf1 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png Binary files differindex f6508de45379..8e2c0a1c1b5d 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-formula.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png Binary files differindex 1923fc9b9ff4..01bf4e91aa80 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-master-document.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png Binary files differindex 00d311317566..e072bcd8fbaa 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png Binary files differindex 635953e1c714..09bbb42baec0 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-presentation.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png Binary files differindex 7c4beda53d60..d8ae2c5b020f 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png Binary files differindex 4c407a0f5fc1..c3deeb0737a4 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png Binary files differindex 64b86940885a..58aaedd73611 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text-template.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png Binary files differindex 0c04210a0c9a..37c931ce31b5 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-text.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png Binary files differindex 0ff92ec7a267..2b4f9043cb68 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-web-template.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png Binary files differindex d9651bf654af..2193c98931ae 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation-template.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png Binary files differindex e058d25f822e..bd59fbbbaf82 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/presentation.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png Binary files differindex 5d5e46e21bc0..34c60c2819d6 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet-template.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png Binary files differindex c352966320a1..6868f577ce1a 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/spreadsheet.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png Binary files differindex ad5129774837..52a28fb3af80 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/text-template.png diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png Binary files differindex 2a1707006d82..7ead079cade2 100644..100755 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/text.png diff --git a/sysui/desktop/icons/impress.icns b/sysui/desktop/icons/impress.icns Binary files differindex 22a9475ae6b3..22a9475ae6b3 100644..100755 --- a/sysui/desktop/icons/impress.icns +++ b/sysui/desktop/icons/impress.icns diff --git a/sysui/desktop/icons/locolor/16x16/apps/base.png b/sysui/desktop/icons/locolor/16x16/apps/base.png Binary files differindex 347d030bc740..347d030bc740 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/apps/base.png +++ b/sysui/desktop/icons/locolor/16x16/apps/base.png diff --git a/sysui/desktop/icons/locolor/16x16/apps/calc.png b/sysui/desktop/icons/locolor/16x16/apps/calc.png Binary files differindex 060d78d2eada..060d78d2eada 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/apps/calc.png +++ b/sysui/desktop/icons/locolor/16x16/apps/calc.png diff --git a/sysui/desktop/icons/locolor/16x16/apps/draw.png b/sysui/desktop/icons/locolor/16x16/apps/draw.png Binary files differindex bc4f8cb803cd..bc4f8cb803cd 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/apps/draw.png +++ b/sysui/desktop/icons/locolor/16x16/apps/draw.png diff --git a/sysui/desktop/icons/locolor/16x16/apps/impress.png b/sysui/desktop/icons/locolor/16x16/apps/impress.png Binary files differindex b780901ee3bf..b780901ee3bf 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/apps/impress.png +++ b/sysui/desktop/icons/locolor/16x16/apps/impress.png diff --git a/sysui/desktop/icons/locolor/16x16/apps/math.png b/sysui/desktop/icons/locolor/16x16/apps/math.png Binary files differindex 4c7f8e88330e..4c7f8e88330e 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/apps/math.png +++ b/sysui/desktop/icons/locolor/16x16/apps/math.png diff --git a/sysui/desktop/icons/locolor/16x16/apps/printeradmin.png b/sysui/desktop/icons/locolor/16x16/apps/printeradmin.png Binary files differindex c64e48f6d58b..c64e48f6d58b 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/apps/printeradmin.png +++ b/sysui/desktop/icons/locolor/16x16/apps/printeradmin.png diff --git a/sysui/desktop/icons/locolor/16x16/apps/startcenter.png b/sysui/desktop/icons/locolor/16x16/apps/startcenter.png Binary files differindex 347d030bc740..347d030bc740 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/apps/startcenter.png +++ b/sysui/desktop/icons/locolor/16x16/apps/startcenter.png diff --git a/sysui/desktop/icons/locolor/16x16/apps/writer.png b/sysui/desktop/icons/locolor/16x16/apps/writer.png Binary files differindex c452804daf41..c452804daf41 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/apps/writer.png +++ b/sysui/desktop/icons/locolor/16x16/apps/writer.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/database.png b/sysui/desktop/icons/locolor/16x16/mimetypes/database.png Binary files differindex bbf485561e19..bbf485561e19 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/database.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/database.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/drawing-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/drawing-template.png Binary files differindex 74770d5d482f..74770d5d482f 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/drawing-template.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/drawing-template.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/drawing.png b/sysui/desktop/icons/locolor/16x16/mimetypes/drawing.png Binary files differindex 30303797baf7..30303797baf7 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/drawing.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/drawing.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/formula.png b/sysui/desktop/icons/locolor/16x16/mimetypes/formula.png Binary files differindex 3eb7f884f91d..3eb7f884f91d 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/formula.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/formula.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/master-document.png b/sysui/desktop/icons/locolor/16x16/mimetypes/master-document.png Binary files differindex c424e4fbf430..c424e4fbf430 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/master-document.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/master-document.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-database.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-database.png Binary files differindex ce87e664b482..ce87e664b482 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-database.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-database.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing-template.png Binary files differindex 53fe069ca410..53fe069ca410 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing-template.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing-template.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing.png Binary files differindex 42f31de4c769..42f31de4c769 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-drawing.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-formula.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-formula.png Binary files differindex f01150fc9cf7..f01150fc9cf7 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-formula.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-formula.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-master-document.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-master-document.png Binary files differindex d2bf0065faeb..d2bf0065faeb 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-master-document.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-master-document.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation-template.png Binary files differindex ccbe7bfc6dcf..ccbe7bfc6dcf 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation-template.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation-template.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation.png Binary files differindex d87f465af1df..d87f465af1df 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-presentation.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet-template.png Binary files differindex dd6b36a87479..dd6b36a87479 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet-template.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet-template.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet.png Binary files differindex 907cff3dc227..907cff3dc227 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-spreadsheet.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text-template.png Binary files differindex df779f671390..df779f671390 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text-template.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text-template.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text.png Binary files differindex 2148e49d3c73..2148e49d3c73 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-text.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-web-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-web-template.png Binary files differindex fed7af4f2a12..fed7af4f2a12 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-web-template.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/oasis-web-template.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/presentation-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/presentation-template.png Binary files differindex bb20d139e1a5..bb20d139e1a5 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/presentation-template.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/presentation-template.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/presentation.png b/sysui/desktop/icons/locolor/16x16/mimetypes/presentation.png Binary files differindex b82ddf720912..b82ddf720912 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/presentation.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/presentation.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet-template.png Binary files differindex 3546349b59a3..3546349b59a3 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet-template.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet-template.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet.png b/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet.png Binary files differindex df164ff2caae..df164ff2caae 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/spreadsheet.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/text-template.png b/sysui/desktop/icons/locolor/16x16/mimetypes/text-template.png Binary files differindex 4d895288251e..4d895288251e 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/text-template.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/text-template.png diff --git a/sysui/desktop/icons/locolor/16x16/mimetypes/text.png b/sysui/desktop/icons/locolor/16x16/mimetypes/text.png Binary files differindex 6ff2517af44d..6ff2517af44d 100644..100755 --- a/sysui/desktop/icons/locolor/16x16/mimetypes/text.png +++ b/sysui/desktop/icons/locolor/16x16/mimetypes/text.png diff --git a/sysui/desktop/icons/locolor/32x32/apps/base.png b/sysui/desktop/icons/locolor/32x32/apps/base.png Binary files differindex cfaaaba07a60..cfaaaba07a60 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/apps/base.png +++ b/sysui/desktop/icons/locolor/32x32/apps/base.png diff --git a/sysui/desktop/icons/locolor/32x32/apps/calc.png b/sysui/desktop/icons/locolor/32x32/apps/calc.png Binary files differindex 4aff7baf77d5..4aff7baf77d5 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/apps/calc.png +++ b/sysui/desktop/icons/locolor/32x32/apps/calc.png diff --git a/sysui/desktop/icons/locolor/32x32/apps/draw.png b/sysui/desktop/icons/locolor/32x32/apps/draw.png Binary files differindex 3efa6d4a7d03..3efa6d4a7d03 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/apps/draw.png +++ b/sysui/desktop/icons/locolor/32x32/apps/draw.png diff --git a/sysui/desktop/icons/locolor/32x32/apps/impress.png b/sysui/desktop/icons/locolor/32x32/apps/impress.png Binary files differindex 56dde6ba6cda..56dde6ba6cda 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/apps/impress.png +++ b/sysui/desktop/icons/locolor/32x32/apps/impress.png diff --git a/sysui/desktop/icons/locolor/32x32/apps/math.png b/sysui/desktop/icons/locolor/32x32/apps/math.png Binary files differindex 3b730e50ea50..3b730e50ea50 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/apps/math.png +++ b/sysui/desktop/icons/locolor/32x32/apps/math.png diff --git a/sysui/desktop/icons/locolor/32x32/apps/printeradmin.png b/sysui/desktop/icons/locolor/32x32/apps/printeradmin.png Binary files differindex 2ad360fe1b72..2ad360fe1b72 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/apps/printeradmin.png +++ b/sysui/desktop/icons/locolor/32x32/apps/printeradmin.png diff --git a/sysui/desktop/icons/locolor/32x32/apps/startcenter.png b/sysui/desktop/icons/locolor/32x32/apps/startcenter.png Binary files differindex cfaaaba07a60..cfaaaba07a60 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/apps/startcenter.png +++ b/sysui/desktop/icons/locolor/32x32/apps/startcenter.png diff --git a/sysui/desktop/icons/locolor/32x32/apps/writer.png b/sysui/desktop/icons/locolor/32x32/apps/writer.png Binary files differindex eb433dcbb32b..eb433dcbb32b 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/apps/writer.png +++ b/sysui/desktop/icons/locolor/32x32/apps/writer.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/database.png b/sysui/desktop/icons/locolor/32x32/mimetypes/database.png Binary files differindex 709903d46c21..709903d46c21 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/database.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/database.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/drawing-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/drawing-template.png Binary files differindex 76e5abdab9f0..76e5abdab9f0 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/drawing-template.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/drawing-template.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/drawing.png b/sysui/desktop/icons/locolor/32x32/mimetypes/drawing.png Binary files differindex 380c60a7df2c..380c60a7df2c 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/drawing.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/drawing.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/formula.png b/sysui/desktop/icons/locolor/32x32/mimetypes/formula.png Binary files differindex 37306ac617ec..37306ac617ec 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/formula.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/formula.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/master-document.png b/sysui/desktop/icons/locolor/32x32/mimetypes/master-document.png Binary files differindex 1f3e79927608..1f3e79927608 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/master-document.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/master-document.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-database.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-database.png Binary files differindex 59316672d4b3..59316672d4b3 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-database.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-database.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing-template.png Binary files differindex 8379765438ba..8379765438ba 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing-template.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing-template.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing.png Binary files differindex cae97d401f5d..cae97d401f5d 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-drawing.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-formula.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-formula.png Binary files differindex 5a90e75eb86b..5a90e75eb86b 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-formula.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-formula.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-master-document.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-master-document.png Binary files differindex 19863a5b9300..19863a5b9300 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-master-document.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-master-document.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation-template.png Binary files differindex d6d2b1d68c37..d6d2b1d68c37 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation-template.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation-template.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation.png Binary files differindex da3fbe6e01c4..da3fbe6e01c4 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-presentation.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet-template.png Binary files differindex dd0c002feec5..dd0c002feec5 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet-template.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet-template.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet.png Binary files differindex 7556a2d60f7c..7556a2d60f7c 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-spreadsheet.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text-template.png Binary files differindex d559e565ca62..d559e565ca62 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text-template.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text-template.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text.png Binary files differindex 2a5ea8ff4211..2a5ea8ff4211 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-text.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-web-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-web-template.png Binary files differindex a7dcefd1c26f..a7dcefd1c26f 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-web-template.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/oasis-web-template.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/presentation-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/presentation-template.png Binary files differindex 0edabbc86f16..0edabbc86f16 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/presentation-template.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/presentation-template.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/presentation.png b/sysui/desktop/icons/locolor/32x32/mimetypes/presentation.png Binary files differindex 0eee1162ce15..0eee1162ce15 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/presentation.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/presentation.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet-template.png Binary files differindex 158a63a58c92..158a63a58c92 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet-template.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet-template.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet.png b/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet.png Binary files differindex f7352ab51783..f7352ab51783 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/spreadsheet.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/text-template.png b/sysui/desktop/icons/locolor/32x32/mimetypes/text-template.png Binary files differindex cfba26102380..cfba26102380 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/text-template.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/text-template.png diff --git a/sysui/desktop/icons/locolor/32x32/mimetypes/text.png b/sysui/desktop/icons/locolor/32x32/mimetypes/text.png Binary files differindex 77f87e777b7a..77f87e777b7a 100644..100755 --- a/sysui/desktop/icons/locolor/32x32/mimetypes/text.png +++ b/sysui/desktop/icons/locolor/32x32/mimetypes/text.png diff --git a/sysui/desktop/icons/macro.icns b/sysui/desktop/icons/macro.icns Binary files differindex 00c3978396f0..00c3978396f0 100644..100755 --- a/sysui/desktop/icons/macro.icns +++ b/sysui/desktop/icons/macro.icns diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns Binary files differindex 8357c09c0c89..c5c80a01e799 100755 --- a/sysui/desktop/icons/main.icns +++ b/sysui/desktop/icons/main.icns diff --git a/sysui/desktop/icons/main.ico b/sysui/desktop/icons/main.ico Binary files differnew file mode 100755 index 000000000000..20e665faa5e8 --- /dev/null +++ b/sysui/desktop/icons/main.ico diff --git a/sysui/desktop/icons/makefile.mk b/sysui/desktop/icons/makefile.mk index ac32cdbe453b..ac32cdbe453b 100644..100755 --- a/sysui/desktop/icons/makefile.mk +++ b/sysui/desktop/icons/makefile.mk diff --git a/sysui/desktop/icons/master-document.icns b/sysui/desktop/icons/master-document.icns Binary files differindex 33fdae3d47b7..4b0cf1bb7ea6 100644..100755 --- a/sysui/desktop/icons/master-document.icns +++ b/sysui/desktop/icons/master-document.icns diff --git a/sysui/desktop/icons/master-document.ico b/sysui/desktop/icons/master-document.ico Binary files differindex 2c581f59a2b2..bb849c6e011e 100644..100755 --- a/sysui/desktop/icons/master-document.ico +++ b/sysui/desktop/icons/master-document.ico diff --git a/sysui/desktop/icons/math.icns b/sysui/desktop/icons/math.icns Binary files differindex 283c176e9081..283c176e9081 100644..100755 --- a/sysui/desktop/icons/math.icns +++ b/sysui/desktop/icons/math.icns diff --git a/sysui/desktop/icons/oasis-chart.icns b/sysui/desktop/icons/oasis-chart.icns Binary files differindex acdb9709de84..acdb9709de84 100644..100755 --- a/sysui/desktop/icons/oasis-chart.icns +++ b/sysui/desktop/icons/oasis-chart.icns diff --git a/sysui/desktop/icons/oasis-database.icns b/sysui/desktop/icons/oasis-database.icns Binary files differindex 4d70286b0d9f..9fa0bbf3ed67 100644..100755 --- a/sysui/desktop/icons/oasis-database.icns +++ b/sysui/desktop/icons/oasis-database.icns diff --git a/sysui/desktop/icons/oasis-database.ico b/sysui/desktop/icons/oasis-database.ico Binary files differindex 3157568c3252..02cf7a484023 100644..100755 --- a/sysui/desktop/icons/oasis-database.ico +++ b/sysui/desktop/icons/oasis-database.ico diff --git a/sysui/desktop/icons/oasis-drawing-template.icns b/sysui/desktop/icons/oasis-drawing-template.icns Binary files differindex dcb55db8e98f..64c373ecaa33 100644..100755 --- a/sysui/desktop/icons/oasis-drawing-template.icns +++ b/sysui/desktop/icons/oasis-drawing-template.icns diff --git a/sysui/desktop/icons/oasis-drawing-template.ico b/sysui/desktop/icons/oasis-drawing-template.ico Binary files differindex f98a2d6f44cb..af2e9ffd93d9 100644..100755 --- a/sysui/desktop/icons/oasis-drawing-template.ico +++ b/sysui/desktop/icons/oasis-drawing-template.ico diff --git a/sysui/desktop/icons/oasis-drawing.icns b/sysui/desktop/icons/oasis-drawing.icns Binary files differindex 3802af5ef3b5..d179d041a6ca 100644..100755 --- a/sysui/desktop/icons/oasis-drawing.icns +++ b/sysui/desktop/icons/oasis-drawing.icns diff --git a/sysui/desktop/icons/oasis-drawing.ico b/sysui/desktop/icons/oasis-drawing.ico Binary files differindex b24f2dadbe86..5297daeee5b6 100644..100755 --- a/sysui/desktop/icons/oasis-drawing.ico +++ b/sysui/desktop/icons/oasis-drawing.ico diff --git a/sysui/desktop/icons/oasis-empty-document.icns b/sysui/desktop/icons/oasis-empty-document.icns Binary files differindex c52970324b27..c5c80a01e799 100644..100755 --- a/sysui/desktop/icons/oasis-empty-document.icns +++ b/sysui/desktop/icons/oasis-empty-document.icns diff --git a/sysui/desktop/icons/oasis-empty-document.ico b/sysui/desktop/icons/oasis-empty-document.ico Binary files differindex a12b54c2a2bf..20e665faa5e8 100644..100755 --- a/sysui/desktop/icons/oasis-empty-document.ico +++ b/sysui/desktop/icons/oasis-empty-document.ico diff --git a/sysui/desktop/icons/oasis-empty-template.icns b/sysui/desktop/icons/oasis-empty-template.icns Binary files differindex ee6d299991d7..c5c80a01e799 100644..100755 --- a/sysui/desktop/icons/oasis-empty-template.icns +++ b/sysui/desktop/icons/oasis-empty-template.icns diff --git a/sysui/desktop/icons/oasis-empty-template.ico b/sysui/desktop/icons/oasis-empty-template.ico Binary files differindex 63ac9f348fda..20e665faa5e8 100644..100755 --- a/sysui/desktop/icons/oasis-empty-template.ico +++ b/sysui/desktop/icons/oasis-empty-template.ico diff --git a/sysui/desktop/icons/oasis-formula.icns b/sysui/desktop/icons/oasis-formula.icns Binary files differindex 657ea29eb95c..f6dc588095f4 100644..100755 --- a/sysui/desktop/icons/oasis-formula.icns +++ b/sysui/desktop/icons/oasis-formula.icns diff --git a/sysui/desktop/icons/oasis-formula.ico b/sysui/desktop/icons/oasis-formula.ico Binary files differindex 8ba738304e85..fb2f6515bdb2 100644..100755 --- a/sysui/desktop/icons/oasis-formula.ico +++ b/sysui/desktop/icons/oasis-formula.ico diff --git a/sysui/desktop/icons/oasis-master-document.icns b/sysui/desktop/icons/oasis-master-document.icns Binary files differindex c39cb8963c82..4b0cf1bb7ea6 100644..100755 --- a/sysui/desktop/icons/oasis-master-document.icns +++ b/sysui/desktop/icons/oasis-master-document.icns diff --git a/sysui/desktop/icons/oasis-master-document.ico b/sysui/desktop/icons/oasis-master-document.ico Binary files differindex 2104eafef55c..bb849c6e011e 100644..100755 --- a/sysui/desktop/icons/oasis-master-document.ico +++ b/sysui/desktop/icons/oasis-master-document.ico diff --git a/sysui/desktop/icons/oasis-presentation-template.icns b/sysui/desktop/icons/oasis-presentation-template.icns Binary files differindex 57455ada701a..324dc7aae336 100644..100755 --- a/sysui/desktop/icons/oasis-presentation-template.icns +++ b/sysui/desktop/icons/oasis-presentation-template.icns diff --git a/sysui/desktop/icons/oasis-presentation-template.ico b/sysui/desktop/icons/oasis-presentation-template.ico Binary files differindex ef561b821598..7e99e381a3ff 100644..100755 --- a/sysui/desktop/icons/oasis-presentation-template.ico +++ b/sysui/desktop/icons/oasis-presentation-template.ico diff --git a/sysui/desktop/icons/oasis-presentation.icns b/sysui/desktop/icons/oasis-presentation.icns Binary files differindex cf768ac47ba9..c9bc5d020470 100644..100755 --- a/sysui/desktop/icons/oasis-presentation.icns +++ b/sysui/desktop/icons/oasis-presentation.icns diff --git a/sysui/desktop/icons/oasis-presentation.ico b/sysui/desktop/icons/oasis-presentation.ico Binary files differindex 6f2c1602efdf..9e96c3e57653 100644..100755 --- a/sysui/desktop/icons/oasis-presentation.ico +++ b/sysui/desktop/icons/oasis-presentation.ico diff --git a/sysui/desktop/icons/oasis-spreadsheet-template.icns b/sysui/desktop/icons/oasis-spreadsheet-template.icns Binary files differindex 8235e5287806..f527a14b7969 100644..100755 --- a/sysui/desktop/icons/oasis-spreadsheet-template.icns +++ b/sysui/desktop/icons/oasis-spreadsheet-template.icns diff --git a/sysui/desktop/icons/oasis-spreadsheet-template.ico b/sysui/desktop/icons/oasis-spreadsheet-template.ico Binary files differindex 1124d9f433e9..a4723714d65f 100644..100755 --- a/sysui/desktop/icons/oasis-spreadsheet-template.ico +++ b/sysui/desktop/icons/oasis-spreadsheet-template.ico diff --git a/sysui/desktop/icons/oasis-spreadsheet.icns b/sysui/desktop/icons/oasis-spreadsheet.icns Binary files differindex 5facf50dbcf2..9d61c699c47b 100644..100755 --- a/sysui/desktop/icons/oasis-spreadsheet.icns +++ b/sysui/desktop/icons/oasis-spreadsheet.icns diff --git a/sysui/desktop/icons/oasis-spreadsheet.ico b/sysui/desktop/icons/oasis-spreadsheet.ico Binary files differindex 160ab0cbf36c..a9dd6462e742 100644..100755 --- a/sysui/desktop/icons/oasis-spreadsheet.ico +++ b/sysui/desktop/icons/oasis-spreadsheet.ico diff --git a/sysui/desktop/icons/oasis-text-template.icns b/sysui/desktop/icons/oasis-text-template.icns Binary files differindex 0f0fe3f89788..accd48b9bdd2 100644..100755 --- a/sysui/desktop/icons/oasis-text-template.icns +++ b/sysui/desktop/icons/oasis-text-template.icns diff --git a/sysui/desktop/icons/oasis-text-template.ico b/sysui/desktop/icons/oasis-text-template.ico Binary files differindex 602124fabee7..4d33ca0d5a38 100644..100755 --- a/sysui/desktop/icons/oasis-text-template.ico +++ b/sysui/desktop/icons/oasis-text-template.ico diff --git a/sysui/desktop/icons/oasis-text.icns b/sysui/desktop/icons/oasis-text.icns Binary files differindex 2d031fe49953..9b7a301ee02b 100644..100755 --- a/sysui/desktop/icons/oasis-text.icns +++ b/sysui/desktop/icons/oasis-text.icns diff --git a/sysui/desktop/icons/oasis-text.ico b/sysui/desktop/icons/oasis-text.ico Binary files differindex d2bd5943164c..cb08cc50e27e 100644..100755 --- a/sysui/desktop/icons/oasis-text.ico +++ b/sysui/desktop/icons/oasis-text.ico diff --git a/sysui/desktop/icons/oasis-web-template.icns b/sysui/desktop/icons/oasis-web-template.icns Binary files differindex ee6d299991d7..735223732855 100644..100755 --- a/sysui/desktop/icons/oasis-web-template.icns +++ b/sysui/desktop/icons/oasis-web-template.icns diff --git a/sysui/desktop/icons/oasis-web-template.ico b/sysui/desktop/icons/oasis-web-template.ico Binary files differindex 63ac9f348fda..70c5d61ce49c 100644..100755 --- a/sysui/desktop/icons/oasis-web-template.ico +++ b/sysui/desktop/icons/oasis-web-template.ico diff --git a/sysui/desktop/icons/ooo-base-app.ico b/sysui/desktop/icons/ooo-base-app.ico Binary files differindex e9af06abd9b1..e9af06abd9b1 100644..100755 --- a/sysui/desktop/icons/ooo-base-app.ico +++ b/sysui/desktop/icons/ooo-base-app.ico diff --git a/sysui/desktop/icons/ooo-base-doc.ico b/sysui/desktop/icons/ooo-base-doc.ico Binary files differindex 62411deef5e1..62411deef5e1 100644..100755 --- a/sysui/desktop/icons/ooo-base-doc.ico +++ b/sysui/desktop/icons/ooo-base-doc.ico diff --git a/sysui/desktop/icons/ooo-calc-app.ico b/sysui/desktop/icons/ooo-calc-app.ico Binary files differindex 8d91367e5a2f..8d91367e5a2f 100644..100755 --- a/sysui/desktop/icons/ooo-calc-app.ico +++ b/sysui/desktop/icons/ooo-calc-app.ico diff --git a/sysui/desktop/icons/ooo-calc-doc.ico b/sysui/desktop/icons/ooo-calc-doc.ico Binary files differindex 06c49654b4f9..06c49654b4f9 100644..100755 --- a/sysui/desktop/icons/ooo-calc-doc.ico +++ b/sysui/desktop/icons/ooo-calc-doc.ico diff --git a/sysui/desktop/icons/ooo-calc-tem.ico b/sysui/desktop/icons/ooo-calc-tem.ico Binary files differindex cb34adc84da1..cb34adc84da1 100644..100755 --- a/sysui/desktop/icons/ooo-calc-tem.ico +++ b/sysui/desktop/icons/ooo-calc-tem.ico diff --git a/sysui/desktop/icons/ooo-chart-doc.ico b/sysui/desktop/icons/ooo-chart-doc.ico Binary files differindex 4a50158b4053..4a50158b4053 100644..100755 --- a/sysui/desktop/icons/ooo-chart-doc.ico +++ b/sysui/desktop/icons/ooo-chart-doc.ico diff --git a/sysui/desktop/icons/ooo-configuration.ico b/sysui/desktop/icons/ooo-configuration.ico Binary files differindex 9bae70b68b25..9bae70b68b25 100644..100755 --- a/sysui/desktop/icons/ooo-configuration.ico +++ b/sysui/desktop/icons/ooo-configuration.ico diff --git a/sysui/desktop/icons/ooo-draw-app.ico b/sysui/desktop/icons/ooo-draw-app.ico Binary files differindex 9f4f0c35af14..9f4f0c35af14 100644..100755 --- a/sysui/desktop/icons/ooo-draw-app.ico +++ b/sysui/desktop/icons/ooo-draw-app.ico diff --git a/sysui/desktop/icons/ooo-draw-doc.ico b/sysui/desktop/icons/ooo-draw-doc.ico Binary files differindex 96d0710455e8..96d0710455e8 100644..100755 --- a/sysui/desktop/icons/ooo-draw-doc.ico +++ b/sysui/desktop/icons/ooo-draw-doc.ico diff --git a/sysui/desktop/icons/ooo-draw-tem.ico b/sysui/desktop/icons/ooo-draw-tem.ico Binary files differindex 6b18169708d8..6b18169708d8 100644..100755 --- a/sysui/desktop/icons/ooo-draw-tem.ico +++ b/sysui/desktop/icons/ooo-draw-tem.ico diff --git a/sysui/desktop/icons/ooo-empty-doc.ico b/sysui/desktop/icons/ooo-empty-doc.ico Binary files differindex bd3aa12af516..bd3aa12af516 100644..100755 --- a/sysui/desktop/icons/ooo-empty-doc.ico +++ b/sysui/desktop/icons/ooo-empty-doc.ico diff --git a/sysui/desktop/icons/ooo-empty-tem.ico b/sysui/desktop/icons/ooo-empty-tem.ico Binary files differindex b68f0f15f5bd..b68f0f15f5bd 100644..100755 --- a/sysui/desktop/icons/ooo-empty-tem.ico +++ b/sysui/desktop/icons/ooo-empty-tem.ico diff --git a/sysui/desktop/icons/ooo-image-doc.ico b/sysui/desktop/icons/ooo-image-doc.ico Binary files differindex 96d0710455e8..96d0710455e8 100644..100755 --- a/sysui/desktop/icons/ooo-image-doc.ico +++ b/sysui/desktop/icons/ooo-image-doc.ico diff --git a/sysui/desktop/icons/ooo-impress-app.ico b/sysui/desktop/icons/ooo-impress-app.ico Binary files differindex 7dcd17aba264..7dcd17aba264 100644..100755 --- a/sysui/desktop/icons/ooo-impress-app.ico +++ b/sysui/desktop/icons/ooo-impress-app.ico diff --git a/sysui/desktop/icons/ooo-impress-doc.ico b/sysui/desktop/icons/ooo-impress-doc.ico Binary files differindex 9da080cefaee..9da080cefaee 100644..100755 --- a/sysui/desktop/icons/ooo-impress-doc.ico +++ b/sysui/desktop/icons/ooo-impress-doc.ico diff --git a/sysui/desktop/icons/ooo-impress-tem.ico b/sysui/desktop/icons/ooo-impress-tem.ico Binary files differindex aa861d8bfb84..aa861d8bfb84 100644..100755 --- a/sysui/desktop/icons/ooo-impress-tem.ico +++ b/sysui/desktop/icons/ooo-impress-tem.ico diff --git a/sysui/desktop/icons/ooo-macro-doc.ico b/sysui/desktop/icons/ooo-macro-doc.ico Binary files differindex 266e35d047b7..266e35d047b7 100644..100755 --- a/sysui/desktop/icons/ooo-macro-doc.ico +++ b/sysui/desktop/icons/ooo-macro-doc.ico diff --git a/sysui/desktop/icons/ooo-main-app.ico b/sysui/desktop/icons/ooo-main-app.ico Binary files differindex fa01babdb9c7..fa01babdb9c7 100644..100755 --- a/sysui/desktop/icons/ooo-main-app.ico +++ b/sysui/desktop/icons/ooo-main-app.ico diff --git a/sysui/desktop/icons/ooo-master-doc.ico b/sysui/desktop/icons/ooo-master-doc.ico Binary files differindex 4a157a9c27b9..4a157a9c27b9 100644..100755 --- a/sysui/desktop/icons/ooo-master-doc.ico +++ b/sysui/desktop/icons/ooo-master-doc.ico diff --git a/sysui/desktop/icons/ooo-math-app.ico b/sysui/desktop/icons/ooo-math-app.ico Binary files differindex d182fd54bc2a..d182fd54bc2a 100644..100755 --- a/sysui/desktop/icons/ooo-math-app.ico +++ b/sysui/desktop/icons/ooo-math-app.ico diff --git a/sysui/desktop/icons/ooo-math-doc.ico b/sysui/desktop/icons/ooo-math-doc.ico Binary files differindex 786127ab2686..786127ab2686 100644..100755 --- a/sysui/desktop/icons/ooo-math-doc.ico +++ b/sysui/desktop/icons/ooo-math-doc.ico diff --git a/sysui/desktop/icons/ooo-open.ico b/sysui/desktop/icons/ooo-open.ico Binary files differindex 78987aec3422..78987aec3422 100644..100755 --- a/sysui/desktop/icons/ooo-open.ico +++ b/sysui/desktop/icons/ooo-open.ico diff --git a/sysui/desktop/icons/ooo-printer.ico b/sysui/desktop/icons/ooo-printer.ico Binary files differindex 14882d1d1a07..14882d1d1a07 100644..100755 --- a/sysui/desktop/icons/ooo-printer.ico +++ b/sysui/desktop/icons/ooo-printer.ico diff --git a/sysui/desktop/icons/ooo-web-doc.ico b/sysui/desktop/icons/ooo-web-doc.ico Binary files differindex f03da4e65d00..f03da4e65d00 100644..100755 --- a/sysui/desktop/icons/ooo-web-doc.ico +++ b/sysui/desktop/icons/ooo-web-doc.ico diff --git a/sysui/desktop/icons/ooo-writer-app.ico b/sysui/desktop/icons/ooo-writer-app.ico Binary files differindex 22c9661f1ce0..22c9661f1ce0 100644..100755 --- a/sysui/desktop/icons/ooo-writer-app.ico +++ b/sysui/desktop/icons/ooo-writer-app.ico diff --git a/sysui/desktop/icons/ooo-writer-doc.ico b/sysui/desktop/icons/ooo-writer-doc.ico Binary files differindex 694a166d4516..694a166d4516 100644..100755 --- a/sysui/desktop/icons/ooo-writer-doc.ico +++ b/sysui/desktop/icons/ooo-writer-doc.ico diff --git a/sysui/desktop/icons/ooo-writer-tem.ico b/sysui/desktop/icons/ooo-writer-tem.ico Binary files differindex 9379f9bc0c75..9379f9bc0c75 100644..100755 --- a/sysui/desktop/icons/ooo-writer-tem.ico +++ b/sysui/desktop/icons/ooo-writer-tem.ico diff --git a/sysui/desktop/icons/ooo3_base_app.icns b/sysui/desktop/icons/ooo3_base_app.icns Binary files differnew file mode 100755 index 000000000000..9fa0bbf3ed67 --- /dev/null +++ b/sysui/desktop/icons/ooo3_base_app.icns diff --git a/sysui/desktop/icons/ooo3_base_app.ico b/sysui/desktop/icons/ooo3_base_app.ico Binary files differindex ba96b7987627..02cf7a484023 100755 --- a/sysui/desktop/icons/ooo3_base_app.ico +++ b/sysui/desktop/icons/ooo3_base_app.ico diff --git a/sysui/desktop/icons/ooo3_base_doc.ico b/sysui/desktop/icons/ooo3_base_doc.ico Binary files differindex 87c58e600eb5..87c58e600eb5 100644..100755 --- a/sysui/desktop/icons/ooo3_base_doc.ico +++ b/sysui/desktop/icons/ooo3_base_doc.ico diff --git a/sysui/desktop/icons/ooo3_calc_app.icns b/sysui/desktop/icons/ooo3_calc_app.icns Binary files differnew file mode 100755 index 000000000000..9d61c699c47b --- /dev/null +++ b/sysui/desktop/icons/ooo3_calc_app.icns diff --git a/sysui/desktop/icons/ooo3_calc_app.ico b/sysui/desktop/icons/ooo3_calc_app.ico Binary files differindex c96041541556..a9dd6462e742 100755 --- a/sysui/desktop/icons/ooo3_calc_app.ico +++ b/sysui/desktop/icons/ooo3_calc_app.ico diff --git a/sysui/desktop/icons/ooo3_calc_doc.ico b/sysui/desktop/icons/ooo3_calc_doc.ico Binary files differindex 92741f3c6e84..92741f3c6e84 100644..100755 --- a/sysui/desktop/icons/ooo3_calc_doc.ico +++ b/sysui/desktop/icons/ooo3_calc_doc.ico diff --git a/sysui/desktop/icons/ooo3_calc_tem.ico b/sysui/desktop/icons/ooo3_calc_tem.ico Binary files differindex 2a72a5ad4d80..2a72a5ad4d80 100644..100755 --- a/sysui/desktop/icons/ooo3_calc_tem.ico +++ b/sysui/desktop/icons/ooo3_calc_tem.ico diff --git a/sysui/desktop/icons/ooo3_chart_doc.ico b/sysui/desktop/icons/ooo3_chart_doc.ico Binary files differindex 5c46bd462650..5c46bd462650 100644..100755 --- a/sysui/desktop/icons/ooo3_chart_doc.ico +++ b/sysui/desktop/icons/ooo3_chart_doc.ico diff --git a/sysui/desktop/icons/ooo3_draw_app.icns b/sysui/desktop/icons/ooo3_draw_app.icns Binary files differnew file mode 100755 index 000000000000..d179d041a6ca --- /dev/null +++ b/sysui/desktop/icons/ooo3_draw_app.icns diff --git a/sysui/desktop/icons/ooo3_draw_app.ico b/sysui/desktop/icons/ooo3_draw_app.ico Binary files differindex 6e00cb893786..5297daeee5b6 100755 --- a/sysui/desktop/icons/ooo3_draw_app.ico +++ b/sysui/desktop/icons/ooo3_draw_app.ico diff --git a/sysui/desktop/icons/ooo3_draw_doc.ico b/sysui/desktop/icons/ooo3_draw_doc.ico Binary files differindex 47ed3efbc406..47ed3efbc406 100644..100755 --- a/sysui/desktop/icons/ooo3_draw_doc.ico +++ b/sysui/desktop/icons/ooo3_draw_doc.ico diff --git a/sysui/desktop/icons/ooo3_draw_tem.ico b/sysui/desktop/icons/ooo3_draw_tem.ico Binary files differindex 4a55c995be55..4a55c995be55 100644..100755 --- a/sysui/desktop/icons/ooo3_draw_tem.ico +++ b/sysui/desktop/icons/ooo3_draw_tem.ico diff --git a/sysui/desktop/icons/ooo3_empty_doc.ico b/sysui/desktop/icons/ooo3_empty_doc.ico Binary files differindex 67e3c345e69d..67e3c345e69d 100644..100755 --- a/sysui/desktop/icons/ooo3_empty_doc.ico +++ b/sysui/desktop/icons/ooo3_empty_doc.ico diff --git a/sysui/desktop/icons/ooo3_empty_tem.ico b/sysui/desktop/icons/ooo3_empty_tem.ico Binary files differindex eecd336bc4b1..eecd336bc4b1 100644..100755 --- a/sysui/desktop/icons/ooo3_empty_tem.ico +++ b/sysui/desktop/icons/ooo3_empty_tem.ico diff --git a/sysui/desktop/icons/ooo3_global_doc.ico b/sysui/desktop/icons/ooo3_global_doc.ico Binary files differindex c7113f89e089..c7113f89e089 100644..100755 --- a/sysui/desktop/icons/ooo3_global_doc.ico +++ b/sysui/desktop/icons/ooo3_global_doc.ico diff --git a/sysui/desktop/icons/ooo3_html_doc.ico b/sysui/desktop/icons/ooo3_html_doc.ico Binary files differindex 2c8b5c527eb1..2c8b5c527eb1 100644..100755 --- a/sysui/desktop/icons/ooo3_html_doc.ico +++ b/sysui/desktop/icons/ooo3_html_doc.ico diff --git a/sysui/desktop/icons/ooo3_impress_app.icns b/sysui/desktop/icons/ooo3_impress_app.icns Binary files differnew file mode 100755 index 000000000000..c9bc5d020470 --- /dev/null +++ b/sysui/desktop/icons/ooo3_impress_app.icns diff --git a/sysui/desktop/icons/ooo3_impress_app.ico b/sysui/desktop/icons/ooo3_impress_app.ico Binary files differindex 23ee3ecc5edf..9e96c3e57653 100755 --- a/sysui/desktop/icons/ooo3_impress_app.ico +++ b/sysui/desktop/icons/ooo3_impress_app.ico diff --git a/sysui/desktop/icons/ooo3_impress_doc.ico b/sysui/desktop/icons/ooo3_impress_doc.ico Binary files differindex 0e80d9b01d46..0e80d9b01d46 100644..100755 --- a/sysui/desktop/icons/ooo3_impress_doc.ico +++ b/sysui/desktop/icons/ooo3_impress_doc.ico diff --git a/sysui/desktop/icons/ooo3_impress_tem.ico b/sysui/desktop/icons/ooo3_impress_tem.ico Binary files differindex 15f988dcd541..15f988dcd541 100644..100755 --- a/sysui/desktop/icons/ooo3_impress_tem.ico +++ b/sysui/desktop/icons/ooo3_impress_tem.ico diff --git a/sysui/desktop/icons/ooo3_macro_doc.ico b/sysui/desktop/icons/ooo3_macro_doc.ico Binary files differindex 6c614ad05d50..6c614ad05d50 100644..100755 --- a/sysui/desktop/icons/ooo3_macro_doc.ico +++ b/sysui/desktop/icons/ooo3_macro_doc.ico diff --git a/sysui/desktop/icons/ooo3_main_app.icns b/sysui/desktop/icons/ooo3_main_app.icns Binary files differnew file mode 100755 index 000000000000..c5c80a01e799 --- /dev/null +++ b/sysui/desktop/icons/ooo3_main_app.icns diff --git a/sysui/desktop/icons/ooo3_main_app.ico b/sysui/desktop/icons/ooo3_main_app.ico Binary files differindex 98fcea3748a9..20e665faa5e8 100755 --- a/sysui/desktop/icons/ooo3_main_app.ico +++ b/sysui/desktop/icons/ooo3_main_app.ico diff --git a/sysui/desktop/icons/ooo3_math_app.icns b/sysui/desktop/icons/ooo3_math_app.icns Binary files differnew file mode 100755 index 000000000000..f6dc588095f4 --- /dev/null +++ b/sysui/desktop/icons/ooo3_math_app.icns diff --git a/sysui/desktop/icons/ooo3_math_app.ico b/sysui/desktop/icons/ooo3_math_app.ico Binary files differindex 605814c96e95..fb2f6515bdb2 100755 --- a/sysui/desktop/icons/ooo3_math_app.ico +++ b/sysui/desktop/icons/ooo3_math_app.ico diff --git a/sysui/desktop/icons/ooo3_math_doc.ico b/sysui/desktop/icons/ooo3_math_doc.ico Binary files differindex 9e349dcfcbfd..9e349dcfcbfd 100644..100755 --- a/sysui/desktop/icons/ooo3_math_doc.ico +++ b/sysui/desktop/icons/ooo3_math_doc.ico diff --git a/sysui/desktop/icons/ooo3_open.icns b/sysui/desktop/icons/ooo3_open.icns Binary files differnew file mode 100755 index 000000000000..c5c80a01e799 --- /dev/null +++ b/sysui/desktop/icons/ooo3_open.icns diff --git a/sysui/desktop/icons/ooo3_open.ico b/sysui/desktop/icons/ooo3_open.ico Binary files differindex 98fcea3748a9..20e665faa5e8 100755 --- a/sysui/desktop/icons/ooo3_open.ico +++ b/sysui/desktop/icons/ooo3_open.ico diff --git a/sysui/desktop/icons/ooo3_writer_app.icns b/sysui/desktop/icons/ooo3_writer_app.icns Binary files differnew file mode 100755 index 000000000000..9b7a301ee02b --- /dev/null +++ b/sysui/desktop/icons/ooo3_writer_app.icns diff --git a/sysui/desktop/icons/ooo3_writer_app.ico b/sysui/desktop/icons/ooo3_writer_app.ico Binary files differindex 005bd587661b..cb08cc50e27e 100755 --- a/sysui/desktop/icons/ooo3_writer_app.ico +++ b/sysui/desktop/icons/ooo3_writer_app.ico diff --git a/sysui/desktop/icons/ooo3_writer_doc.ico b/sysui/desktop/icons/ooo3_writer_doc.ico Binary files differindex 1ed299a865f9..1ed299a865f9 100644..100755 --- a/sysui/desktop/icons/ooo3_writer_doc.ico +++ b/sysui/desktop/icons/ooo3_writer_doc.ico diff --git a/sysui/desktop/icons/ooo3_writer_tem.ico b/sysui/desktop/icons/ooo3_writer_tem.ico Binary files differindex f609be128aaf..f609be128aaf 100644..100755 --- a/sysui/desktop/icons/ooo3_writer_tem.ico +++ b/sysui/desktop/icons/ooo3_writer_tem.ico diff --git a/sysui/desktop/icons/open.icns b/sysui/desktop/icons/open.icns Binary files differindex 620f8e125bd6..620f8e125bd6 100644..100755 --- a/sysui/desktop/icons/open.icns +++ b/sysui/desktop/icons/open.icns diff --git a/sysui/desktop/icons/oxt-extension.ico b/sysui/desktop/icons/oxt-extension.ico Binary files differindex b6c1808d4372..b6c1808d4372 100644..100755 --- a/sysui/desktop/icons/oxt-extension.ico +++ b/sysui/desktop/icons/oxt-extension.ico diff --git a/sysui/desktop/icons/presentation-template.icns b/sysui/desktop/icons/presentation-template.icns Binary files differindex f4d01878b9fb..324dc7aae336 100644..100755 --- a/sysui/desktop/icons/presentation-template.icns +++ b/sysui/desktop/icons/presentation-template.icns diff --git a/sysui/desktop/icons/presentation-template.ico b/sysui/desktop/icons/presentation-template.ico Binary files differindex 471940369aaf..7e99e381a3ff 100644..100755 --- a/sysui/desktop/icons/presentation-template.ico +++ b/sysui/desktop/icons/presentation-template.ico diff --git a/sysui/desktop/icons/presentation.icns b/sysui/desktop/icons/presentation.icns Binary files differindex 091be5b13677..c9bc5d020470 100644..100755 --- a/sysui/desktop/icons/presentation.icns +++ b/sysui/desktop/icons/presentation.icns diff --git a/sysui/desktop/icons/presentation.ico b/sysui/desktop/icons/presentation.ico Binary files differindex 360ef79e18b9..9e96c3e57653 100644..100755 --- a/sysui/desktop/icons/presentation.ico +++ b/sysui/desktop/icons/presentation.ico diff --git a/sysui/desktop/icons/printer.icns b/sysui/desktop/icons/printer.icns Binary files differindex a1eb59934526..a1eb59934526 100644..100755 --- a/sysui/desktop/icons/printer.icns +++ b/sysui/desktop/icons/printer.icns diff --git a/sysui/desktop/icons/so9_base_app.ico b/sysui/desktop/icons/so9_base_app.ico Binary files differindex aa7036eb90fc..56a323c07e61 100755 --- a/sysui/desktop/icons/so9_base_app.ico +++ b/sysui/desktop/icons/so9_base_app.ico diff --git a/sysui/desktop/icons/so9_calc_app.ico b/sysui/desktop/icons/so9_calc_app.ico Binary files differindex d7182cad0943..81e6948d3971 100755 --- a/sysui/desktop/icons/so9_calc_app.ico +++ b/sysui/desktop/icons/so9_calc_app.ico diff --git a/sysui/desktop/icons/so9_draw_app.ico b/sysui/desktop/icons/so9_draw_app.ico Binary files differindex a8b3c3270fc0..a2c108ad6fe2 100755 --- a/sysui/desktop/icons/so9_draw_app.ico +++ b/sysui/desktop/icons/so9_draw_app.ico diff --git a/sysui/desktop/icons/so9_impress_app.ico b/sysui/desktop/icons/so9_impress_app.ico Binary files differindex cf10331c5ff9..0fe4cea9f267 100755 --- a/sysui/desktop/icons/so9_impress_app.ico +++ b/sysui/desktop/icons/so9_impress_app.ico diff --git a/sysui/desktop/icons/so9_main_app.ico b/sysui/desktop/icons/so9_main_app.ico Binary files differindex 90f193d80dd9..197b924d3369 100755 --- a/sysui/desktop/icons/so9_main_app.ico +++ b/sysui/desktop/icons/so9_main_app.ico diff --git a/sysui/desktop/icons/so9_math_app.ico b/sysui/desktop/icons/so9_math_app.ico Binary files differindex 11fbbf9a494a..4d947c2e593d 100755 --- a/sysui/desktop/icons/so9_math_app.ico +++ b/sysui/desktop/icons/so9_math_app.ico diff --git a/sysui/desktop/icons/so9_writer_app.ico b/sysui/desktop/icons/so9_writer_app.ico Binary files differindex 10c964dba966..2df20830d9d2 100755 --- a/sysui/desktop/icons/so9_writer_app.ico +++ b/sysui/desktop/icons/so9_writer_app.ico diff --git a/sysui/desktop/icons/spreadsheet-template.icns b/sysui/desktop/icons/spreadsheet-template.icns Binary files differindex d2dfa849296b..f527a14b7969 100644..100755 --- a/sysui/desktop/icons/spreadsheet-template.icns +++ b/sysui/desktop/icons/spreadsheet-template.icns diff --git a/sysui/desktop/icons/spreadsheet-template.ico b/sysui/desktop/icons/spreadsheet-template.ico Binary files differindex be267eb21bb1..a4723714d65f 100644..100755 --- a/sysui/desktop/icons/spreadsheet-template.ico +++ b/sysui/desktop/icons/spreadsheet-template.ico diff --git a/sysui/desktop/icons/spreadsheet.icns b/sysui/desktop/icons/spreadsheet.icns Binary files differindex 5c893541954b..9d61c699c47b 100644..100755 --- a/sysui/desktop/icons/spreadsheet.icns +++ b/sysui/desktop/icons/spreadsheet.icns diff --git a/sysui/desktop/icons/spreadsheet.ico b/sysui/desktop/icons/spreadsheet.ico Binary files differindex a88045e9c1c3..a9dd6462e742 100644..100755 --- a/sysui/desktop/icons/spreadsheet.ico +++ b/sysui/desktop/icons/spreadsheet.ico diff --git a/sysui/desktop/icons/text-template.icns b/sysui/desktop/icons/text-template.icns Binary files differindex 8b9694ac755a..accd48b9bdd2 100644..100755 --- a/sysui/desktop/icons/text-template.icns +++ b/sysui/desktop/icons/text-template.icns diff --git a/sysui/desktop/icons/text-template.ico b/sysui/desktop/icons/text-template.ico Binary files differindex 07986929a6f1..4d33ca0d5a38 100644..100755 --- a/sysui/desktop/icons/text-template.ico +++ b/sysui/desktop/icons/text-template.ico diff --git a/sysui/desktop/icons/text.icns b/sysui/desktop/icons/text.icns Binary files differindex 401d2b9dbf6c..9b7a301ee02b 100644..100755 --- a/sysui/desktop/icons/text.icns +++ b/sysui/desktop/icons/text.icns diff --git a/sysui/desktop/icons/text.ico b/sysui/desktop/icons/text.ico Binary files differindex f19a7812b15a..cb08cc50e27e 100644..100755 --- a/sysui/desktop/icons/text.ico +++ b/sysui/desktop/icons/text.ico diff --git a/sysui/desktop/icons/writer.icns b/sysui/desktop/icons/writer.icns Binary files differindex d0f44815e8fa..d0f44815e8fa 100644..100755 --- a/sysui/desktop/icons/writer.icns +++ b/sysui/desktop/icons/writer.icns diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist index cf04e8086afe..8100df25d2a1 100644..100755 --- a/sysui/desktop/macosx/Info.plist +++ b/sysui/desktop/macosx/Info.plist @@ -1390,7 +1390,7 @@ <key>CFBundleShortVersionString</key> <string>${ABOUTBOXPRODUCTVERSION}</string> <key>CFBundleIdentifier</key> - <string>org.openoffice.script</string> + <string>org.libreoffice.script</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> @@ -1398,7 +1398,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> - <string>OOo2</string> + <string>LibO</string> <key>LSRequiresCarbon</key> <string>1</string> <key>NSPrincipalClass</key> diff --git a/sysui/desktop/macosx/delzip b/sysui/desktop/macosx/delzip index e69de29bb2d1..e69de29bb2d1 100644..100755 --- a/sysui/desktop/macosx/delzip +++ b/sysui/desktop/macosx/delzip diff --git a/sysui/desktop/macosx/gen_strings.pl b/sysui/desktop/macosx/gen_strings.pl index 648becaec924..648becaec924 100644..100755 --- a/sysui/desktop/macosx/gen_strings.pl +++ b/sysui/desktop/macosx/gen_strings.pl diff --git a/sysui/desktop/macosx/list_icons.pl b/sysui/desktop/macosx/list_icons.pl index baf155c03d1d..baf155c03d1d 100644..100755 --- a/sysui/desktop/macosx/list_icons.pl +++ b/sysui/desktop/macosx/list_icons.pl diff --git a/sysui/desktop/macosx/makefile.mk b/sysui/desktop/macosx/makefile.mk index 654ac5579df9..89f23562f3af 100644..100755 --- a/sysui/desktop/macosx/makefile.mk +++ b/sysui/desktop/macosx/makefile.mk @@ -46,13 +46,8 @@ ZIP1TARGET = osxicons ZIP1DIR = ../icons ZIP1LIST := $(shell $(PERL) -w list_icons.pl < Info.plist) -.IF "$(GUIBASE)"!="aqua" -CREATOR_TYPE=OOo2 -EXECUTABLE=droplet -.ELSE -CREATOR_TYPE=OOO2 +CREATOR_TYPE=LIBO EXECUTABLE=soffice -.ENDIF .IF "$(WITH_LANG)"!="" ULFDIR:=$(COMMONMISC)$/desktopshare diff --git a/sysui/desktop/mandriva/makefile.mk b/sysui/desktop/mandriva/makefile.mk index 011b52e41791..011b52e41791 100644..100755 --- a/sysui/desktop/mandriva/makefile.mk +++ b/sysui/desktop/mandriva/makefile.mk diff --git a/sysui/desktop/mandriva/mandriva-menus.spec b/sysui/desktop/mandriva/mandriva-menus.spec index 4c02c70d90c1..f06878857776 100644..100755 --- a/sysui/desktop/mandriva/mandriva-menus.spec +++ b/sysui/desktop/mandriva/mandriva-menus.spec @@ -13,7 +13,7 @@ BuildArch: noarch # here and check for the 'mandriva-release' in the future (next year). # Requires: mandrake-release -Provides: openoffice.org3-desktop-integration +Provides: libreoffice-desktop-integration %define _unpackaged_files_terminate_build 0 %define _binary_filedigest_algorithm 1 @@ -107,7 +107,7 @@ if [ "$1" = 1 ] then # backing out existing entries to avoid duplicates sed ' -/^# OpenOffice.org/d +/^# LibreOffice/d /^application\/vnd\.oasis\.opendocument/d /^application\/vnd\.openofficeorg/d /^application\/vnd\.sun/d @@ -309,7 +309,12 @@ fi %files -%attr(0755,root,root) /usr/bin/soffice +%if %unixfilename != libreoffice +# compat symlinks +%attr(0755,root,root) /opt/%unixfilename +%attr(0755,root,root) /usr/bin/libreoffice +%attr(0755,root,root) /usr/bin/libreoffice-printeradmin +%endif %attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename %attr(0755,root,root) /usr/bin/%unixfilename-printeradmin %defattr(0644, root, root) diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop index 9497666691fe..40f7e79ebc8c 100644..100755 --- a/sysui/desktop/menus/base.desktop +++ b/sysui/desktop/menus/base.desktop @@ -4,9 +4,10 @@ Terminal=false Icon=base Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-MoreApplications-Databases; -Exec=openoffice -base %U +Exec=${UNIXBASISROOTNAME} --base %U MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base; Name=%PRODUCTNAME Base +Name[pt_BR]=%PRODUCTNAME_BR Base GenericName=Database Development Comment=Manage databases, create queries and reports to track and manage your information by using Base. InitialPreference=5 diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop index bc0c9ee8b618..3ae2bcb0b121 100644..100755 --- a/sysui/desktop/menus/calc.desktop +++ b/sysui/desktop/menus/calc.desktop @@ -4,9 +4,10 @@ Terminal=false Icon=calc Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets; -Exec=openoffice -calc %U +Exec=${UNIXBASISROOTNAME} --calc %U MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf; Name=%PRODUCTNAME Calc +Name[pt_BR]=%PRODUCTNAME_BR Calc GenericName=Spreadsheet Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc. InitialPreference=5 diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop index 42db7c6f84a0..f609d35f6965 100644..100755 --- a/sysui/desktop/menus/draw.desktop +++ b/sysui/desktop/menus/draw.desktop @@ -4,9 +4,10 @@ Terminal=false Icon=draw Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing; -Exec=openoffice -draw %U +Exec=${UNIXBASISROOTNAME} --draw %U MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw; Name=%PRODUCTNAME Draw +Name[pt_BR]=%PRODUCTNAME_BR Draw GenericName=Drawing Program Comment=Create and edit drawings, flow charts, and logos by using Draw. InitialPreference=5 diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop index 90df11ac54f1..814ee1d1fd49 100644..100755 --- a/sysui/desktop/menus/impress.desktop +++ b/sysui/desktop/menus/impress.desktop @@ -4,9 +4,10 @@ Terminal=false Icon=impress Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations; -Exec=openoffice -impress %U +Exec=${UNIXBASISROOTNAME} --impress %U MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12; Name=%PRODUCTNAME Impress +Name[pt_BR]=%PRODUCTNAME_BR Impress GenericName=Presentation Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress. InitialPreference=5 diff --git a/sysui/desktop/menus/javafilter.desktop b/sysui/desktop/menus/javafilter.desktop index 9d230f954a7b..8b9c30a2f70f 100644..100755 --- a/sysui/desktop/menus/javafilter.desktop +++ b/sysui/desktop/menus/javafilter.desktop @@ -2,8 +2,9 @@ Version=1.0 Terminal=false Type=Application -Exec=openoffice -writer %U +Exec=${UNIXBASISROOTNAME} --writer %U MimeType=application/x-aportisdoc;application/x-pocket-word;application/x-pocket-excel; Name=%PRODUCTNAME Small Device Format Importer +Name[pt_BR]=%PRODUCTNAME_BR Small Device Format Importer GenericName=Small Device Format Importer NoDisplay=true diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index f97536d6ef04..55fcc29f312d 100644..100755 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -4,9 +4,10 @@ Terminal=false Icon=math Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other; -Exec=openoffice -math %U +Exec=${UNIXBASISROOTNAME} --math %U MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math; Name=%PRODUCTNAME Math +Name[pt_BR]=%PRODUCTNAME_BR Math GenericName=Formula Editor Comment=Create and edit scientific formulas and equations by using Math. InitialPreference=5 diff --git a/sysui/desktop/menus/printeradmin.desktop b/sysui/desktop/menus/printeradmin.desktop index 9ddd9bff495f..3da4d82a33b1 100644..100755 --- a/sysui/desktop/menus/printeradmin.desktop +++ b/sysui/desktop/menus/printeradmin.desktop @@ -4,5 +4,7 @@ Terminal=false Icon=printeradmin Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office; -Exec=openoffice-printeradmin +Exec=${UNIXBASISROOTNAME}-printeradmin Name=%PRODUCTNAME Printer Administration +Name[pt_BR]=%PRODUCTNAME_BR Printer Administration + diff --git a/sysui/desktop/menus/qstart.desktop b/sysui/desktop/menus/qstart.desktop index 17e4edfff19e..52ac185b9d3f 100644..100755 --- a/sysui/desktop/menus/qstart.desktop +++ b/sysui/desktop/menus/qstart.desktop @@ -3,7 +3,8 @@ Version=1.0 Terminal=false Type=Application Categories=Office; -Exec=openoffice -quickstart -nologo -nodefault +Exec=${UNIXBASISROOTNAME} --quickstart --nologo --nodefault NoDisplay=true Name=%PRODUCTNAME Quickstarter +Name[pt_BR]=%PRODUCTNAME_BR Quickstarter Comment=Hook for quickstarter startup diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop index 6302a5b16289..390dd93f3a0a 100644..100755 --- a/sysui/desktop/menus/startcenter.desktop +++ b/sysui/desktop/menus/startcenter.desktop @@ -4,8 +4,9 @@ Terminal=false Icon=startcenter Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other; -Exec=openoffice %U +Exec=${UNIXBASISROOTNAME} %U MimeType=application/vnd.openofficeorg.extension; Name=%PRODUCTNAME +Name[pt_BR]=%PRODUCTNAME_BR GenericName=Office -Comment=The office productivity suite compatible to the open and standardized ODF document format. Supported by Sun Microsystems. +Comment=The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation. diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop index 1509de0fb402..59b4f5778e8b 100644..100755 --- a/sysui/desktop/menus/writer.desktop +++ b/sysui/desktop/menus/writer.desktop @@ -4,9 +4,10 @@ Terminal=false Icon=writer Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors; -Exec=openoffice -writer %U +Exec=${UNIXBASISROOTNAME} --writer %U MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12; Name=%PRODUCTNAME Writer +Name[pt_BR]=%PRODUCTNAME_BR Writer GenericName=Word Processor Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. InitialPreference=5 diff --git a/sysui/desktop/mimetypes/drawing-template.desktop b/sysui/desktop/mimetypes/drawing-template.desktop index e7bb7108e1d9..e7bb7108e1d9 100644..100755 --- a/sysui/desktop/mimetypes/drawing-template.desktop +++ b/sysui/desktop/mimetypes/drawing-template.desktop diff --git a/sysui/desktop/mimetypes/drawing-template.keys b/sysui/desktop/mimetypes/drawing-template.keys index 2c6e8449e138..2c6e8449e138 100644..100755 --- a/sysui/desktop/mimetypes/drawing-template.keys +++ b/sysui/desktop/mimetypes/drawing-template.keys diff --git a/sysui/desktop/mimetypes/drawing.desktop b/sysui/desktop/mimetypes/drawing.desktop index 36b74bffc9bd..36b74bffc9bd 100644..100755 --- a/sysui/desktop/mimetypes/drawing.desktop +++ b/sysui/desktop/mimetypes/drawing.desktop diff --git a/sysui/desktop/mimetypes/drawing.keys b/sysui/desktop/mimetypes/drawing.keys index 2fbd27e43223..2fbd27e43223 100644..100755 --- a/sysui/desktop/mimetypes/drawing.keys +++ b/sysui/desktop/mimetypes/drawing.keys diff --git a/sysui/desktop/mimetypes/extension.desktop b/sysui/desktop/mimetypes/extension.desktop index 80cadae7e9cb..80cadae7e9cb 100644..100755 --- a/sysui/desktop/mimetypes/extension.desktop +++ b/sysui/desktop/mimetypes/extension.desktop diff --git a/sysui/desktop/mimetypes/extension.keys b/sysui/desktop/mimetypes/extension.keys index a307e5097c98..a307e5097c98 100644..100755 --- a/sysui/desktop/mimetypes/extension.keys +++ b/sysui/desktop/mimetypes/extension.keys diff --git a/sysui/desktop/mimetypes/formula.desktop b/sysui/desktop/mimetypes/formula.desktop index 9ebaa2f468c7..9ebaa2f468c7 100644..100755 --- a/sysui/desktop/mimetypes/formula.desktop +++ b/sysui/desktop/mimetypes/formula.desktop diff --git a/sysui/desktop/mimetypes/formula.keys b/sysui/desktop/mimetypes/formula.keys index 845cdff8246f..845cdff8246f 100644..100755 --- a/sysui/desktop/mimetypes/formula.keys +++ b/sysui/desktop/mimetypes/formula.keys diff --git a/sysui/desktop/mimetypes/master-document.desktop b/sysui/desktop/mimetypes/master-document.desktop index 1e30554bc4ef..1e30554bc4ef 100644..100755 --- a/sysui/desktop/mimetypes/master-document.desktop +++ b/sysui/desktop/mimetypes/master-document.desktop diff --git a/sysui/desktop/mimetypes/master-document.keys b/sysui/desktop/mimetypes/master-document.keys index a9882a059b3a..a9882a059b3a 100644..100755 --- a/sysui/desktop/mimetypes/master-document.keys +++ b/sysui/desktop/mimetypes/master-document.keys diff --git a/sysui/desktop/mimetypes/ms-excel-sheet-12.desktop b/sysui/desktop/mimetypes/ms-excel-sheet-12.desktop index 06718a915a6c..06718a915a6c 100644..100755 --- a/sysui/desktop/mimetypes/ms-excel-sheet-12.desktop +++ b/sysui/desktop/mimetypes/ms-excel-sheet-12.desktop diff --git a/sysui/desktop/mimetypes/ms-excel-sheet-12.keys b/sysui/desktop/mimetypes/ms-excel-sheet-12.keys index be746d9ad8ed..be746d9ad8ed 100644..100755 --- a/sysui/desktop/mimetypes/ms-excel-sheet-12.keys +++ b/sysui/desktop/mimetypes/ms-excel-sheet-12.keys diff --git a/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.desktop b/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.desktop index b9156ebb7f09..b9156ebb7f09 100644..100755 --- a/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.desktop +++ b/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.desktop diff --git a/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys b/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys index 091cff6214ef..091cff6214ef 100644..100755 --- a/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys +++ b/sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys diff --git a/sysui/desktop/mimetypes/ms-excel-sheet.desktop b/sysui/desktop/mimetypes/ms-excel-sheet.desktop index 7af20a0eb6f6..7af20a0eb6f6 100644..100755 --- a/sysui/desktop/mimetypes/ms-excel-sheet.desktop +++ b/sysui/desktop/mimetypes/ms-excel-sheet.desktop diff --git a/sysui/desktop/mimetypes/ms-excel-sheet.keys b/sysui/desktop/mimetypes/ms-excel-sheet.keys index fde5f41b0dbc..fde5f41b0dbc 100644..100755 --- a/sysui/desktop/mimetypes/ms-excel-sheet.keys +++ b/sysui/desktop/mimetypes/ms-excel-sheet.keys diff --git a/sysui/desktop/mimetypes/ms-excel-template-12.desktop b/sysui/desktop/mimetypes/ms-excel-template-12.desktop index 04688e10f518..04688e10f518 100644..100755 --- a/sysui/desktop/mimetypes/ms-excel-template-12.desktop +++ b/sysui/desktop/mimetypes/ms-excel-template-12.desktop diff --git a/sysui/desktop/mimetypes/ms-excel-template-12.keys b/sysui/desktop/mimetypes/ms-excel-template-12.keys index 8eb36cc1b229..8eb36cc1b229 100644..100755 --- a/sysui/desktop/mimetypes/ms-excel-template-12.keys +++ b/sysui/desktop/mimetypes/ms-excel-template-12.keys diff --git a/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.desktop b/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.desktop index 082c9681f486..082c9681f486 100644..100755 --- a/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.desktop +++ b/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.desktop diff --git a/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys b/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys index 2e86010f4b7d..2e86010f4b7d 100644..100755 --- a/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys +++ b/sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys diff --git a/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop b/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop index 5408638e7e50..5408638e7e50 100644..100755 --- a/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop +++ b/sysui/desktop/mimetypes/ms-powerpoint-presentation.desktop diff --git a/sysui/desktop/mimetypes/ms-powerpoint-presentation.keys b/sysui/desktop/mimetypes/ms-powerpoint-presentation.keys index f808f5dcc217..f808f5dcc217 100644..100755 --- a/sysui/desktop/mimetypes/ms-powerpoint-presentation.keys +++ b/sysui/desktop/mimetypes/ms-powerpoint-presentation.keys diff --git a/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop b/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop index 8e984e5f516f..8e984e5f516f 100644..100755 --- a/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop +++ b/sysui/desktop/mimetypes/ms-powerpoint-template-12.desktop diff --git a/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys b/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys index 07f25626936f..07f25626936f 100644..100755 --- a/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys +++ b/sysui/desktop/mimetypes/ms-powerpoint-template-12.keys diff --git a/sysui/desktop/mimetypes/ms-word-document-12.desktop b/sysui/desktop/mimetypes/ms-word-document-12.desktop index d787d2b59b2d..d787d2b59b2d 100644..100755 --- a/sysui/desktop/mimetypes/ms-word-document-12.desktop +++ b/sysui/desktop/mimetypes/ms-word-document-12.desktop diff --git a/sysui/desktop/mimetypes/ms-word-document-12.keys b/sysui/desktop/mimetypes/ms-word-document-12.keys index 456564c1a126..456564c1a126 100644..100755 --- a/sysui/desktop/mimetypes/ms-word-document-12.keys +++ b/sysui/desktop/mimetypes/ms-word-document-12.keys diff --git a/sysui/desktop/mimetypes/ms-word-document.desktop b/sysui/desktop/mimetypes/ms-word-document.desktop index e47ed43ac4f1..e47ed43ac4f1 100644..100755 --- a/sysui/desktop/mimetypes/ms-word-document.desktop +++ b/sysui/desktop/mimetypes/ms-word-document.desktop diff --git a/sysui/desktop/mimetypes/ms-word-document.keys b/sysui/desktop/mimetypes/ms-word-document.keys index aefa45037692..aefa45037692 100644..100755 --- a/sysui/desktop/mimetypes/ms-word-document.keys +++ b/sysui/desktop/mimetypes/ms-word-document.keys diff --git a/sysui/desktop/mimetypes/ms-word-document2.desktop b/sysui/desktop/mimetypes/ms-word-document2.desktop index cf2395c8cd27..cf2395c8cd27 100644..100755 --- a/sysui/desktop/mimetypes/ms-word-document2.desktop +++ b/sysui/desktop/mimetypes/ms-word-document2.desktop diff --git a/sysui/desktop/mimetypes/ms-word-document2.keys b/sysui/desktop/mimetypes/ms-word-document2.keys index 260ee7f3a188..260ee7f3a188 100644..100755 --- a/sysui/desktop/mimetypes/ms-word-document2.keys +++ b/sysui/desktop/mimetypes/ms-word-document2.keys diff --git a/sysui/desktop/mimetypes/ms-word-template-12.desktop b/sysui/desktop/mimetypes/ms-word-template-12.desktop index 9ea1ce4c7abc..9ea1ce4c7abc 100644..100755 --- a/sysui/desktop/mimetypes/ms-word-template-12.desktop +++ b/sysui/desktop/mimetypes/ms-word-template-12.desktop diff --git a/sysui/desktop/mimetypes/ms-word-template-12.keys b/sysui/desktop/mimetypes/ms-word-template-12.keys index 8b49db70151f..8b49db70151f 100644..100755 --- a/sysui/desktop/mimetypes/ms-word-template-12.keys +++ b/sysui/desktop/mimetypes/ms-word-template-12.keys diff --git a/sysui/desktop/mimetypes/oasis-database.desktop b/sysui/desktop/mimetypes/oasis-database.desktop index 27f95fe97e35..27f95fe97e35 100644..100755 --- a/sysui/desktop/mimetypes/oasis-database.desktop +++ b/sysui/desktop/mimetypes/oasis-database.desktop diff --git a/sysui/desktop/mimetypes/oasis-database.keys b/sysui/desktop/mimetypes/oasis-database.keys index 19e97202b50a..19e97202b50a 100644..100755 --- a/sysui/desktop/mimetypes/oasis-database.keys +++ b/sysui/desktop/mimetypes/oasis-database.keys diff --git a/sysui/desktop/mimetypes/oasis-drawing-template.desktop b/sysui/desktop/mimetypes/oasis-drawing-template.desktop index fcb57c942da1..fcb57c942da1 100644..100755 --- a/sysui/desktop/mimetypes/oasis-drawing-template.desktop +++ b/sysui/desktop/mimetypes/oasis-drawing-template.desktop diff --git a/sysui/desktop/mimetypes/oasis-drawing-template.keys b/sysui/desktop/mimetypes/oasis-drawing-template.keys index 8638fec329e4..8638fec329e4 100644..100755 --- a/sysui/desktop/mimetypes/oasis-drawing-template.keys +++ b/sysui/desktop/mimetypes/oasis-drawing-template.keys diff --git a/sysui/desktop/mimetypes/oasis-drawing.desktop b/sysui/desktop/mimetypes/oasis-drawing.desktop index c10aaef87b3c..c10aaef87b3c 100644..100755 --- a/sysui/desktop/mimetypes/oasis-drawing.desktop +++ b/sysui/desktop/mimetypes/oasis-drawing.desktop diff --git a/sysui/desktop/mimetypes/oasis-drawing.keys b/sysui/desktop/mimetypes/oasis-drawing.keys index c659749ddbf5..c659749ddbf5 100644..100755 --- a/sysui/desktop/mimetypes/oasis-drawing.keys +++ b/sysui/desktop/mimetypes/oasis-drawing.keys diff --git a/sysui/desktop/mimetypes/oasis-formula.desktop b/sysui/desktop/mimetypes/oasis-formula.desktop index f81a25acc655..f81a25acc655 100644..100755 --- a/sysui/desktop/mimetypes/oasis-formula.desktop +++ b/sysui/desktop/mimetypes/oasis-formula.desktop diff --git a/sysui/desktop/mimetypes/oasis-formula.keys b/sysui/desktop/mimetypes/oasis-formula.keys index 60618cb21443..60618cb21443 100644..100755 --- a/sysui/desktop/mimetypes/oasis-formula.keys +++ b/sysui/desktop/mimetypes/oasis-formula.keys diff --git a/sysui/desktop/mimetypes/oasis-master-document.desktop b/sysui/desktop/mimetypes/oasis-master-document.desktop index d4aeeabea917..d4aeeabea917 100644..100755 --- a/sysui/desktop/mimetypes/oasis-master-document.desktop +++ b/sysui/desktop/mimetypes/oasis-master-document.desktop diff --git a/sysui/desktop/mimetypes/oasis-master-document.keys b/sysui/desktop/mimetypes/oasis-master-document.keys index f950763205dd..f950763205dd 100644..100755 --- a/sysui/desktop/mimetypes/oasis-master-document.keys +++ b/sysui/desktop/mimetypes/oasis-master-document.keys diff --git a/sysui/desktop/mimetypes/oasis-presentation-template.desktop b/sysui/desktop/mimetypes/oasis-presentation-template.desktop index f4a441c878f5..f4a441c878f5 100644..100755 --- a/sysui/desktop/mimetypes/oasis-presentation-template.desktop +++ b/sysui/desktop/mimetypes/oasis-presentation-template.desktop diff --git a/sysui/desktop/mimetypes/oasis-presentation-template.keys b/sysui/desktop/mimetypes/oasis-presentation-template.keys index b504592a725d..b504592a725d 100644..100755 --- a/sysui/desktop/mimetypes/oasis-presentation-template.keys +++ b/sysui/desktop/mimetypes/oasis-presentation-template.keys diff --git a/sysui/desktop/mimetypes/oasis-presentation.desktop b/sysui/desktop/mimetypes/oasis-presentation.desktop index 2aad0beec6ec..2aad0beec6ec 100644..100755 --- a/sysui/desktop/mimetypes/oasis-presentation.desktop +++ b/sysui/desktop/mimetypes/oasis-presentation.desktop diff --git a/sysui/desktop/mimetypes/oasis-presentation.keys b/sysui/desktop/mimetypes/oasis-presentation.keys index 07c10cfcadd6..07c10cfcadd6 100644..100755 --- a/sysui/desktop/mimetypes/oasis-presentation.keys +++ b/sysui/desktop/mimetypes/oasis-presentation.keys diff --git a/sysui/desktop/mimetypes/oasis-spreadsheet-template.desktop b/sysui/desktop/mimetypes/oasis-spreadsheet-template.desktop index 5d6d2d6f7bb5..5d6d2d6f7bb5 100644..100755 --- a/sysui/desktop/mimetypes/oasis-spreadsheet-template.desktop +++ b/sysui/desktop/mimetypes/oasis-spreadsheet-template.desktop diff --git a/sysui/desktop/mimetypes/oasis-spreadsheet-template.keys b/sysui/desktop/mimetypes/oasis-spreadsheet-template.keys index e616a4f3a973..e616a4f3a973 100644..100755 --- a/sysui/desktop/mimetypes/oasis-spreadsheet-template.keys +++ b/sysui/desktop/mimetypes/oasis-spreadsheet-template.keys diff --git a/sysui/desktop/mimetypes/oasis-spreadsheet.desktop b/sysui/desktop/mimetypes/oasis-spreadsheet.desktop index 611a61a2c976..611a61a2c976 100644..100755 --- a/sysui/desktop/mimetypes/oasis-spreadsheet.desktop +++ b/sysui/desktop/mimetypes/oasis-spreadsheet.desktop diff --git a/sysui/desktop/mimetypes/oasis-spreadsheet.keys b/sysui/desktop/mimetypes/oasis-spreadsheet.keys index 009f630e166a..009f630e166a 100644..100755 --- a/sysui/desktop/mimetypes/oasis-spreadsheet.keys +++ b/sysui/desktop/mimetypes/oasis-spreadsheet.keys diff --git a/sysui/desktop/mimetypes/oasis-text-template.desktop b/sysui/desktop/mimetypes/oasis-text-template.desktop index 9c0d989bbbdd..9c0d989bbbdd 100644..100755 --- a/sysui/desktop/mimetypes/oasis-text-template.desktop +++ b/sysui/desktop/mimetypes/oasis-text-template.desktop diff --git a/sysui/desktop/mimetypes/oasis-text-template.keys b/sysui/desktop/mimetypes/oasis-text-template.keys index 3ce0868d69a9..3ce0868d69a9 100644..100755 --- a/sysui/desktop/mimetypes/oasis-text-template.keys +++ b/sysui/desktop/mimetypes/oasis-text-template.keys diff --git a/sysui/desktop/mimetypes/oasis-text.desktop b/sysui/desktop/mimetypes/oasis-text.desktop index 769c5cc6d792..769c5cc6d792 100644..100755 --- a/sysui/desktop/mimetypes/oasis-text.desktop +++ b/sysui/desktop/mimetypes/oasis-text.desktop diff --git a/sysui/desktop/mimetypes/oasis-text.keys b/sysui/desktop/mimetypes/oasis-text.keys index acc8a2916260..acc8a2916260 100644..100755 --- a/sysui/desktop/mimetypes/oasis-text.keys +++ b/sysui/desktop/mimetypes/oasis-text.keys diff --git a/sysui/desktop/mimetypes/oasis-web-template.desktop b/sysui/desktop/mimetypes/oasis-web-template.desktop index 716225f17df3..716225f17df3 100644..100755 --- a/sysui/desktop/mimetypes/oasis-web-template.desktop +++ b/sysui/desktop/mimetypes/oasis-web-template.desktop diff --git a/sysui/desktop/mimetypes/oasis-web-template.keys b/sysui/desktop/mimetypes/oasis-web-template.keys index 888e45870e75..888e45870e75 100644..100755 --- a/sysui/desktop/mimetypes/oasis-web-template.keys +++ b/sysui/desktop/mimetypes/oasis-web-template.keys diff --git a/sysui/desktop/mimetypes/openoffice.applications b/sysui/desktop/mimetypes/openoffice.applications index d2621020e7f4..d2621020e7f4 100644..100755 --- a/sysui/desktop/mimetypes/openoffice.applications +++ b/sysui/desktop/mimetypes/openoffice.applications diff --git a/sysui/desktop/mimetypes/openoffice.mime b/sysui/desktop/mimetypes/openoffice.mime index 67c56482538b..67c56482538b 100644..100755 --- a/sysui/desktop/mimetypes/openoffice.mime +++ b/sysui/desktop/mimetypes/openoffice.mime diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.desktop b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.desktop index b7648c76c47e..b7648c76c47e 100644..100755 --- a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.desktop +++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.desktop diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys index 7061ccc88074..7061ccc88074 100644..100755 --- a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys +++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.desktop b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.desktop index 32e177ef56fb..32e177ef56fb 100644..100755 --- a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.desktop +++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.desktop diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys index 362b1eea1b30..362b1eea1b30 100644..100755 --- a/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys +++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.desktop b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.desktop index d65a50aac974..d65a50aac974 100644..100755 --- a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.desktop +++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.desktop diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys index cf7a4babbe0e..cf7a4babbe0e 100644..100755 --- a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys +++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.desktop b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.desktop index c095099bc135..c095099bc135 100644..100755 --- a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.desktop +++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.desktop diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys index ab5a5918ba63..ab5a5918ba63 100644..100755 --- a/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys +++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.desktop b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.desktop index e5886f17d507..e5886f17d507 100644..100755 --- a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.desktop +++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.desktop diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys index 4e8f28bdba01..4e8f28bdba01 100644..100755 --- a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys +++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.desktop b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.desktop index d2559d8125b6..d2559d8125b6 100644..100755 --- a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.desktop +++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.desktop diff --git a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys index 8951ca3b595a..8951ca3b595a 100644..100755 --- a/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys +++ b/sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys diff --git a/sysui/desktop/mimetypes/presentation-template.desktop b/sysui/desktop/mimetypes/presentation-template.desktop index 5d69e224042b..5d69e224042b 100644..100755 --- a/sysui/desktop/mimetypes/presentation-template.desktop +++ b/sysui/desktop/mimetypes/presentation-template.desktop diff --git a/sysui/desktop/mimetypes/presentation-template.keys b/sysui/desktop/mimetypes/presentation-template.keys index a909f737da13..a909f737da13 100644..100755 --- a/sysui/desktop/mimetypes/presentation-template.keys +++ b/sysui/desktop/mimetypes/presentation-template.keys diff --git a/sysui/desktop/mimetypes/presentation.desktop b/sysui/desktop/mimetypes/presentation.desktop index bf349281494f..bf349281494f 100644..100755 --- a/sysui/desktop/mimetypes/presentation.desktop +++ b/sysui/desktop/mimetypes/presentation.desktop diff --git a/sysui/desktop/mimetypes/presentation.keys b/sysui/desktop/mimetypes/presentation.keys index 4620867abe7d..4620867abe7d 100644..100755 --- a/sysui/desktop/mimetypes/presentation.keys +++ b/sysui/desktop/mimetypes/presentation.keys diff --git a/sysui/desktop/mimetypes/spreadsheet-template.desktop b/sysui/desktop/mimetypes/spreadsheet-template.desktop index 2ade1dadb2e5..2ade1dadb2e5 100644..100755 --- a/sysui/desktop/mimetypes/spreadsheet-template.desktop +++ b/sysui/desktop/mimetypes/spreadsheet-template.desktop diff --git a/sysui/desktop/mimetypes/spreadsheet-template.keys b/sysui/desktop/mimetypes/spreadsheet-template.keys index 604cca7def8d..604cca7def8d 100644..100755 --- a/sysui/desktop/mimetypes/spreadsheet-template.keys +++ b/sysui/desktop/mimetypes/spreadsheet-template.keys diff --git a/sysui/desktop/mimetypes/spreadsheet.desktop b/sysui/desktop/mimetypes/spreadsheet.desktop index 4fd14aa426b8..4fd14aa426b8 100644..100755 --- a/sysui/desktop/mimetypes/spreadsheet.desktop +++ b/sysui/desktop/mimetypes/spreadsheet.desktop diff --git a/sysui/desktop/mimetypes/spreadsheet.keys b/sysui/desktop/mimetypes/spreadsheet.keys index d108e64284df..d108e64284df 100644..100755 --- a/sysui/desktop/mimetypes/spreadsheet.keys +++ b/sysui/desktop/mimetypes/spreadsheet.keys diff --git a/sysui/desktop/mimetypes/text-template.desktop b/sysui/desktop/mimetypes/text-template.desktop index 584f66007ceb..584f66007ceb 100644..100755 --- a/sysui/desktop/mimetypes/text-template.desktop +++ b/sysui/desktop/mimetypes/text-template.desktop diff --git a/sysui/desktop/mimetypes/text-template.keys b/sysui/desktop/mimetypes/text-template.keys index ef9d424be5ee..ef9d424be5ee 100644..100755 --- a/sysui/desktop/mimetypes/text-template.keys +++ b/sysui/desktop/mimetypes/text-template.keys diff --git a/sysui/desktop/mimetypes/text.desktop b/sysui/desktop/mimetypes/text.desktop index 695a1aadab47..695a1aadab47 100644..100755 --- a/sysui/desktop/mimetypes/text.desktop +++ b/sysui/desktop/mimetypes/text.desktop diff --git a/sysui/desktop/mimetypes/text.keys b/sysui/desktop/mimetypes/text.keys index e42244f2631f..e42244f2631f 100644..100755 --- a/sysui/desktop/mimetypes/text.keys +++ b/sysui/desktop/mimetypes/text.keys diff --git a/sysui/desktop/os2/makefile.mk b/sysui/desktop/os2/makefile.mk index 7d1637254a01..7d1637254a01 100644..100755 --- a/sysui/desktop/os2/makefile.mk +++ b/sysui/desktop/os2/makefile.mk diff --git a/sysui/desktop/os2/ooo-base-app.ico b/sysui/desktop/os2/ooo-base-app.ico Binary files differindex e55abae34476..e55abae34476 100644..100755 --- a/sysui/desktop/os2/ooo-base-app.ico +++ b/sysui/desktop/os2/ooo-base-app.ico diff --git a/sysui/desktop/os2/ooo-base-doc.ico b/sysui/desktop/os2/ooo-base-doc.ico Binary files differindex e1b033ad1050..e1b033ad1050 100644..100755 --- a/sysui/desktop/os2/ooo-base-doc.ico +++ b/sysui/desktop/os2/ooo-base-doc.ico diff --git a/sysui/desktop/os2/ooo-calc-app.ico b/sysui/desktop/os2/ooo-calc-app.ico Binary files differindex 66adbc663516..66adbc663516 100644..100755 --- a/sysui/desktop/os2/ooo-calc-app.ico +++ b/sysui/desktop/os2/ooo-calc-app.ico diff --git a/sysui/desktop/os2/ooo-calc-doc.ico b/sysui/desktop/os2/ooo-calc-doc.ico Binary files differindex 0cfc09f9c9f1..0cfc09f9c9f1 100644..100755 --- a/sysui/desktop/os2/ooo-calc-doc.ico +++ b/sysui/desktop/os2/ooo-calc-doc.ico diff --git a/sysui/desktop/os2/ooo-calc-tem.ico b/sysui/desktop/os2/ooo-calc-tem.ico Binary files differindex 363703e35369..363703e35369 100644..100755 --- a/sysui/desktop/os2/ooo-calc-tem.ico +++ b/sysui/desktop/os2/ooo-calc-tem.ico diff --git a/sysui/desktop/os2/ooo-chart-doc.ico b/sysui/desktop/os2/ooo-chart-doc.ico Binary files differindex fee582f29d49..fee582f29d49 100644..100755 --- a/sysui/desktop/os2/ooo-chart-doc.ico +++ b/sysui/desktop/os2/ooo-chart-doc.ico diff --git a/sysui/desktop/os2/ooo-configuration.ico b/sysui/desktop/os2/ooo-configuration.ico Binary files differindex 2723b37fcb8e..2723b37fcb8e 100644..100755 --- a/sysui/desktop/os2/ooo-configuration.ico +++ b/sysui/desktop/os2/ooo-configuration.ico diff --git a/sysui/desktop/os2/ooo-draw-app.ico b/sysui/desktop/os2/ooo-draw-app.ico Binary files differindex 1524d9989566..1524d9989566 100644..100755 --- a/sysui/desktop/os2/ooo-draw-app.ico +++ b/sysui/desktop/os2/ooo-draw-app.ico diff --git a/sysui/desktop/os2/ooo-draw-doc.ico b/sysui/desktop/os2/ooo-draw-doc.ico Binary files differindex a63a39b787cf..a63a39b787cf 100644..100755 --- a/sysui/desktop/os2/ooo-draw-doc.ico +++ b/sysui/desktop/os2/ooo-draw-doc.ico diff --git a/sysui/desktop/os2/ooo-draw-tem.ico b/sysui/desktop/os2/ooo-draw-tem.ico Binary files differindex cac9513cb3c2..cac9513cb3c2 100644..100755 --- a/sysui/desktop/os2/ooo-draw-tem.ico +++ b/sysui/desktop/os2/ooo-draw-tem.ico diff --git a/sysui/desktop/os2/ooo-empty-doc.ico b/sysui/desktop/os2/ooo-empty-doc.ico Binary files differindex 350e6ac37da3..350e6ac37da3 100644..100755 --- a/sysui/desktop/os2/ooo-empty-doc.ico +++ b/sysui/desktop/os2/ooo-empty-doc.ico diff --git a/sysui/desktop/os2/ooo-empty-tem.ico b/sysui/desktop/os2/ooo-empty-tem.ico Binary files differindex 3cdff3d8c73a..3cdff3d8c73a 100644..100755 --- a/sysui/desktop/os2/ooo-empty-tem.ico +++ b/sysui/desktop/os2/ooo-empty-tem.ico diff --git a/sysui/desktop/os2/ooo-image-doc.ico b/sysui/desktop/os2/ooo-image-doc.ico Binary files differindex b1fed4dca8da..b1fed4dca8da 100644..100755 --- a/sysui/desktop/os2/ooo-image-doc.ico +++ b/sysui/desktop/os2/ooo-image-doc.ico diff --git a/sysui/desktop/os2/ooo-impress-app.ico b/sysui/desktop/os2/ooo-impress-app.ico Binary files differindex e58eaad5cdc9..e58eaad5cdc9 100644..100755 --- a/sysui/desktop/os2/ooo-impress-app.ico +++ b/sysui/desktop/os2/ooo-impress-app.ico diff --git a/sysui/desktop/os2/ooo-impress-doc.ico b/sysui/desktop/os2/ooo-impress-doc.ico Binary files differindex ba1b6df74e33..ba1b6df74e33 100644..100755 --- a/sysui/desktop/os2/ooo-impress-doc.ico +++ b/sysui/desktop/os2/ooo-impress-doc.ico diff --git a/sysui/desktop/os2/ooo-impress-tem.ico b/sysui/desktop/os2/ooo-impress-tem.ico Binary files differindex 93a3509ad5fe..93a3509ad5fe 100644..100755 --- a/sysui/desktop/os2/ooo-impress-tem.ico +++ b/sysui/desktop/os2/ooo-impress-tem.ico diff --git a/sysui/desktop/os2/ooo-macro-doc.ico b/sysui/desktop/os2/ooo-macro-doc.ico Binary files differindex 2fe6c55f581e..2fe6c55f581e 100644..100755 --- a/sysui/desktop/os2/ooo-macro-doc.ico +++ b/sysui/desktop/os2/ooo-macro-doc.ico diff --git a/sysui/desktop/os2/ooo-main-app.ico b/sysui/desktop/os2/ooo-main-app.ico Binary files differindex f7edd4524bc1..f7edd4524bc1 100644..100755 --- a/sysui/desktop/os2/ooo-main-app.ico +++ b/sysui/desktop/os2/ooo-main-app.ico diff --git a/sysui/desktop/os2/ooo-master-doc.ico b/sysui/desktop/os2/ooo-master-doc.ico Binary files differindex 2861de24d1c4..2861de24d1c4 100644..100755 --- a/sysui/desktop/os2/ooo-master-doc.ico +++ b/sysui/desktop/os2/ooo-master-doc.ico diff --git a/sysui/desktop/os2/ooo-math-app.ico b/sysui/desktop/os2/ooo-math-app.ico Binary files differindex c3c3c81c9106..c3c3c81c9106 100644..100755 --- a/sysui/desktop/os2/ooo-math-app.ico +++ b/sysui/desktop/os2/ooo-math-app.ico diff --git a/sysui/desktop/os2/ooo-math-doc.ico b/sysui/desktop/os2/ooo-math-doc.ico Binary files differindex a605e9e1ae0e..a605e9e1ae0e 100644..100755 --- a/sysui/desktop/os2/ooo-math-doc.ico +++ b/sysui/desktop/os2/ooo-math-doc.ico diff --git a/sysui/desktop/os2/ooo-open.ico b/sysui/desktop/os2/ooo-open.ico Binary files differindex 508909ea3815..508909ea3815 100644..100755 --- a/sysui/desktop/os2/ooo-open.ico +++ b/sysui/desktop/os2/ooo-open.ico diff --git a/sysui/desktop/os2/ooo-printer.ico b/sysui/desktop/os2/ooo-printer.ico Binary files differindex 30ed6cd00ccc..30ed6cd00ccc 100644..100755 --- a/sysui/desktop/os2/ooo-printer.ico +++ b/sysui/desktop/os2/ooo-printer.ico diff --git a/sysui/desktop/os2/ooo-web-doc.ico b/sysui/desktop/os2/ooo-web-doc.ico Binary files differindex d8b497633528..d8b497633528 100644..100755 --- a/sysui/desktop/os2/ooo-web-doc.ico +++ b/sysui/desktop/os2/ooo-web-doc.ico diff --git a/sysui/desktop/os2/ooo-writer-app.ico b/sysui/desktop/os2/ooo-writer-app.ico Binary files differindex c6a5e1fdfc7f..c6a5e1fdfc7f 100644..100755 --- a/sysui/desktop/os2/ooo-writer-app.ico +++ b/sysui/desktop/os2/ooo-writer-app.ico diff --git a/sysui/desktop/os2/ooo-writer-doc.ico b/sysui/desktop/os2/ooo-writer-doc.ico Binary files differindex 02a95ecee479..02a95ecee479 100644..100755 --- a/sysui/desktop/os2/ooo-writer-doc.ico +++ b/sysui/desktop/os2/ooo-writer-doc.ico diff --git a/sysui/desktop/os2/ooo-writer-tem.ico b/sysui/desktop/os2/ooo-writer-tem.ico Binary files differindex b356cffbdcbf..b356cffbdcbf 100644..100755 --- a/sysui/desktop/os2/ooo-writer-tem.ico +++ b/sysui/desktop/os2/ooo-writer-tem.ico diff --git a/sysui/desktop/os2/ooo11-base-doc.ico b/sysui/desktop/os2/ooo11-base-doc.ico Binary files differindex dda0cba1e22f..dda0cba1e22f 100644..100755 --- a/sysui/desktop/os2/ooo11-base-doc.ico +++ b/sysui/desktop/os2/ooo11-base-doc.ico diff --git a/sysui/desktop/os2/ooo11-calc-doc.ico b/sysui/desktop/os2/ooo11-calc-doc.ico Binary files differindex d891a04c869a..d891a04c869a 100644..100755 --- a/sysui/desktop/os2/ooo11-calc-doc.ico +++ b/sysui/desktop/os2/ooo11-calc-doc.ico diff --git a/sysui/desktop/os2/ooo11-calc-tem.ico b/sysui/desktop/os2/ooo11-calc-tem.ico Binary files differindex d891a04c869a..d891a04c869a 100644..100755 --- a/sysui/desktop/os2/ooo11-calc-tem.ico +++ b/sysui/desktop/os2/ooo11-calc-tem.ico diff --git a/sysui/desktop/os2/ooo11-chart-doc.ico b/sysui/desktop/os2/ooo11-chart-doc.ico Binary files differindex dda0cba1e22f..dda0cba1e22f 100644..100755 --- a/sysui/desktop/os2/ooo11-chart-doc.ico +++ b/sysui/desktop/os2/ooo11-chart-doc.ico diff --git a/sysui/desktop/os2/ooo11-draw-doc.ico b/sysui/desktop/os2/ooo11-draw-doc.ico Binary files differindex 61312fbe562e..61312fbe562e 100644..100755 --- a/sysui/desktop/os2/ooo11-draw-doc.ico +++ b/sysui/desktop/os2/ooo11-draw-doc.ico diff --git a/sysui/desktop/os2/ooo11-draw-tem.ico b/sysui/desktop/os2/ooo11-draw-tem.ico Binary files differindex 61312fbe562e..61312fbe562e 100644..100755 --- a/sysui/desktop/os2/ooo11-draw-tem.ico +++ b/sysui/desktop/os2/ooo11-draw-tem.ico diff --git a/sysui/desktop/os2/ooo11-impress-doc.ico b/sysui/desktop/os2/ooo11-impress-doc.ico Binary files differindex cebf5e56bc77..cebf5e56bc77 100644..100755 --- a/sysui/desktop/os2/ooo11-impress-doc.ico +++ b/sysui/desktop/os2/ooo11-impress-doc.ico diff --git a/sysui/desktop/os2/ooo11-impress-tem.ico b/sysui/desktop/os2/ooo11-impress-tem.ico Binary files differindex cebf5e56bc77..cebf5e56bc77 100644..100755 --- a/sysui/desktop/os2/ooo11-impress-tem.ico +++ b/sysui/desktop/os2/ooo11-impress-tem.ico diff --git a/sysui/desktop/os2/ooo11-master-doc.ico b/sysui/desktop/os2/ooo11-master-doc.ico Binary files differindex dda0cba1e22f..dda0cba1e22f 100644..100755 --- a/sysui/desktop/os2/ooo11-master-doc.ico +++ b/sysui/desktop/os2/ooo11-master-doc.ico diff --git a/sysui/desktop/os2/ooo11-math-doc.ico b/sysui/desktop/os2/ooo11-math-doc.ico Binary files differindex ab8c16007727..ab8c16007727 100644..100755 --- a/sysui/desktop/os2/ooo11-math-doc.ico +++ b/sysui/desktop/os2/ooo11-math-doc.ico diff --git a/sysui/desktop/os2/ooo11-writer-doc.ico b/sysui/desktop/os2/ooo11-writer-doc.ico Binary files differindex 901d8ec3df33..901d8ec3df33 100644..100755 --- a/sysui/desktop/os2/ooo11-writer-doc.ico +++ b/sysui/desktop/os2/ooo11-writer-doc.ico diff --git a/sysui/desktop/os2/ooo11-writer-tem.ico b/sysui/desktop/os2/ooo11-writer-tem.ico Binary files differindex 901d8ec3df33..901d8ec3df33 100644..100755 --- a/sysui/desktop/os2/ooo11-writer-tem.ico +++ b/sysui/desktop/os2/ooo11-writer-tem.ico diff --git a/sysui/desktop/os2/so7-base-doc.ico b/sysui/desktop/os2/so7-base-doc.ico Binary files differindex 5ffd7549cc5b..5ffd7549cc5b 100644..100755 --- a/sysui/desktop/os2/so7-base-doc.ico +++ b/sysui/desktop/os2/so7-base-doc.ico diff --git a/sysui/desktop/os2/so7-calc-doc.ico b/sysui/desktop/os2/so7-calc-doc.ico Binary files differindex ead58e51ff6d..ead58e51ff6d 100644..100755 --- a/sysui/desktop/os2/so7-calc-doc.ico +++ b/sysui/desktop/os2/so7-calc-doc.ico diff --git a/sysui/desktop/os2/so7-calc-tem.ico b/sysui/desktop/os2/so7-calc-tem.ico Binary files differindex bdbeb0406ccd..bdbeb0406ccd 100644..100755 --- a/sysui/desktop/os2/so7-calc-tem.ico +++ b/sysui/desktop/os2/so7-calc-tem.ico diff --git a/sysui/desktop/os2/so7-chart-doc.ico b/sysui/desktop/os2/so7-chart-doc.ico Binary files differindex 5412287c37ea..5412287c37ea 100644..100755 --- a/sysui/desktop/os2/so7-chart-doc.ico +++ b/sysui/desktop/os2/so7-chart-doc.ico diff --git a/sysui/desktop/os2/so7-draw-doc.ico b/sysui/desktop/os2/so7-draw-doc.ico Binary files differindex 3e4ab098070d..3e4ab098070d 100644..100755 --- a/sysui/desktop/os2/so7-draw-doc.ico +++ b/sysui/desktop/os2/so7-draw-doc.ico diff --git a/sysui/desktop/os2/so7-draw-tem.ico b/sysui/desktop/os2/so7-draw-tem.ico Binary files differindex ca46a39a5f21..ca46a39a5f21 100644..100755 --- a/sysui/desktop/os2/so7-draw-tem.ico +++ b/sysui/desktop/os2/so7-draw-tem.ico diff --git a/sysui/desktop/os2/so7-impress-doc.ico b/sysui/desktop/os2/so7-impress-doc.ico Binary files differindex 4df2d73d3c23..4df2d73d3c23 100644..100755 --- a/sysui/desktop/os2/so7-impress-doc.ico +++ b/sysui/desktop/os2/so7-impress-doc.ico diff --git a/sysui/desktop/os2/so7-impress-tem.ico b/sysui/desktop/os2/so7-impress-tem.ico Binary files differindex 0c29d09ebf53..0c29d09ebf53 100644..100755 --- a/sysui/desktop/os2/so7-impress-tem.ico +++ b/sysui/desktop/os2/so7-impress-tem.ico diff --git a/sysui/desktop/os2/so7-master-doc.ico b/sysui/desktop/os2/so7-master-doc.ico Binary files differindex 70a7fa52afe7..70a7fa52afe7 100644..100755 --- a/sysui/desktop/os2/so7-master-doc.ico +++ b/sysui/desktop/os2/so7-master-doc.ico diff --git a/sysui/desktop/os2/so7-math-doc.ico b/sysui/desktop/os2/so7-math-doc.ico Binary files differindex 9e1f3bb4dbf2..9e1f3bb4dbf2 100644..100755 --- a/sysui/desktop/os2/so7-math-doc.ico +++ b/sysui/desktop/os2/so7-math-doc.ico diff --git a/sysui/desktop/os2/so7-writer-doc.ico b/sysui/desktop/os2/so7-writer-doc.ico Binary files differindex 01e1fcc897bf..01e1fcc897bf 100644..100755 --- a/sysui/desktop/os2/so7-writer-doc.ico +++ b/sysui/desktop/os2/so7-writer-doc.ico diff --git a/sysui/desktop/os2/so7-writer-tem.ico b/sysui/desktop/os2/so7-writer-tem.ico Binary files differindex c6bc74e0e2e3..c6bc74e0e2e3 100644..100755 --- a/sysui/desktop/os2/so7-writer-tem.ico +++ b/sysui/desktop/os2/so7-writer-tem.ico diff --git a/sysui/desktop/os2/so8-base-app.ico b/sysui/desktop/os2/so8-base-app.ico Binary files differindex 8480d3cf506f..8480d3cf506f 100644..100755 --- a/sysui/desktop/os2/so8-base-app.ico +++ b/sysui/desktop/os2/so8-base-app.ico diff --git a/sysui/desktop/os2/so8-base-doc.ico b/sysui/desktop/os2/so8-base-doc.ico Binary files differindex c539d1f4a773..c539d1f4a773 100644..100755 --- a/sysui/desktop/os2/so8-base-doc.ico +++ b/sysui/desktop/os2/so8-base-doc.ico diff --git a/sysui/desktop/os2/so8-calc-app.ico b/sysui/desktop/os2/so8-calc-app.ico Binary files differindex fc129ca9771d..fc129ca9771d 100644..100755 --- a/sysui/desktop/os2/so8-calc-app.ico +++ b/sysui/desktop/os2/so8-calc-app.ico diff --git a/sysui/desktop/os2/so8-calc-doc.ico b/sysui/desktop/os2/so8-calc-doc.ico Binary files differindex b5184ff419aa..b5184ff419aa 100644..100755 --- a/sysui/desktop/os2/so8-calc-doc.ico +++ b/sysui/desktop/os2/so8-calc-doc.ico diff --git a/sysui/desktop/os2/so8-calc-tem.ico b/sysui/desktop/os2/so8-calc-tem.ico Binary files differindex 6c6b6dbbd44e..6c6b6dbbd44e 100644..100755 --- a/sysui/desktop/os2/so8-calc-tem.ico +++ b/sysui/desktop/os2/so8-calc-tem.ico diff --git a/sysui/desktop/os2/so8-chart-doc.ico b/sysui/desktop/os2/so8-chart-doc.ico Binary files differindex a3b8ae3c0a1a..a3b8ae3c0a1a 100644..100755 --- a/sysui/desktop/os2/so8-chart-doc.ico +++ b/sysui/desktop/os2/so8-chart-doc.ico diff --git a/sysui/desktop/os2/so8-configuration.ico b/sysui/desktop/os2/so8-configuration.ico Binary files differindex eebd9d899aac..eebd9d899aac 100644..100755 --- a/sysui/desktop/os2/so8-configuration.ico +++ b/sysui/desktop/os2/so8-configuration.ico diff --git a/sysui/desktop/os2/so8-draw-app.ico b/sysui/desktop/os2/so8-draw-app.ico Binary files differindex c491094c5faa..c491094c5faa 100644..100755 --- a/sysui/desktop/os2/so8-draw-app.ico +++ b/sysui/desktop/os2/so8-draw-app.ico diff --git a/sysui/desktop/os2/so8-draw-doc.ico b/sysui/desktop/os2/so8-draw-doc.ico Binary files differindex 28d1b32e161e..28d1b32e161e 100644..100755 --- a/sysui/desktop/os2/so8-draw-doc.ico +++ b/sysui/desktop/os2/so8-draw-doc.ico diff --git a/sysui/desktop/os2/so8-draw-tem.ico b/sysui/desktop/os2/so8-draw-tem.ico Binary files differindex caf6ddc8c94d..caf6ddc8c94d 100644..100755 --- a/sysui/desktop/os2/so8-draw-tem.ico +++ b/sysui/desktop/os2/so8-draw-tem.ico diff --git a/sysui/desktop/os2/so8-empty-doc.ico b/sysui/desktop/os2/so8-empty-doc.ico Binary files differindex 23b1bfa00843..23b1bfa00843 100644..100755 --- a/sysui/desktop/os2/so8-empty-doc.ico +++ b/sysui/desktop/os2/so8-empty-doc.ico diff --git a/sysui/desktop/os2/so8-empty-tem.ico b/sysui/desktop/os2/so8-empty-tem.ico Binary files differindex 08d0ff03730b..08d0ff03730b 100644..100755 --- a/sysui/desktop/os2/so8-empty-tem.ico +++ b/sysui/desktop/os2/so8-empty-tem.ico diff --git a/sysui/desktop/os2/so8-image-doc.ico b/sysui/desktop/os2/so8-image-doc.ico Binary files differindex 2c734453e638..2c734453e638 100644..100755 --- a/sysui/desktop/os2/so8-image-doc.ico +++ b/sysui/desktop/os2/so8-image-doc.ico diff --git a/sysui/desktop/os2/so8-impress-app.ico b/sysui/desktop/os2/so8-impress-app.ico Binary files differindex f77ba1d055d0..f77ba1d055d0 100644..100755 --- a/sysui/desktop/os2/so8-impress-app.ico +++ b/sysui/desktop/os2/so8-impress-app.ico diff --git a/sysui/desktop/os2/so8-impress-doc.ico b/sysui/desktop/os2/so8-impress-doc.ico Binary files differindex 9bf3ea37f130..9bf3ea37f130 100644..100755 --- a/sysui/desktop/os2/so8-impress-doc.ico +++ b/sysui/desktop/os2/so8-impress-doc.ico diff --git a/sysui/desktop/os2/so8-impress-tem.ico b/sysui/desktop/os2/so8-impress-tem.ico Binary files differindex fe6a1ffbc61d..fe6a1ffbc61d 100644..100755 --- a/sysui/desktop/os2/so8-impress-tem.ico +++ b/sysui/desktop/os2/so8-impress-tem.ico diff --git a/sysui/desktop/os2/so8-macro-doc.ico b/sysui/desktop/os2/so8-macro-doc.ico Binary files differindex e828c0cd7afa..e828c0cd7afa 100644..100755 --- a/sysui/desktop/os2/so8-macro-doc.ico +++ b/sysui/desktop/os2/so8-macro-doc.ico diff --git a/sysui/desktop/os2/so8-main-app.ico b/sysui/desktop/os2/so8-main-app.ico Binary files differindex d158dd3bdbda..d158dd3bdbda 100644..100755 --- a/sysui/desktop/os2/so8-main-app.ico +++ b/sysui/desktop/os2/so8-main-app.ico diff --git a/sysui/desktop/os2/so8-master-doc.ico b/sysui/desktop/os2/so8-master-doc.ico Binary files differindex 1b2ba16e5d45..1b2ba16e5d45 100644..100755 --- a/sysui/desktop/os2/so8-master-doc.ico +++ b/sysui/desktop/os2/so8-master-doc.ico diff --git a/sysui/desktop/os2/so8-math-app.ico b/sysui/desktop/os2/so8-math-app.ico Binary files differindex 0299bedde70e..0299bedde70e 100644..100755 --- a/sysui/desktop/os2/so8-math-app.ico +++ b/sysui/desktop/os2/so8-math-app.ico diff --git a/sysui/desktop/os2/so8-math-doc.ico b/sysui/desktop/os2/so8-math-doc.ico Binary files differindex cacbcd977732..cacbcd977732 100644..100755 --- a/sysui/desktop/os2/so8-math-doc.ico +++ b/sysui/desktop/os2/so8-math-doc.ico diff --git a/sysui/desktop/os2/so8-open.ico b/sysui/desktop/os2/so8-open.ico Binary files differindex 6dcee498e5e6..6dcee498e5e6 100644..100755 --- a/sysui/desktop/os2/so8-open.ico +++ b/sysui/desktop/os2/so8-open.ico diff --git a/sysui/desktop/os2/so8-printer.ico b/sysui/desktop/os2/so8-printer.ico Binary files differindex 49780f9cc7b9..49780f9cc7b9 100644..100755 --- a/sysui/desktop/os2/so8-printer.ico +++ b/sysui/desktop/os2/so8-printer.ico diff --git a/sysui/desktop/os2/so8-web-doc.ico b/sysui/desktop/os2/so8-web-doc.ico Binary files differindex 15a4d860c58d..15a4d860c58d 100644..100755 --- a/sysui/desktop/os2/so8-web-doc.ico +++ b/sysui/desktop/os2/so8-web-doc.ico diff --git a/sysui/desktop/os2/so8-writer-app.ico b/sysui/desktop/os2/so8-writer-app.ico Binary files differindex 9b36afd75534..9b36afd75534 100644..100755 --- a/sysui/desktop/os2/so8-writer-app.ico +++ b/sysui/desktop/os2/so8-writer-app.ico diff --git a/sysui/desktop/os2/so8-writer-doc.ico b/sysui/desktop/os2/so8-writer-doc.ico Binary files differindex 12bc54839cfc..12bc54839cfc 100644..100755 --- a/sysui/desktop/os2/so8-writer-doc.ico +++ b/sysui/desktop/os2/so8-writer-doc.ico diff --git a/sysui/desktop/os2/so8-writer-tem.ico b/sysui/desktop/os2/so8-writer-tem.ico Binary files differindex ff1a9fe2e220..ff1a9fe2e220 100644..100755 --- a/sysui/desktop/os2/so8-writer-tem.ico +++ b/sysui/desktop/os2/so8-writer-tem.ico diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index 09141b2276bd..6f41333370dc 100644..100755 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -33,7 +33,7 @@ PKGREV = $(LAST_MINOR:s/m//:s/s/./) ABSLOCALOUT:=$(shell @cd $(PRJ) && pwd)$/$(ROUT) # create desktop-integration subfolder on linux -.IF "$(OS)"=="LINUX" +.IF "$(OS)"=="LINUX" || "$(OS)"=="AIX" # rpm seems to require absolute paths here :( PKGDIR:=$(ABSLOCALOUT)$/bin$/desktop-integration RPMMACROS= \ @@ -43,11 +43,8 @@ RPMMACROS= \ PKGDIR=$(BIN) .ENDIF -PRODUCTLIST = openoffice.org broffice.org +.INCLUDE : productversion.mk -# default values to minimize maintainance effort -PRODUCTVERSION = 3.4 -PRODUCTVERSIONSHORT = 3 PKGVERSION = $(PRODUCTVERSION) # gnome-vfs treats everything behind the last '.' as an icon extension, # even though the "icon_filename" in '.keys' is specified as filename @@ -61,18 +58,18 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/.//g) # which is need by other distributors, see http://www.openoffice.org/issues/show_bug.cgi?id=75366 UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}' -PRODUCTNAME.openoffice.org = OpenOffice.org -PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION) -PRODUCTVERSIONSHORT.openoffice.org = $(PRODUCTVERSIONSHORT) -PKGVERSION.openoffice.org = $(PKGVERSION) -UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSIONSHORT.openoffice.org) -ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g) +PRODUCTNAME.libreoffice = LibreOffice +PRODUCTVERSION.libreoffice = $(PRODUCTVERSION) +PRODUCTVERSIONSHORT.libreoffice = $(PRODUCTVERSIONSHORT) +PKGVERSION.libreoffice = $(PKGVERSION) +UNIXFILENAME.libreoffice = $(PRODUCTNAME.libreoffice:l) +ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice:s/.//g) -PRODUCTNAME.broffice.org = BrOffice.org -PRODUCTVERSION.broffice.org = $(PRODUCTVERSION) -PRODUCTVERSIONSHORT.broffice.org = $(PRODUCTVERSIONSHORT) -PKGVERSION.broffice.org = $(PKGVERSION) -UNIXFILENAME.broffice.org = $(PRODUCTNAME.broffice.org:l)$(PRODUCTVERSIONSHORT.broffice.org) -ICONPREFIX.broffice.org = $(UNIXFILENAME.broffice.org:s/.//g) +PRODUCTNAME.broffice = BrOffice +PRODUCTVERSION.broffice = $(PRODUCTVERSION) +PRODUCTVERSIONSHORT.broffice = $(PRODUCTVERSIONSHORT) +PKGVERSION.broffice = $(PKGVERSION) +UNIXFILENAME.broffice = $(PRODUCTNAME.broffice:l) +ICONPREFIX.broffice = $(UNIXFILENAME.broffice:s/.//g) diff --git a/sysui/desktop/redhat/makefile.mk b/sysui/desktop/redhat/makefile.mk index a633cfe244f4..a633cfe244f4 100644..100755 --- a/sysui/desktop/redhat/makefile.mk +++ b/sysui/desktop/redhat/makefile.mk diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec index 85e0a6a5d72c..663fe2314573 100644..100755 --- a/sysui/desktop/redhat/redhat-menus.spec +++ b/sysui/desktop/redhat/redhat-menus.spec @@ -5,11 +5,11 @@ Summary: %productname desktop integration Name: %pkgprefix-redhat-menus Group: Office License: LGPL -Vendor: OpenOffice.org +Vendor: The Document Foundation AutoReqProv: no BuildArch: noarch Requires: redhat-release -Provides: openoffice.org3-desktop-integration +Provides: libreoffice-desktop-integration %define _unpackaged_files_terminate_build 0 %define _binary_filedigest_algorithm 1 %define _binary_payload w9.gzdio @@ -146,7 +146,7 @@ if [ "$1" = 1 ] then # backing out existing entries to avoid duplicates sed ' -/^# OpenOffice.org/d +/^# LibreOffice/d /^application\/vnd\.oasis\.opendocument/d /^application\/vnd\.openofficeorg/d /^application\/vnd\.sun/d @@ -162,7 +162,7 @@ then # now append our stuff to the temporary file cat >> /etc/mailcap.tmp$$ << END -# OpenOffice.org +# LibreOffice application/vnd.oasis.opendocument.text; %unixfilename -view %s application/vnd.oasis.opendocument.text-template; %unixfilename -view %s application/vnd.oasis.opendocument.text-web; %unixfilename -view %s @@ -268,7 +268,12 @@ for theme in gnome hicolor locolor; do done %files -%attr(0755,root,root) /usr/bin/soffice +%if %unixfilename != libreoffice +# compat symlinks +%attr(0755,root,root) /opt/%unixfilename +%attr(0755,root,root) /usr/bin/libreoffice +%attr(0755,root,root) /usr/bin/libreoffice-printeradmin +%endif %attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename %attr(0755,root,root) /usr/bin/%unixfilename-printeradmin %defattr(0644, root, root) diff --git a/sysui/desktop/share/add_specfile_triggers.sed b/sysui/desktop/share/add_specfile_triggers.sed index a8d9d2932a0c..a8d9d2932a0c 100644..100755 --- a/sysui/desktop/share/add_specfile_triggers.sed +++ b/sysui/desktop/share/add_specfile_triggers.sed diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl index ebb5df19d549..ec71b9f90995 100644..100755 --- a/sysui/desktop/share/brand.pl +++ b/sysui/desktop/share/brand.pl @@ -38,8 +38,9 @@ eval 'exec perl -wS $0 ${1+"$@"}' $destdir = pop @ARGV; mkdir $destdir,0777; -$productname = "OpenOffice.org"; -$productfilename = "openoffice"; +$productname = "LibreOffice"; +$productname_br = "BrOffice"; +$productfilename = "libreoffice"; $prefix = ""; $iconprefix = ""; @@ -50,6 +51,10 @@ while ($_ = $ARGV[0], /^-/) { $productname = $ARGV[0]; shift; } + if (/^-b/) { + $productname_br = $ARGV[0]; + shift; + } if (/^-u/) { $productfilename = $ARGV[0]; shift; @@ -86,15 +91,15 @@ while (<>) { # remove possible Windows line-ends chomp; - # patch all occurances of openoffice in ICON line with + # patch all occurrences of openoffice in ICON line with # $prefix s/Icon=/Icon=$iconprefix/; - # patch all occurances of openoffice in icon_filename + # patch all occurrences of openoffice in icon_filename # line with $prefix s/icon_filename=/icon_filename=$iconprefix/; - # patch all occurances of openoffice in EXEC line with + # patch all occurrences of openoffice in EXEC line with # $productfilename if ( /Exec/ ) { s/openoffice/$productfilename/; @@ -116,6 +121,9 @@ while (<>) { } } + # replace %PRODUCTNAME_BR placeholders + s/%PRODUCTNAME_BR/$productname_br/g; + # replace %PRODUCTNAME placeholders s/%PRODUCTNAME/$productname/g; diff --git a/sysui/desktop/share/create_mime_xml.pl b/sysui/desktop/share/create_mime_xml.pl index c6b8e4f0b44c..e1fc890ff181 100644..100755 --- a/sysui/desktop/share/create_mime_xml.pl +++ b/sysui/desktop/share/create_mime_xml.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl use File::Basename; $basedir = dirname($0); -$productname = 'OpenOffice.org'; +$productname = 'LibreOffice'; $mimedir = $basedir.'/../mimetypes'; $FS= ' '; # field seperator (space) - for documents.ulf diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index e04825df2019..a19474b64ef4 100644..100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -3,7 +3,7 @@ umask 022 if [ "${KDEMAINDIR}" ] then echo Copying icons .. - for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/??x?? locolor} -name "*.png"` + for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/???x??? hicolor/??x?? locolor} -name "*.png"` do targetdir=${DESTDIR}/${KDEMAINDIR}/share/icons/`dirname $i` mkdir -p $targetdir @@ -22,7 +22,7 @@ fi if [ "${GNOMEDIR}" ] then echo Copying GNOME icons .. - for i in `cd ${ICON_SOURCE_DIR}/hicolor; find ??x?? -name "*.png"` + for i in `cd ${ICON_SOURCE_DIR}/hicolor; find ??x?? ???x??? -name "*.png"` do targetdir=${DESTDIR}/${GNOMEDIR}/share/icons/gnome/`dirname $i` mkdir -p $targetdir @@ -92,17 +92,26 @@ fi mkdir -p ${DESTDIR}/usr/bin -office_root=/opt/${PREFIX} +office_prefix=/opt +office_root=${office_prefix}/${PREFIX} -ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice +#this symlink is needed to have the API boostrap functions running right +ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/libreoffice -cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX} cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin +if test "${PREFIX}" != libreoffice ; then + # compat symlinks + mkdir -p ${DESTDIR}${office_prefix} + ln -sf libreoffice ${DESTDIR}${office_root} + ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice + ln -sf /usr/bin/${PREFIX}-printeradmin ${DESTDIR}/usr/bin/libreoffice-printeradmin +fi + mkdir -p ${DESTDIR}/usr/share/mime/packages -cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/ -chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml +cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/libreoffice.xml +chmod 0644 ${DESTDIR}/usr/share/mime/packages/libreoffice.xml mkdir -p ${DESTDIR}/usr/share/applications for i in `cat launcherlist`; do diff --git a/sysui/desktop/share/documents.ulf b/sysui/desktop/share/documents.ulf index 88fd05c879d2..88fd05c879d2 100644..100755 --- a/sysui/desktop/share/documents.ulf +++ b/sysui/desktop/share/documents.ulf diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf index 6aeab6d94c36..e36949263fce 100644..100755 --- 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 Oracle." +en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation." diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf index ff8041a155fc..ff8041a155fc 100644..100755 --- a/sysui/desktop/share/launcher_genericname.ulf +++ b/sysui/desktop/share/launcher_genericname.ulf diff --git a/sysui/desktop/share/launcher_name.ulf b/sysui/desktop/share/launcher_name.ulf index db97e2686d47..db97e2686d47 100644..100755 --- a/sysui/desktop/share/launcher_name.ulf +++ b/sysui/desktop/share/launcher_name.ulf diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk index e1e47648b077..45a1b11c85f3 100644..100755 --- a/sysui/desktop/share/makefile.mk +++ b/sysui/desktop/share/makefile.mk @@ -150,10 +150,10 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) @@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f) @echo Creating desktop entries for $(@:f) .. @echo --------------------------------- - @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}${ICONVERSION}-' $< $(@:db).$(INPATH).$(@:f) - @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf - @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf - @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf + @$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}-' $< $(@:db).$(INPATH).$(@:f) + @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf + @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf + @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -p '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf .IF "$(WITH_LIBSN)"=="YES" @noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH).$(@:f)/$i.desktop))x .ENDIF @@ -220,7 +220,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/mimelnklist : ../mimetypes/{$(MIMELIST)}.deskto $(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh : makefile.mk $(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh : $$(@:f) @@-$(MKDIRHIER) $(@:d) - @echo "#\!/bin/bash" > $@.$(INPATH) + @echo "#!/bin/bash" > $@.$(INPATH) @echo "PREFIX=$(UNIXFILENAME.$(@:d:d:f))" >> $@.$(INPATH) @echo "ICON_PREFIX=$(ICONPREFIX.$(@:d:d:f))" >> $@.$(INPATH) @echo "ICON_SOURCE_DIR=../../../desktop/icons" >> $@.$(INPATH) diff --git a/sysui/desktop/share/openoffice.sh b/sysui/desktop/share/openoffice.sh index d3ecf978ee8f..d3ecf978ee8f 100644..100755 --- a/sysui/desktop/share/openoffice.sh +++ b/sysui/desktop/share/openoffice.sh diff --git a/sysui/desktop/share/printeradmin.sh b/sysui/desktop/share/printeradmin.sh index 0eb631f345f0..0eb631f345f0 100644..100755 --- a/sysui/desktop/share/printeradmin.sh +++ b/sysui/desktop/share/printeradmin.sh diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl index 0c3ee55b10ce..cdc636b7a266 100644..100755 --- a/sysui/desktop/share/translate.pl +++ b/sysui/desktop/share/translate.pl @@ -36,7 +36,8 @@ eval 'exec perl -wS $0 ${1+"$@"}' # my ($prefix, $ext, $key); -$productname = "OpenOffice.org"; +$productname = "LibreOffice"; +$productname_br = "BrOffice"; $workdir = "."; while ($_ = $ARGV[0], /^-/) { @@ -46,6 +47,10 @@ while ($_ = $ARGV[0], /^-/) { $productname = $ARGV[0]; shift; } + if (/^-b/) { + $productname_br = $ARGV[0]; + shift; + } if (/^-d/) { $workdir = $ARGV[0]; shift; @@ -122,6 +127,7 @@ KEY: while (<TEMPLATE>) { $value = substr($value, index($value, "\"") + 1, rindex($value, "\"") - 1); # replace resource placeholder + $value=~s/%PRODUCTNAME_BR/$productname_br/g; $value=~s/%PRODUCTNAME/$productname/g; $locale=~s/-/_/; diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk index eeeb141c6397..4da439ed439d 100644..100755 --- a/sysui/desktop/slackware/makefile.mk +++ b/sysui/desktop/slackware/makefile.mk @@ -92,7 +92,7 @@ $(MISC)/$(TARGET)/usr/share/applications/ : $(MISC)/$(TARGET)/empty.tar : @$(MKDIRHIER) $(@:d)/empty - @tar -C $(MISC)/$(TARGET)/empty --owner=root --group=root --same-owner -cf $@ . + @$(GNUTAR) -C $(MISC)/$(TARGET)/empty --owner=root --group=root --same-owner -cf $@ . # --- packaging --------------------------------------------------- @@ -104,7 +104,7 @@ $(MENUFILES) : $(MISC)/$(TARGET)/empty.tar -$(RM) -r $(MISC)$/$(@:b) dmake $(MISC)$/$(@:b)$/usr/share/applications $(MISC)$/$(@:b)$/install$/slack-desc $(MISC)$/$(@:b)$/install$/doinst.sh @$(COPY) $(MISC)/$(TARGET)$/empty.tar $@.tmp - @tar -C $(MISC)/$(@:b) --owner=root --group=root --same-owner --exclude application.flag -rf $@.tmp install usr opt + @$(GNUTAR) -C $(MISC)/$(@:b) --owner=root --group=root --same-owner --exclude application.flag -rf $@.tmp install usr opt @gzip < $@.tmp > $@ @$(RM) $@.tmp $(RM) -r $(MISC)$/$(@:b) diff --git a/sysui/desktop/slackware/slack-desc b/sysui/desktop/slackware/slack-desc index 42d6ce8dd8bf..d19137371298 100644..100755 --- a/sysui/desktop/slackware/slack-desc +++ b/sysui/desktop/slackware/slack-desc @@ -10,4 +10,4 @@ PKGNAME: default, make sure to adapt the link PKGNAME: /etc/UNIXFILENAME PKGNAME: accordingly to point to the correct location. PKGNAME: -PKGNAME: This package is provided by OpenOffice.org +PKGNAME: This package is provided by The Document Foundation diff --git a/sysui/desktop/slackware/update-script b/sysui/desktop/slackware/update-script index f7f957ac9e33..f7f957ac9e33 100644..100755 --- a/sysui/desktop/slackware/update-script +++ b/sysui/desktop/slackware/update-script diff --git a/sysui/desktop/solaris/copyright b/sysui/desktop/solaris/copyright index bc2059a3ef79..bc2059a3ef79 100644..100755 --- a/sysui/desktop/solaris/copyright +++ b/sysui/desktop/solaris/copyright diff --git a/sysui/desktop/solaris/depend b/sysui/desktop/solaris/depend index 050e13593ae6..050e13593ae6 100644..100755 --- a/sysui/desktop/solaris/depend +++ b/sysui/desktop/solaris/depend diff --git a/sysui/desktop/solaris/mailcap b/sysui/desktop/solaris/mailcap index 5c8a1d51350b..5c8a1d51350b 100644..100755 --- a/sysui/desktop/solaris/mailcap +++ b/sysui/desktop/solaris/mailcap diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk index d2ffc8cdfc1e..f74dae146e84 100644..100755 --- a/sysui/desktop/solaris/makefile.mk +++ b/sysui/desktop/solaris/makefile.mk @@ -124,7 +124,7 @@ $(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype .IF "$(DONTCOMPRESS)"=="" $(FASPAC) $(SOLARBINDIR)/faspac-so.sh -a -d $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int .ENDIF # "$(DONTCOMPRESS)"=="" - @tar -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int | gzip > $@ + @$(GNUTAR) -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int | gzip > $@ @rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int .ENDIF diff --git a/sysui/desktop/solaris/mime.types b/sysui/desktop/solaris/mime.types index 1b0a203f3b6f..1b0a203f3b6f 100644..100755 --- a/sysui/desktop/solaris/mime.types +++ b/sysui/desktop/solaris/mime.types diff --git a/sysui/desktop/solaris/pkginfo b/sysui/desktop/solaris/pkginfo index 4f7f42df8341..4f7f42df8341 100644..100755 --- a/sysui/desktop/solaris/pkginfo +++ b/sysui/desktop/solaris/pkginfo diff --git a/sysui/desktop/solaris/postinstall b/sysui/desktop/solaris/postinstall index 2f775ba6d78a..2f775ba6d78a 100644..100755 --- a/sysui/desktop/solaris/postinstall +++ b/sysui/desktop/solaris/postinstall diff --git a/sysui/desktop/solaris/postremove b/sysui/desktop/solaris/postremove index 460c3f2fa196..460c3f2fa196 100644..100755 --- a/sysui/desktop/solaris/postremove +++ b/sysui/desktop/solaris/postremove diff --git a/sysui/desktop/solaris/prototype b/sysui/desktop/solaris/prototype index ef541c3134ea..ef541c3134ea 100644..100755 --- a/sysui/desktop/solaris/prototype +++ b/sysui/desktop/solaris/prototype diff --git a/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk index 31ac8c6cf590..31ac8c6cf590 100644..100755 --- a/sysui/desktop/suse/makefile.mk +++ b/sysui/desktop/suse/makefile.mk diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec index 14dbcde0f5e2..fe709694c3fd 100644..100755 --- a/sysui/desktop/suse/suse-menus.spec +++ b/sysui/desktop/suse/suse-menus.spec @@ -5,14 +5,14 @@ Summary: %productname desktop integration Name: %pkgprefix-suse-menus Group: Office License: LGPL -Vendor: OpenOffice.org +Vendor: The Document Foundation AutoReqProv: no BuildArch: noarch # /etc/SuSE-release for SuSE, SLES and Novell Linux Desktop .. Requires: /etc/SuSE-release # .. but not for Sun JDS Conflicts: SunDesktopVersion -Provides: openoffice.org3-desktop-integration +Provides: libreoffice-desktop-integration %define _unpackaged_files_terminate_build 0 %define _binary_filedigest_algorithm 1 %define _binary_payload w9.gzdio @@ -280,7 +280,12 @@ for themedir in /opt/gnome/share/icons/gnome /opt/gnome/share/icons/hicolor /opt done %files -%attr(0755,root,root) /usr/bin/soffice +%if %unixfilename != libreoffice +# compat symlinks +%attr(0755,root,root) /opt/%unixfilename +%attr(0755,root,root) /usr/bin/libreoffice +%attr(0755,root,root) /usr/bin/libreoffice-printeradmin +%endif %attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename %attr(0755,root,root) /usr/bin/%unixfilename-printeradmin %defattr(0644, root, root) diff --git a/sysui/desktop/tg_rpm.mk b/sysui/desktop/tg_rpm.mk index 6fab6e748a99..6fab6e748a99 100644..100755 --- a/sysui/desktop/tg_rpm.mk +++ b/sysui/desktop/tg_rpm.mk diff --git a/sysui/desktop/util/makefile.mk b/sysui/desktop/util/makefile.mk index a8c6feaaa14a..8255cc08ca50 100644..100755 --- a/sysui/desktop/util/makefile.mk +++ b/sysui/desktop/util/makefile.mk @@ -53,7 +53,7 @@ ALLTAR: $(RPMTARFILES) $(DEBTARFILES) $(RPMTARFILES) : $(PKGDIR) $(MKDIRHIER) $(@:d) - tar -C $(PKGDIR:d:d) -cf - $(PKGDIR:f)$/{$(shell cd $(PKGDIR); ls $(@:b:b:s/-/ /:1)*.rpm)} | gzip > $@ + $(GNUTAR) -C $(PKGDIR:d:d) -cf - $(PKGDIR:f)$/{$(shell cd $(PKGDIR); ls $(@:b:b:s/-/ /:1)*.rpm)} | gzip > $@ .ENDIF # "$(TARFILE)" != "" @@ -61,6 +61,6 @@ $(RPMTARFILES) : $(PKGDIR) $(DEBTARFILES) : $(PKGDIR) $(MKDIRHIER) $(@:d) - tar -C $(PKGDIR:d:d) -cf - $(PKGDIR:f)$/{$(shell @cd $(PKGDIR); ls $(@:b:b:s/-/ /:1)*.deb)} | gzip > $@ + $(GNUTAR) -C $(PKGDIR:d:d) -cf - $(PKGDIR:f)$/{$(shell @cd $(PKGDIR); ls $(@:b:b:s/-/ /:1)*.deb)} | gzip > $@ .ENDIF diff --git a/sysui/desktop/util/pkgdiff.pl b/sysui/desktop/util/pkgdiff.pl index dca659669112..dca659669112 100644..100755 --- a/sysui/desktop/util/pkgdiff.pl +++ b/sysui/desktop/util/pkgdiff.pl diff --git a/sysui/prj/build.lst b/sysui/prj/build.lst index b5f26eb936b9..b5f26eb936b9 100644..100755 --- a/sysui/prj/build.lst +++ b/sysui/prj/build.lst diff --git a/sysui/prj/d.lst b/sysui/prj/d.lst index c6019cea9a43..c6019cea9a43 100644..100755 --- a/sysui/prj/d.lst +++ b/sysui/prj/d.lst diff --git a/sysui/source/win32/QuickStart/OOQuickStart.rc b/sysui/source/win32/QuickStart/OOQuickStart.rc index 0dc4dab256b6..0dc4dab256b6 100644..100755 --- a/sysui/source/win32/QuickStart/OOQuickStart.rc +++ b/sysui/source/win32/QuickStart/OOQuickStart.rc diff --git a/sysui/source/win32/QuickStart/QuickStart.cpp b/sysui/source/win32/QuickStart/QuickStart.cpp index 3467e35524f8..999701da985a 100644..100755 --- a/sysui/source/win32/QuickStart/QuickStart.cpp +++ b/sysui/source/win32/QuickStart/QuickStart.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // QuickStart.cpp : Defines the entry point for the application. // @@ -101,11 +102,11 @@ void NotifyListener( HWND hWnd ) nid.cbSize = sizeof(NOTIFYICONDATA); nid.hWnd = hWnd; nid.uID = IDM_QUICKSTART; - nid.szTip[elementsof(nid.szTip) - 1] = 0; + nid.szTip[SAL_N_ELEMENTS(nid.szTip) - 1] = 0; // nid.hIcon = bTerminateVeto ? hIconActive : hIconInActive; -// strncpy(nid.szTip, bTerminateVeto ? STRING_QUICKSTARTACTIVE : STRING_QUICKSTARTINACTIVE, elementsof(nid.szTip) - 1 ); +// strncpy(nid.szTip, bTerminateVeto ? STRING_QUICKSTARTACTIVE : STRING_QUICKSTARTINACTIVE, SAL_N_ELEMENTS(nid.szTip) - 1 ); nid.hIcon = hIconActive; - strncpy(nid.szTip, szTooltipString, elementsof(nid.szTip) - 1); + strncpy(nid.szTip, szTooltipString, SAL_N_ELEMENTS(nid.szTip) - 1); nid.uFlags = NIF_TIP|NIF_ICON; // update systray @@ -421,3 +422,5 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM) } return FALSE; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sysui/source/win32/QuickStart/QuickStart.h b/sysui/source/win32/QuickStart/QuickStart.h index d0afd98ec430..b61a04075e08 100644..100755 --- a/sysui/source/win32/QuickStart/QuickStart.h +++ b/sysui/source/win32/QuickStart/QuickStart.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #if !defined(AFX_QUICKSTART_H__7D38EE02_7699_4CF0_AFF9_FD92E05CC009__INCLUDED_) #define AFX_QUICKSTART_H__7D38EE02_7699_4CF0_AFF9_FD92E05CC009__INCLUDED_ @@ -10,3 +11,5 @@ #endif // !defined(AFX_QUICKSTART_H__7D38EE02_7699_4CF0_AFF9_FD92E05CC009__INCLUDED_) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sysui/source/win32/QuickStart/StdAfx.h b/sysui/source/win32/QuickStart/StdAfx.h index a4bdd66f630c..f5277a01332c 100644..100755 --- a/sysui/source/win32/QuickStart/StdAfx.h +++ b/sysui/source/win32/QuickStart/StdAfx.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // stdafx.h : include file for standard system include files, // or project specific include files that are used frequently, but // are changed infrequently @@ -37,3 +38,5 @@ // Microsoft Visual C++ will insert additional declarations immediately before the previous line. #endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sysui/source/win32/QuickStart/makefile.mk b/sysui/source/win32/QuickStart/makefile.mk index 41242d849dfb..41242d849dfb 100644..100755 --- a/sysui/source/win32/QuickStart/makefile.mk +++ b/sysui/source/win32/QuickStart/makefile.mk diff --git a/sysui/source/win32/QuickStart/resource.h b/sysui/source/win32/QuickStart/resource.h index d34beb00c5c9..dc4a70ab5193 100644..100755 --- a/sysui/source/win32/QuickStart/resource.h +++ b/sysui/source/win32/QuickStart/resource.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by QUICKSTART.RC @@ -30,3 +31,5 @@ #define _APS_NEXT_SYMED_VALUE 113 #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sysui/source/win32/QuickStart/so/QuickStart.rc b/sysui/source/win32/QuickStart/so/QuickStart.rc index c48dc2358d0d..c48dc2358d0d 100644..100755 --- a/sysui/source/win32/QuickStart/so/QuickStart.rc +++ b/sysui/source/win32/QuickStart/so/QuickStart.rc diff --git a/sysui/source/win32/QuickStart/so/makefile.mk b/sysui/source/win32/QuickStart/so/makefile.mk index 6c7897232576..6c7897232576 100644..100755 --- a/sysui/source/win32/QuickStart/so/makefile.mk +++ b/sysui/source/win32/QuickStart/so/makefile.mk diff --git a/sysui/source/win32/misc/AutoBuffer.cxx b/sysui/source/win32/misc/AutoBuffer.cxx index 980b274e8872..9eaa9968aa05 100644..100755 --- a/sysui/source/win32/misc/AutoBuffer.cxx +++ b/sysui/source/win32/misc/AutoBuffer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -161,3 +162,5 @@ void SAL_CALL CAutoUnicodeBuffer::init( ) empty( ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sysui/source/win32/misc/AutoBuffer.hxx b/sysui/source/win32/misc/AutoBuffer.hxx index 920ed38a589b..9d3b4e1c1b6c 100644..100755 --- a/sysui/source/win32/misc/AutoBuffer.hxx +++ b/sysui/source/win32/misc/AutoBuffer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,9 +35,7 @@ #include <sal/types.h> -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring> -#endif //------------------------------------------------------------- // A simple unicode buffer management class, the class itself @@ -83,3 +82,5 @@ private: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sysui/source/win32/misc/WinImplHelper.cxx b/sysui/source/win32/misc/WinImplHelper.cxx index a9a71e59c06e..845a324400e3 100644..100755 --- a/sysui/source/win32/misc/WinImplHelper.cxx +++ b/sysui/source/win32/misc/WinImplHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -132,7 +133,7 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt if ( !aItem.hasValue( ) || aItem.getValueType( ) != getCppuType((OUString*)0) ) throw IllegalArgumentException( - OUString::createFromAscii( "invalid value type or any has no value" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), rXInterface, aArgPos ); @@ -154,7 +155,7 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference< if ( !aItemList.hasValue( ) || aItemList.getValueType( ) != getCppuType((Sequence<OUString>*)0) ) throw IllegalArgumentException( - OUString::createFromAscii( "invalid value type or any has no value" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), rXInterface, aArgPos ); @@ -182,7 +183,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc (aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) && (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) ) throw IllegalArgumentException( - OUString::createFromAscii( "invalid value type or any has no value" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), rXInterface, aArgPos ); @@ -195,7 +196,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc // index was not correct if ( CB_ERR == lRet ) throw IllegalArgumentException( - OUString::createFromAscii( "inavlid item position" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "inavlid item position" )), rXInterface, aArgPos ); } @@ -234,7 +235,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref (aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) && (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) ) throw IllegalArgumentException( - OUString::createFromAscii( "invalid value type or any has no value" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), rXInterface, aArgPos ); @@ -243,7 +244,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref if ( nPos < -1 ) throw IllegalArgumentException( - OUString::createFromAscii("invalid index"), + OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")), rXInterface, aArgPos ); @@ -251,7 +252,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref if ( (CB_ERR == lRet) && (-1 != nPos) ) throw IllegalArgumentException( - OUString::createFromAscii("invalid index"), + OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")), rXInterface, aArgPos ); } @@ -328,7 +329,7 @@ void SAL_CALL CheckboxSetState( if ( !aState.hasValue( ) || aState.getValueType( ) != getCppuType((sal_Bool*)0) ) throw IllegalArgumentException( - OUString::createFromAscii( "invalid value type or any has no value" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )), rXInterface, aArgPos ); @@ -356,3 +357,5 @@ sal_uInt32 SAL_CALL _wcslenex( const sal_Unicode* pStr ) return strLen; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sysui/source/win32/misc/WinImplHelper.hxx b/sysui/source/win32/misc/WinImplHelper.hxx index 05527c6e6ed2..9999a8832009 100644..100755 --- a/sysui/source/win32/misc/WinImplHelper.hxx +++ b/sysui/source/win32/misc/WinImplHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,9 +36,7 @@ #include <sal/types.h> -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring> -#endif #include <windows.h> #include <com/sun/star/uno/Any.hxx> @@ -88,3 +87,5 @@ void SAL_CALL CheckboxSetState( sal_uInt32 SAL_CALL _wcslenex( const sal_Unicode* pStr ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sysui/source/win32/misc/makefile.mk b/sysui/source/win32/misc/makefile.mk index b3b94be7640d..b3b94be7640d 100644..100755 --- a/sysui/source/win32/misc/makefile.mk +++ b/sysui/source/win32/misc/makefile.mk diff --git a/sysui/source/win32/misc/resourceprovider.cxx b/sysui/source/win32/misc/resourceprovider.cxx index 38fa79ecdf22..dc95c6d08fb2 100644..100755 --- a/sysui/source/win32/misc/resourceprovider.cxx +++ b/sysui/source/win32/misc/resourceprovider.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,7 +60,7 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; // id + 100 #define LB_LABEL_OFFSET 100 -const rtl::OUString TILDE = OUString::createFromAscii( "~" ); +const rtl::OUString TILDE = OUString(RTL_CONSTASCII_USTRINGPARAM( "~" )); const sal_Unicode TILDE_SIGN = L'~'; #define FOLDERPICKER_TITLE 500 @@ -227,3 +228,5 @@ OUString CResourceProvider::getResString( sal_Int32 aId ) { return m_pImpl->getResString( aId ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sysui/source/win32/misc/resourceprovider.hxx b/sysui/source/win32/misc/resourceprovider.hxx index e1a0fbea30b8..bb43e3a1717c 100644..100755 --- a/sysui/source/win32/misc/resourceprovider.hxx +++ b/sysui/source/win32/misc/resourceprovider.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,9 +36,7 @@ #include <sal/types.h> -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring> -#endif //------------------------------------------------------------------------ // deklarations @@ -58,3 +57,5 @@ private: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sysui/util/checksize.pl b/sysui/util/checksize.pl index 559dcc45f68e..559dcc45f68e 100644..100755 --- a/sysui/util/checksize.pl +++ b/sysui/util/checksize.pl diff --git a/sysui/util/exports.dxp b/sysui/util/exports.dxp index f0e1c69934bc..f0e1c69934bc 100644..100755 --- a/sysui/util/exports.dxp +++ b/sysui/util/exports.dxp diff --git a/sysui/util/makefile.mk b/sysui/util/makefile.mk index bea30771933f..bea30771933f 100644..100755 --- a/sysui/util/makefile.mk +++ b/sysui/util/makefile.mk |
