remove obsolete img_s in list

2 files changed, 54 insertions, 98 deletions

diff --git a/svtools/inc/imagemgr.hrc b/svtools/inc/imagemgr.hrc
index 19cc2942d6f4..021cbe4c9ac8 100644
--- a/svtools/inc/imagemgr.hrc
+++ b/svtools/inc/imagemgr.hrc
@@ -33,58 +33,35 @@
 #define IMAGELIST_START                 3076  // must match to old Id's in SFX!
 
 #define IMG_IMPRESS                     (IMAGELIST_START + 47)
-#define IMG_WORKPLACE                   (IMAGELIST_START + 48)
 #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_EXCEL                       (IMAGELIST_START + 55)
-#define IMG_EXCELTEMPLATE               (IMAGELIST_START + 56)
-#define IMG_FTPSERVER                   (IMAGELIST_START + 58)
-#define IMG_GALLERY                     (IMAGELIST_START + 59)
-#define IMG_GALLERYTHEME                (IMAGELIST_START + 60)
 #define IMG_GIF                         (IMAGELIST_START + 61)
 #define IMG_HELP                        (IMAGELIST_START + 62)
 #define IMG_HTML                        (IMAGELIST_START + 63)
 #define IMG_JPG                         (IMAGELIST_START + 64)
-#define IMG_LINK                        (IMAGELIST_START + 65)
-#define IMG_LOTUS                       (IMAGELIST_START + 66)
 #define IMG_MATH                        (IMAGELIST_START + 68)
 #define IMG_MATHTEMPLATE                (IMAGELIST_START + 69)
 #define IMG_FILE                        (IMAGELIST_START + 74)
-#define IMG_APP                         (IMAGELIST_START + 75)
 #define IMG_PCD                         (IMAGELIST_START + 76)
 #define IMG_PCT                         (IMAGELIST_START + 77)
 #define IMG_PCX                         (IMAGELIST_START + 78)
 #define IMG_SIM                         (IMAGELIST_START + 79)
 #define IMG_TEXTFILE                    (IMAGELIST_START + 80)
-#define IMG_SVHELP                      (IMAGELIST_START + 81)
 #define IMG_TIFF                        (IMAGELIST_START + 82)
 #define IMG_URL                         (IMAGELIST_START + 83)
 #define IMG_WMF                         (IMAGELIST_START + 84)
-#define IMG_WORD                        (IMAGELIST_START + 85)
 #define IMG_WRITER                      (IMAGELIST_START + 86)
 #define IMG_WRITERTEMPLATE              (IMAGELIST_START + 87)
 #define IMG_FIXEDDEV                    (IMAGELIST_START + 88)
 #define IMG_REMOVEABLEDEV               (IMAGELIST_START + 89)
 #define IMG_CDROMDEV                    (IMAGELIST_START + 90)
 #define IMG_NETWORKDEV                  (IMAGELIST_START + 91)
-#define IMG_RAMDEV                      (IMAGELIST_START + 92)
-#define IMG_TABLEFOLDER                 (IMAGELIST_START + 111)
 #define IMG_TABLE                       (IMAGELIST_START + 112)
 #define IMG_FOLDER                      (IMAGELIST_START + 113)
-#define IMG_EXPANDEDFOLDER              (IMAGELIST_START + 114)
-#define IMG_XXX                         (IMAGELIST_START + 117)
-#define IMG_GALLERYIMPORT               (IMAGELIST_START + 122)
-#define IMG_QUERYFOLDER                 (IMAGELIST_START + 125)
-#define IMG_QUERY                       (IMAGELIST_START + 126)
-#define IMG_FORM                        (IMAGELIST_START + 127)
-#define IMG_FORMFOLDER                  (IMAGELIST_START + 128)
-#define IMG_REPORT                      (IMAGELIST_START + 129)
-#define IMG_REPORTFOLDER                (IMAGELIST_START + 130)
-#define IMG_OTHERS                      (IMAGELIST_START + 138)
 #define IMG_MACROLIB                    (IMAGELIST_START + 140)
 #define IMG_DXF                         (IMAGELIST_START + 141)
 #define IMG_MET                         (IMAGELIST_START + 142)
@@ -95,13 +72,7 @@
 #define IMG_GLOBAL_DOC                  (IMAGELIST_START + 150)
 #define IMG_DRAW                        (IMAGELIST_START + 151)
 #define IMG_DRAWTEMPLATE                (IMAGELIST_START + 152)
-#define IMG_TASK                        (IMAGELIST_START + 160)
-#define IMG_APPOINTMENT                 (IMAGELIST_START + 161)
-#define IMG_RELATION                    (IMAGELIST_START + 163)
-#define IMG_IMPRESSPACKED               (IMAGELIST_START + 165)
 #define IMG_NEWFROMTEMPLATE             (IMAGELIST_START + 166)
-#define IMG_POWERPOINT                  (IMAGELIST_START + 167)
-#define IMG_POWERPOINTTEMPLATE          (IMAGELIST_START + 168)
 #define IMG_OO_DATABASE_DOC             (IMAGELIST_START + 169)
 #define IMG_OO_DRAW_DOC                 (IMAGELIST_START + 170)
 #define IMG_OO_MATH_DOC                 (IMAGELIST_START + 171)
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index 723de62cc618..3099d5b6ea8a 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -32,74 +32,60 @@
  // images ********************************************************************
 
 #define X_IMAGE_LIST \
