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 /vcl | |
| parent | 15e35093e86b49b3e8129108fa358adc0c865fbe (diff) | |
fdo#37740 remove duplicate icons from soffice.bin/soffice.exe
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/svids.hrc | 8 | ||||
| -rw-r--r-- | vcl/inc/vcl/syswin.hxx | 16 | ||||
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 2 |
3 files changed, 11 insertions, 15 deletions
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index 1f60241d6716..5eba31828f38 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -256,10 +256,10 @@ #define SV_ICON_ID_SPREADSHEET_TEMPLATE 5 #define SV_ICON_ID_DRAWING 6 #define SV_ICON_ID_PRESENTATION 8 -#define SV_ICON_ID_MASTER_DOCUMENT 11 -#define SV_ICON_ID_DATABASE 14 -#define SV_ICON_ID_FORMULA 15 -#define SV_ICON_ID_TEMPLATE 16 +#define SV_ICON_ID_MASTER_DOCUMENT 10 +#define SV_ICON_ID_TEMPLATE 11 +#define SV_ICON_ID_DATABASE 12 +#define SV_ICON_ID_FORMULA 13 #define SV_ICON_ID_PRINTERADMIN 501 #define HID_PRINTDLG HID_VCL_START diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx index 832ebd2cec17..7370280c53d1 100644 --- a/vcl/inc/vcl/syswin.hxx +++ b/vcl/inc/vcl/syswin.hxx @@ -41,8 +41,7 @@ class TaskPaneList; // - Icon-Types - // -------------- -#define ICON_DEFAULT 0 -#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 @@ -51,14 +50,11 @@ class TaskPaneList; #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_MASTER_DOCUMENT 10 +#define ICON_TEMPLATE 11 +#define ICON_DATABASE_DOCUMENT 12 +#define ICON_MATH_DOCUMENT 13 +#define ICON_MACROLIBRARY 1 #define ICON_PLAYER 100 #define ICON_SETUP 500 diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 9ab7a1ac2f32..dca1609a727e 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -717,7 +717,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uLong nSalFrameStyle, mbShaded = false; mbFullScreen = false; - mnIconID = 1; // ICON_DEFAULT + mnIconID = 1; // ICON_LO_DEFAULT m_pClipRectangles = NULL; m_nCurClipRect = 0; |