dev/null |binary svtools/inc/svtools/imagemgr.hrc | 2 - svtools/source/misc/imagemgr.src | 4 -- vcl/inc/svids.hrc | 3 - vcl/source/src/images.src | 75 --------------------------------------- 5 files changed, 84 deletions(-)
New commits: commit 06c84689eaead2f9ae1bc5ceffa1537bc6b0945e Author: Julien Chaffraix <[email protected]> Date: Thu Nov 17 20:24:32 2011 -0800 FDO#42454 - EasyHack: remove code associated with unused icons Removed code associated with SV_ICON_ID_PRESENTATION_TEMPLATE. Remove 3 icons associated with the id that were not used. diff --git a/default_images/res/otp_16_8.png b/default_images/res/otp_16_8.png deleted file mode 100644 index 98c961b..0000000 Binary files a/default_images/res/otp_16_8.png and /dev/null differ diff --git a/default_images/res/otp_32_8.png b/default_images/res/otp_32_8.png deleted file mode 100644 index 1920295..0000000 Binary files a/default_images/res/otp_32_8.png and /dev/null differ diff --git a/default_images/res/otp_48_8.png b/default_images/res/otp_48_8.png deleted file mode 100644 index cf70219..0000000 Binary files a/default_images/res/otp_48_8.png and /dev/null differ diff --git a/ooo_custom_images/oxygen/res/otp_16_8.png b/ooo_custom_images/oxygen/res/otp_16_8.png deleted file mode 100644 index 3fd5e22..0000000 Binary files a/ooo_custom_images/oxygen/res/otp_16_8.png and /dev/null differ diff --git a/ooo_custom_images/oxygen/res/otp_32_8.png b/ooo_custom_images/oxygen/res/otp_32_8.png deleted file mode 100644 index c4d7d8c..0000000 Binary files a/ooo_custom_images/oxygen/res/otp_32_8.png and /dev/null differ diff --git a/ooo_custom_images/oxygen/res/otp_48_8.png b/ooo_custom_images/oxygen/res/otp_48_8.png deleted file mode 100644 index f3a0e99..0000000 Binary files a/ooo_custom_images/oxygen/res/otp_48_8.png and /dev/null differ diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src index 7953fbd..ca4a075 100644 --- a/svtools/source/misc/imagemgr.src +++ b/svtools/source/misc/imagemgr.src @@ -43,7 +43,6 @@ IMG_GLOBAL_DOC ; \ IMG_DRAW ; \ IMG_DRAWTEMPLATE ; \ - IMG_NEWFROMTEMPLATE ; \ IMG_DATABASE; \ IMG_BITMAP ; \ IMG_CALC ; \ @@ -93,7 +92,6 @@ IMG_WRITER ; \ IMG_WRITERTEMPLATE ; \ /* svx */ \ - IMG_NEWFROMTEMPLATE ; ImageList RID_SVTOOLS_IMAGELIST_BIG { diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index 0e56e52..c94d215 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -256,7 +256,6 @@ #define SV_ICON_ID_SPREADSHEET_TEMPLATE 5 #define SV_ICON_ID_DRAWING 6 #define SV_ICON_ID_PRESENTATION 8 -#define SV_ICON_ID_PRESENTATION_TEMPLATE 9 #define SV_ICON_ID_MASTER_DOCUMENT 11 #define SV_ICON_ID_DATABASE 14 #define SV_ICON_ID_FORMULA 15 diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src index f576b9d..2dcaac6 100644 --- a/vcl/source/src/images.src +++ b/vcl/source/src/images.src @@ -219,21 +219,6 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_PRESENTATION) File = "odp_16_8.png" ; }; -Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_PRESENTATION_TEMPLATE) -{ - File = "otp_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_PRESENTATION_TEMPLATE) -{ - File = "otp_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_PRESENTATION_TEMPLATE) -{ - File = "otp_16_8.png" ; -}; - Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_MASTER_DOCUMENT) { File = "odm_48_8.png" ; @@ -392,16 +377,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRESENTATION) File = "sx03249.png" ; }; -Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRESENTATION_TEMPLATE) -{ - File = "lx03253.png" ; -}; - -Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRESENTATION_TEMPLATE) -{ - File = "sx03253.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_MASTER_DOCUMENT) { File = "lx03248.png" ; commit abd7cf81ddbc8fe648288c11184ff7a0711766d3 Author: Julien Chaffraix <[email protected]> Date: Thu Nov 17 07:45:08 2011 -0800 FDO#42454 - EasyHack: remove code associated with unused icons Removed SV_ICON_ID_PRESENTATION_COMPRESSED and all associated code. Removed 2 icons that were unused after this removal. diff --git a/default_images/res/lx03241.png b/default_images/res/lx03241.png deleted file mode 100644 index 2ae0547..0000000 Binary files a/default_images/res/lx03241.png and /dev/null differ diff --git a/default_images/res/sx03241.png b/default_images/res/sx03241.png deleted file mode 100644 index 222f8c1..0000000 Binary files a/default_images/res/sx03241.png and /dev/null differ diff --git a/ooo_custom_images/hicontrast/res/lx03241.png b/ooo_custom_images/hicontrast/res/lx03241.png deleted file mode 100644 index e96e857..0000000 Binary files a/ooo_custom_images/hicontrast/res/lx03241.png and /dev/null differ diff --git a/ooo_custom_images/hicontrast/res/sx03241.png b/ooo_custom_images/hicontrast/res/sx03241.png deleted file mode 100644 index 82c928b..0000000 Binary files a/ooo_custom_images/hicontrast/res/sx03241.png and /dev/null differ diff --git a/ooo_custom_images/human/res/lx03241.png b/ooo_custom_images/human/res/lx03241.png deleted file mode 100644 index cb394a1..0000000 Binary files a/ooo_custom_images/human/res/lx03241.png and /dev/null differ diff --git a/ooo_custom_images/human/res/sx03241.png b/ooo_custom_images/human/res/sx03241.png deleted file mode 100644 index aca1f5f..0000000 Binary files a/ooo_custom_images/human/res/sx03241.png and /dev/null differ diff --git a/ooo_custom_images/industrial/res/lx03241.png b/ooo_custom_images/industrial/res/lx03241.png deleted file mode 100644 index 40a7979..0000000 Binary files a/ooo_custom_images/industrial/res/lx03241.png and /dev/null differ diff --git a/ooo_custom_images/industrial/res/sx03241.png b/ooo_custom_images/industrial/res/sx03241.png deleted file mode 100644 index 47e5385..0000000 Binary files a/ooo_custom_images/industrial/res/sx03241.png and /dev/null differ diff --git a/ooo_custom_images/oxygen/res/lx03241.png b/ooo_custom_images/oxygen/res/lx03241.png deleted file mode 100644 index 247d8c8..0000000 Binary files a/ooo_custom_images/oxygen/res/lx03241.png and /dev/null differ diff --git a/ooo_custom_images/oxygen/res/sx03241.png b/ooo_custom_images/oxygen/res/sx03241.png deleted file mode 100644 index ef53cca..0000000 Binary files a/ooo_custom_images/oxygen/res/sx03241.png and /dev/null differ diff --git a/ooo_custom_images/tango/res/lx03241.png b/ooo_custom_images/tango/res/lx03241.png deleted file mode 100644 index b8e01f0..0000000 Binary files a/ooo_custom_images/tango/res/lx03241.png and /dev/null differ diff --git a/ooo_custom_images/tango/res/sx03241.png b/ooo_custom_images/tango/res/sx03241.png deleted file mode 100644 index e7cc909..0000000 Binary files a/ooo_custom_images/tango/res/sx03241.png and /dev/null differ diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index 962e854..0e56e52 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -257,7 +257,6 @@ #define SV_ICON_ID_DRAWING 6 #define SV_ICON_ID_PRESENTATION 8 #define SV_ICON_ID_PRESENTATION_TEMPLATE 9 -#define SV_ICON_ID_PRESENTATION_COMPRESSED 10 #define SV_ICON_ID_MASTER_DOCUMENT 11 #define SV_ICON_ID_DATABASE 14 #define SV_ICON_ID_FORMULA 15 diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src index df3f93b..f576b9d 100644 --- a/vcl/source/src/images.src +++ b/vcl/source/src/images.src @@ -234,21 +234,6 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_PRESENTATION_TEMPLATE) File = "otp_16_8.png" ; }; -Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_PRESENTATION_COMPRESSED) -{ - File = "odp_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_PRESENTATION_COMPRESSED) -{ - File = "odp_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_PRESENTATION_COMPRESSED) -{ - File = "odp_16_8.png" ; -}; - Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_MASTER_DOCUMENT) { File = "odm_48_8.png" ; @@ -417,16 +402,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRESENTATION_TEMPLATE) File = "sx03253.png" ; }; -Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRESENTATION_COMPRESSED) -{ - File = "lx03241.png" ; -}; - -Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRESENTATION_COMPRESSED) -{ - File = "sx03241.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_MASTER_DOCUMENT) { File = "lx03248.png" ; commit 2559cab126f81375197051fb5b07ba6abb9efc77 Author: Julien Chaffraix <[email protected]> Date: Wed Nov 16 20:04:12 2011 -0800 FDO#42454 - EasyHack: remove code associated with unused icons Removed SV_ICON_ID_MACRO and its reference in the code as it was unused. Removed 2 icons that were not referenced anymore. diff --git a/default_images/res/lx03216.png b/default_images/res/lx03216.png deleted file mode 100644 index 176461a..0000000 Binary files a/default_images/res/lx03216.png and /dev/null differ diff --git a/default_images/res/sx03216.png b/default_images/res/sx03216.png deleted file mode 100644 index 35968bb..0000000 Binary files a/default_images/res/sx03216.png and /dev/null differ diff --git a/ooo_custom_images/crystal/res/lx03216.png b/ooo_custom_images/crystal/res/lx03216.png deleted file mode 100644 index 5efd09c..0000000 Binary files a/ooo_custom_images/crystal/res/lx03216.png and /dev/null differ diff --git a/ooo_custom_images/crystal/res/sx03216.png b/ooo_custom_images/crystal/res/sx03216.png deleted file mode 100644 index aa541d0..0000000 Binary files a/ooo_custom_images/crystal/res/sx03216.png and /dev/null differ diff --git a/ooo_custom_images/hicontrast/res/lx03216.png b/ooo_custom_images/hicontrast/res/lx03216.png deleted file mode 100644 index ecd9699..0000000 Binary files a/ooo_custom_images/hicontrast/res/lx03216.png and /dev/null differ diff --git a/ooo_custom_images/hicontrast/res/sx03216.png b/ooo_custom_images/hicontrast/res/sx03216.png deleted file mode 100644 index 6f7e97f..0000000 Binary files a/ooo_custom_images/hicontrast/res/sx03216.png and /dev/null differ diff --git a/ooo_custom_images/human/res/lx03216.png b/ooo_custom_images/human/res/lx03216.png deleted file mode 100644 index 12884b2..0000000 Binary files a/ooo_custom_images/human/res/lx03216.png and /dev/null differ diff --git a/ooo_custom_images/human/res/sx03216.png b/ooo_custom_images/human/res/sx03216.png deleted file mode 100644 index 07774be..0000000 Binary files a/ooo_custom_images/human/res/sx03216.png and /dev/null differ diff --git a/ooo_custom_images/industrial/res/lx03216.png b/ooo_custom_images/industrial/res/lx03216.png deleted file mode 100644 index 307d521..0000000 Binary files a/ooo_custom_images/industrial/res/lx03216.png and /dev/null differ diff --git a/ooo_custom_images/industrial/res/sx03216.png b/ooo_custom_images/industrial/res/sx03216.png deleted file mode 100644 index 5024df9..0000000 Binary files a/ooo_custom_images/industrial/res/sx03216.png and /dev/null differ diff --git a/ooo_custom_images/oxygen/res/lx03216.png b/ooo_custom_images/oxygen/res/lx03216.png deleted file mode 100644 index 50b9d4f..0000000 Binary files a/ooo_custom_images/oxygen/res/lx03216.png and /dev/null differ diff --git a/ooo_custom_images/oxygen/res/sx03216.png b/ooo_custom_images/oxygen/res/sx03216.png deleted file mode 100644 index 1b7ee77..0000000 Binary files a/ooo_custom_images/oxygen/res/sx03216.png and /dev/null differ diff --git a/ooo_custom_images/tango/res/lx03216.png b/ooo_custom_images/tango/res/lx03216.png deleted file mode 100644 index 176461a..0000000 Binary files a/ooo_custom_images/tango/res/lx03216.png and /dev/null differ diff --git a/ooo_custom_images/tango/res/sx03216.png b/ooo_custom_images/tango/res/sx03216.png deleted file mode 100644 index 35968bb..0000000 Binary files a/ooo_custom_images/tango/res/sx03216.png and /dev/null differ diff --git a/svtools/inc/svtools/imagemgr.hrc b/svtools/inc/svtools/imagemgr.hrc index 17c0175..31ab1b7 100644 --- a/svtools/inc/svtools/imagemgr.hrc +++ b/svtools/inc/svtools/imagemgr.hrc @@ -61,7 +61,6 @@ #define IMG_NETWORKDEV (IMAGELIST_START + 91) #define IMG_TABLE (IMAGELIST_START + 112) #define IMG_FOLDER (IMAGELIST_START + 113) -#define IMG_MACROLIB (IMAGELIST_START + 140) #define IMG_DXF (IMAGELIST_START + 141) #define IMG_MET (IMAGELIST_START + 142) #define IMG_PNG (IMAGELIST_START + 143) diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src index d1d25c8..7953fbd 100644 --- a/svtools/source/misc/imagemgr.src +++ b/svtools/source/misc/imagemgr.src @@ -40,7 +40,6 @@ IMG_MATH ; \ IMG_WRITER ; \ IMG_WRITERTEMPLATE ; \ - IMG_MACROLIB ; \ IMG_GLOBAL_DOC ; \ IMG_DRAW ; \ IMG_DRAWTEMPLATE ; \ @@ -94,7 +93,6 @@ IMG_WRITER ; \ IMG_WRITERTEMPLATE ; \ /* svx */ \ - IMG_MACROLIB ; \ IMG_NEWFROMTEMPLATE ; ImageList RID_SVTOOLS_IMAGELIST_BIG diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index f0dce63..962e854 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -262,7 +262,6 @@ #define SV_ICON_ID_DATABASE 14 #define SV_ICON_ID_FORMULA 15 #define SV_ICON_ID_TEMPLATE 16 -#define SV_ICON_ID_MACRO 17 #define SV_ICON_ID_PRINTERADMIN 501 #define HID_PRINTDLG HID_VCL_START diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src index 5f6dace..df3f93b 100644 --- a/vcl/source/src/images.src +++ b/vcl/source/src/images.src @@ -309,21 +309,6 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_TEMPLATE) File = "mainapp_16_8.png" ; }; -Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_MACRO) -{ - File = "mainapp_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_MACRO) -{ - File = "mainapp_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_MACRO) -{ - File = "mainapp_16_8.png" ; -}; - Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_PRINTERADMIN) { File = "printeradmin_48_8.png" ; @@ -482,16 +467,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_TEMPLATE) File = "sx03242.png" ; }; -Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_MACRO) -{ - File = "lx03216.png" ; -}; - -Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_MACRO) -{ - File = "sx03216.png" ; -}; - Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRINTERADMIN) { File = "printeradmin_32.png" ; commit f38e28e10683438c7822d0bbc2a7e585b78f195d Author: Julien Chaffraix <[email protected]> Date: Wed Nov 16 19:55:28 2011 -0800 Follow-up on SV_ICON_ID_HTML_DOCUMENT removal. Remove this entry now that we have removed the associated image from imagemgr.src. diff --git a/svtools/inc/svtools/imagemgr.hrc b/svtools/inc/svtools/imagemgr.hrc index 021cbe4..17c0175 100644 --- a/svtools/inc/svtools/imagemgr.hrc +++ b/svtools/inc/svtools/imagemgr.hrc @@ -36,7 +36,6 @@ #define IMG_BITMAP (IMAGELIST_START + 49) #define IMG_CALC (IMAGELIST_START + 50) #define IMG_CALCTEMPLATE (IMAGELIST_START + 51) -#define IMG_CHART (IMAGELIST_START + 52) #define IMG_DATABASE (IMAGELIST_START + 53) #define IMG_IMPRESSTEMPLATE (IMAGELIST_START + 54) #define IMG_GIF (IMAGELIST_START + 61) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