-        IMG_WORKPLACE ; \
-        IMG_BITMAP ; \
-        IMG_EXCEL ; \
-        IMG_EXCELTEMPLATE ; \
-        IMG_FTPSERVER ; \
-        IMG_GALLERY ; \
-        IMG_GALLERYTHEME ; \
-        IMG_GIF ; \
-        IMG_HELP ; \
-        IMG_HTML ; \
-        IMG_JPG ; \
-        IMG_LINK ; \
-        IMG_LOTUS ; \
-        IMG_MATHTEMPLATE ; \
-        IMG_FILE ; \
-        IMG_APP ; \
-        IMG_PCD ; \
-        IMG_PCT ; \
-        IMG_PCX ; \
-        IMG_SIM ; \
-        IMG_TEXTFILE ; \
-        IMG_SVHELP ; \
-        IMG_TIFF ; \
-        IMG_URL ; \
-        IMG_WMF ; \
-        IMG_WORD ; \
-        IMG_FIXEDDEV ; \
-        IMG_REMOVEABLEDEV ; \
-        IMG_CDROMDEV ; \
-        IMG_NETWORKDEV ; \
-        IMG_RAMDEV ; \
-        IMG_TABLEFOLDER ; \
-        IMG_TABLE ; \
-        IMG_FOLDER ; \
-        IMG_EXPANDEDFOLDER ; \
-        IMG_XXX ; \
-        IMG_GALLERYIMPORT ; \
-        IMG_QUERYFOLDER ; \
-        IMG_QUERY ; \
-        IMG_FORM ; \
-        IMG_FORMFOLDER ; \
-        IMG_REPORT ; \
-        IMG_REPORTFOLDER ; \
-        IMG_OTHERS ; \
-        IMG_DXF ; \
-        IMG_MET ; \
-        IMG_PNG ; \
-        IMG_SGF ; \
-        IMG_SGV ; \
-        IMG_SVM ; \
-        IMG_TASK ; \
-        IMG_APPOINTMENT ; \
-        IMG_RELATION ; \
-        IMG_IMPRESSPACKED ; \
-        IMG_POWERPOINT ; \
-        IMG_POWERPOINTTEMPLATE ; \
-        IMG_OO_DATABASE_DOC ; \
-        IMG_OO_DRAW_DOC ; \
-        IMG_OO_MATH_DOC ; \
-        IMG_OO_GLOBAL_DOC ; \
-        IMG_OO_IMPRESS_DOC ; \
-        IMG_OO_CALC_DOC ; \
-        IMG_OO_WRITER_DOC ; \
-        IMG_OO_DRAW_TEMPLATE ; \
-        IMG_OO_IMPRESS_TEMPLATE ; \
-        IMG_OO_CALC_TEMPLATE ; \
-        IMG_OO_WRITER_TEMPLATE ; \
-        IMG_EXTENSION ;
+    IMG_BITMAP ; \
+    IMG_CALC ; \
+    IMG_CALCTEMPLATE ; \
+    IMG_CDROMDEV ; \
+    IMG_CHART ; \
+    IMG_DATABASE ; \
+    IMG_DRAW ; \
+    IMG_DRAWTEMPLATE ; \
+    IMG_DXF ; \
+    IMG_EXTENSION ; \
+    IMG_FILE ; \
+    IMG_FIXEDDEV ; \
+    IMG_FOLDER ; \
+    IMG_GIF ; \
+    IMG_GLOBAL_DOC ; \
+    IMG_HTML ; \
+    IMG_IMPRESS ; \
+    IMG_IMPRESSTEMPLATE ; \
+    IMG_JPG ; \
+    IMG_MATH ; \
+    IMG_MATHTEMPLATE ; \
+    IMG_MET ; \
+    IMG_NETWORKDEV ; \
+    IMG_OO_CALC_DOC ; \
+    IMG_OO_CALC_TEMPLATE ; \
+    IMG_OO_DATABASE_DOC ; \
+    IMG_OO_DRAW_DOC ; \
+    IMG_OO_DRAW_TEMPLATE ; \
+    IMG_OO_GLOBAL_DOC ; \
+    IMG_OO_IMPRESS_DOC ; \
+    IMG_OO_IMPRESS_TEMPLATE ; \
+    IMG_OO_MATH_DOC ; \
+    IMG_OO_WRITER_DOC ; \
+    IMG_OO_WRITER_TEMPLATE ; \
+    IMG_PCD ; \
+    IMG_PCT ; \
+    IMG_PCX ; \
+    IMG_PNG ; \
+    IMG_REMOVEABLEDEV ; \
+    IMG_SGF ; \
+    IMG_SGV ; \
+    IMG_SIM ; \
+    IMG_SVM ; \
+    IMG_SVT_FOLDER ; \
+    IMG_TABLE ; \
+    IMG_TEXTFILE ; \
+    IMG_TIFF ; \
+    IMG_URL ; \
+    IMG_WMF ; \
+    IMG_WRITER ; \
+    IMG_WRITERTEMPLATE ; \
+    /* svx */ \
+    IMG_MACROLIB ; \
+    IMG_NEWFROMTEMPLATE ;
 
 ImageList RID_SVTOOLS_IMAGELIST_BIG
 {
@@ -425,7 +411,6 @@ String STR_DESCRIPTION_OO_WRITER_TEMPLATE
 {
     Text [ en-US ] = "OpenDocument Text Template" ;
 };
-
 String STR_DESCRIPTION_EXTENSION
 {
     Text [ en-US ] = "%PRODUCTNAME Extension" ;