diff options
| author | Andras Timar <atimar@suse.com> | 2012-01-18 13:11:11 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-01-18 19:16:06 +0100 |
| commit | ceb14e0143fb72b34421f6fb81ff1fb1842cb500 (patch) | |
| tree | 01aa22526fa80fec90dee5e97a23c11e2feecaf4 /sfx2 | |
| parent | 15e35093e86b49b3e8129108fa358adc0c865fbe (diff) | |
fdo#37740 remove duplicate icons from soffice.bin/soffice.exe
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdowniconunx.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/appl/shutdowniconw32.cxx | 18 |
2 files changed, 10 insertions, 14 deletions
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index d0b17edc9ec9..0edafdb8ff7c 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -30,9 +30,9 @@ #define SV_ICON_ID_SPREADSHEET 4 #define SV_ICON_ID_DRAWING 6 #define SV_ICON_ID_PRESENTATION 8 -#define SV_ICON_ID_DATABASE 14 -#define SV_ICON_ID_FORMULA 15 -#define SV_ICON_ID_TEMPLATE 16 +#define SV_ICON_ID_TEMPLATE 11 +#define SV_ICON_ID_DATABASE 12 +#define SV_ICON_ID_FORMULA 13 using namespace ::rtl; using namespace ::osl; diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index c4cd1381d26c..1a3a594f240d 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -81,7 +81,7 @@ using ::com::sun::star::beans::PropertyValue; #define IDM_UNINSTALL 11 -#define ICON_SO_DEFAULT 1 +#define ICON_LO_DEFAULT 1 #define ICON_TEXT_DOCUMENT 2 #define ICON_TEXT_TEMPLATE 3 #define ICON_SPREADSHEET_DOCUMENT 4 @@ -90,15 +90,11 @@ using ::com::sun::star::beans::PropertyValue; #define ICON_DRAWING_TEMPLATE 7 #define ICON_PRESENTATION_DOCUMENT 8 #define ICON_PRESENTATION_TEMPLATE 9 -#define ICON_PRESENTATION_COMPRESSED 10 -#define ICON_GLOBAL_DOCUMENT 11 -#define ICON_HTML_DOCUMENT 12 -#define ICON_CHART_DOCUMENT 13 -#define ICON_DATABASE_DOCUMENT 14 -#define ICON_MATH_DOCUMENT 15 -#define ICON_TEMPLATE 16 -#define ICON_MACROLIBRARY 17 -#define ICON_CONFIGURATION 18 +#define ICON_MASTER_DOCUMENT 10 +#define ICON_TEMPLATE 11 +#define ICON_DATABASE_DOCUMENT 12 +#define ICON_MATH_DOCUMENT 13 +#define ICON_MACROLIBRARY 1 #define ICON_OPEN 5 // See index of open folder icon in shell32.dll #define ICON_SETUP 500 @@ -289,7 +285,7 @@ static void addTaskbarIcon( HWND hWnd ) // add taskbar icon NOTIFYICONDATAA nid; - nid.hIcon = (HICON)LoadImageA( GetModuleHandle( NULL ), MAKEINTRESOURCE( ICON_SO_DEFAULT ), + nid.hIcon = (HICON)LoadImageA( GetModuleHandle( NULL ), MAKEINTRESOURCE( ICON_LO_DEFAULT ), IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CYSMICON ), LR_DEFAULTCOLOR | LR_SHARED ); |