remove sfx2 bitmaps from .src files

Change-Id: Ibc4261af5f479badd281211e467d2c7b524af3f3

2 files changed, 79 insertions, 56 deletions

diff --git a/sfx2/inc/bitmaps.hlst b/sfx2/inc/bitmaps.hlst
index d6fb2f3416cc..c420ba89bd78 100644
--- a/sfx2/inc/bitmaps.hlst
+++ b/sfx2/inc/bitmaps.hlst
@@ -10,58 +10,89 @@
 #ifndef INCLUDED_SFX2_INC_BITMAPS_HRC
 #define INCLUDED_SFX2_INC_BITMAPS_HRC
 
-#define BMP_HELP_TOOLBOX_INDEX_ON       "sfx2/res/indexon_small.png"
-#define BMP_HELP_TOOLBOX_INDEX_OFF      "sfx2/res/indexoff_small.png"
-#define BMP_HELP_TOOLBOX_START          "res/sc06303.png"
-#define BMP_HELP_TOOLBOX_PREV           "res/sc06301.png"
-#define BMP_HELP_TOOLBOX_NEXT           "res/sc06300.png"
-#define BMP_HELP_TOOLBOX_PRINT          "res/sc05504.png"
-#define BMP_HELP_TOOLBOX_BOOKMARKS      "sfx2/res/favourite.png"
-#define BMP_HELP_TOOLBOX_SEARCHDIALOG   "sfx2/res/sc05961.png"
-#define BMP_HELP_TOOLBOX_COPY           "sfx2/res/sc05711.png"
-#define BMP_HELP_CONTENT_BOOK_OPEN      "sfx2/res/hlpbookopen.png"
-#define BMP_HELP_CONTENT_BOOK_CLOSED    "sfx2/res/hlpbookclosed.png"
-#define BMP_HELP_CONTENT_DOC            "sfx2/res/hlpdoc.png"
-#define BMP_HELP_TOOLBOX_L_INDEX_ON     "sfx2/res/indexon_big.png"
-#define BMP_HELP_TOOLBOX_L_INDEX_OFF    "sfx2/res/indexoff_big.png"
-#define BMP_HELP_TOOLBOX_L_START        "res/lc06303.png"
-#define BMP_HELP_TOOLBOX_L_PREV         "res/lc06301.png"
-#define BMP_HELP_TOOLBOX_L_NEXT         "res/lc06300.png"
-#define BMP_HELP_TOOLBOX_L_PRINT        "res/lc05504.png"
-#define BMP_HELP_TOOLBOX_L_BOOKMARKS    "sfx2/res/favourite_big.png"
-#define BMP_HELP_TOOLBOX_L_SEARCHDIALOG "res/lc05961.png"
+#define BMP_HELP_TOOLBOX_INDEX_ON           "sfx2/res/indexon_small.png"
+#define BMP_HELP_TOOLBOX_INDEX_OFF          "sfx2/res/indexoff_small.png"
+#define BMP_HELP_TOOLBOX_START              "res/sc06303.png"
+#define BMP_HELP_TOOLBOX_PREV               "res/sc06301.png"
+#define BMP_HELP_TOOLBOX_NEXT               "res/sc06300.png"
+#define BMP_HELP_TOOLBOX_PRINT              "res/sc05504.png"
+#define BMP_HELP_TOOLBOX_BOOKMARKS          "sfx2/res/favourite.png"
+#define BMP_HELP_TOOLBOX_SEARCHDIALOG       "sfx2/res/sc05961.png"
+#define BMP_HELP_TOOLBOX_COPY               "sfx2/res/sc05711.png"
+#define BMP_HELP_CONTENT_BOOK_OPEN          "sfx2/res/hlpbookopen.png"
+#define BMP_HELP_CONTENT_BOOK_CLOSED        "sfx2/res/hlpbookclosed.png"
+#define BMP_HELP_CONTENT_DOC                "sfx2/res/hlpdoc.png"
+#define BMP_HELP_TOOLBOX_L_INDEX_ON         "sfx2/res/indexon_big.png"
+#define BMP_HELP_TOOLBOX_L_INDEX_OFF        "sfx2/res/indexoff_big.png"
+#define BMP_HELP_TOOLBOX_L_START            "res/lc06303.png"
+#define BMP_HELP_TOOLBOX_L_PREV             "res/lc06301.png"
+#define BMP_HELP_TOOLBOX_L_NEXT             "res/lc06300.png"
+#define BMP_HELP_TOOLBOX_L_PRINT            "res/lc05504.png"
+#define BMP_HELP_TOOLBOX_L_BOOKMARKS        "sfx2/res/favourite_big.png"
+#define BMP_HELP_TOOLBOX_L_SEARCHDIALOG     "res/lc05961.png"
 
 //start, sfx2/source/sidebar/Theme.cxx
-#define CLOSEDOC                       "sfx2/res/closedoc.png"
-#define GRIP                           "sfx2/res/grip.png"
-#define OPEN_MORE                      "sfx2/res/symphony/open_more.png"
-#define MOREBUTTON                     "sfx2/res/symphony/morebutton.png"
-#define SIDEBAR_3D_LARGE               "sfx2/res/symphony/sidebar-3d-large.png"
-#define SIDEBAR_3D_SMALL               "sfx2/res/symphony/sidebar-3d-small.png"
-#define SIDEBAR_ANIMATION_LARGE        "sfx2/res/symphony/sidebar-animation-large.png"
-#define SIDEBAR_ANIMATION_SMALL        "sfx2/res/symphony/sidebar-animation-small.png"
-#define SIDEBAR_COLORS_LARGE           "sfx2/res/symphony/sidebar-colors-large.png"
-#define SIDEBAR_COLORS_SMALL           "sfx2/res/symphony/sidebar-colors-small.png"
-#define SIDEBAR_EYEDROPPER_LARGE       "sfx2/res/symphony/sidebar-eyedropper-large.png"
-#define SIDEBAR_EYEDROPPER_SMALL       "sfx2/res/symphony/sidebar-eyedropper-small.png"
-#define SIDEBAR_GALLERY_LARGE          "sfx2/res/symphony/sidebar-gallery-large.png"
-#define SIDEBAR_GALLERY_SMALL          "sfx2/res/symphony/sidebar-gallery-small.png"
-#define SIDEBAR_IMGANIM_LARGE          "sfx2/res/symphony/sidebar-imganim-large.png"
-#define SIDEBAR_IMGANIM_SMALL          "sfx2/res/symphony/sidebar-imganim-small.png"
-#define SIDEBAR_NAVIGATOR_LARGE        "sfx2/res/symphony/sidebar-navigator-large.png"
-#define SIDEBAR_NAVIGATOR_SMALL        "sfx2/res/symphony/sidebar-navigator-small.png"
-#define SIDEBAR_PROPERTY_LARGE         "sfx2/res/symphony/sidebar-property-large.png"
-#define SIDEBAR_PROPERTY_SMALL         "sfx2/res/symphony/sidebar-property-small.png"
-#define SIDEBAR_STYLE_LARGE            "sfx2/res/symphony/sidebar-style-large.png"
-#define SIDEBAR_STYLE_SMALL            "sfx2/res/symphony/sidebar-style-small.png"
-#define SIDEBAR_TEMPLATE_LARGE         "sfx2/res/symphony/sidebar-template-large.png"
-#define SIDEBAR_TEMPLATE_SMALL         "sfx2/res/symphony/sidebar-template-small.png"
-#define SIDEBAR_TRANSITION_LARGE       "sfx2/res/symphony/sidebar-transition-large.png"
-#define SIDEBAR_TRANSITION_SMALL       "sfx2/res/symphony/sidebar-transition-small.png"
-#define SIDEBAR_FUNCTIONS_LARGE        "sfx2/res/symphony/sidebar-functions-large.png"
-#define SIDEBAR_FUNCTIONS_SMALL        "sfx2/res/symphony/sidebar-functions-small.png"
+#define CLOSEDOC                            "sfx2/res/closedoc.png"
+#define GRIP                                "sfx2/res/grip.png"
+#define OPEN_MORE                           "sfx2/res/symphony/open_more.png"
+#define MOREBUTTON                          "sfx2/res/symphony/morebutton.png"
+#define SIDEBAR_3D_LARGE                    "sfx2/res/symphony/sidebar-3d-large.png"
+#define SIDEBAR_3D_SMALL                    "sfx2/res/symphony/sidebar-3d-small.png"
+#define SIDEBAR_ANIMATION_LARGE             "sfx2/res/symphony/sidebar-animation-large.png"
+#define SIDEBAR_ANIMATION_SMALL             "sfx2/res/symphony/sidebar-animation-small.png"
+#define SIDEBAR_COLORS_LARGE                "sfx2/res/symphony/sidebar-colors-large.png"
+#define SIDEBAR_COLORS_SMALL                "sfx2/res/symphony/sidebar-colors-small.png"
+#define SIDEBAR_EYEDROPPER_LARGE            "sfx2/res/symphony/sidebar-eyedropper-large.png"
+#define SIDEBAR_EYEDROPPER_SMALL            "sfx2/res/symphony/sidebar-eyedropper-small.png"
+#define SIDEBAR_GALLERY_LARGE               "sfx2/res/symphony/sidebar-gallery-large.png"
+#define SIDEBAR_GALLERY_SMALL               "sfx2/res/symphony/sidebar-gallery-small.png"
+#define SIDEBAR_IMGANIM_LARGE               "sfx2/res/symphony/sidebar-imganim-large.png"
+#define SIDEBAR_IMGANIM_SMALL               "sfx2/res/symphony/sidebar-imganim-small.png"
+#define SIDEBAR_NAVIGATOR_LARGE             "sfx2/res/symphony/sidebar-navigator-large.png"
+#define SIDEBAR_NAVIGATOR_SMALL             "sfx2/res/symphony/sidebar-navigator-small.png"
+#define SIDEBAR_PROPERTY_LARGE              "sfx2/res/symphony/sidebar-property-large.png"
+#define SIDEBAR_PROPERTY_SMALL              "sfx2/res/symphony/sidebar-property-small.png"
+#define SIDEBAR_STYLE_LARGE                 "sfx2/res/symphony/sidebar-style-large.png"
+#define SIDEBAR_STYLE_SMALL                 "sfx2/res/symphony/sidebar-style-small.png"
+#define SIDEBAR_TEMPLATE_LARGE              "sfx2/res/symphony/sidebar-template-large.png"
+#define SIDEBAR_TEMPLATE_SMALL              "sfx2/res/symphony/sidebar-template-small.png"
+#define SIDEBAR_TRANSITION_LARGE            "sfx2/res/symphony/sidebar-transition-large.png"
+#define SIDEBAR_TRANSITION_SMALL            "sfx2/res/symphony/sidebar-transition-small.png"
+#define SIDEBAR_FUNCTIONS_LARGE             "sfx2/res/symphony/sidebar-functions-large.png"
+#define SIDEBAR_FUNCTIONS_SMALL             "sfx2/res/symphony/sidebar-functions-small.png"
 //end, sfx2/source/sidebar/Theme.cxx
 
+#define SFX_THUMBNAIL_TEXT                  "res/ott_96_8.png"
+#define SFX_THUMBNAIL_SHEET                 "res/ots_96_8.png"
+#define SFX_THUMBNAIL_PRESENTATION          "res/otp_96_8.png"
+#define SFX_THUMBNAIL_DRAWING               "res/otg_96_8.png"
+#define SFX_FILE_THUMBNAIL_TEXT             "res/writer128.png"
+#define SFX_FILE_THUMBNAIL_SHEET            "res/calc128.png"
+#define SFX_FILE_THUMBNAIL_PRESENTATION     "res/impress128.png"
+#define SFX_FILE_THUMBNAIL_DRAWING          "res/draw128.png"
+#define SFX_FILE_THUMBNAIL_DATABASE         "res/base128.png"
+#define SFX_FILE_THUMBNAIL_MATH             "res/math128.png"
+#define SFX_FILE_THUMBNAIL_DEFAULT          "res/main128.png"
+
+#define BMP_WELCOME                         "sfx2/res/logo.png"
+#define BMP_RECENTDOC_REMOVE                "res/recentdoc_remove.png"
+#define BMP_RECENTDOC_REMOVE_HIGHLIGHTED    "res/recentdoc_remove_highlighted.png"
+#define BMP_DEFAULT                         "res/templatestar.png"
+#define BMP_ACTION_REFRESH                  "res/reload.png"
+
+#define BMP_128X128_CALC_DOC                "sfx2/res/128x128_calc_doc-p.png"
+#define BMP_128X128_DRAW_DOC                "sfx2/res/128x128_draw_doc-p.png"
+#define BMP_128X128_IMPRESS_DOC             "sfx2/res/128x128_impress_doc-p.png"
+#define BMP_128X128_MATH_DOC                "sfx2/res/128x128_math_doc-p.png"
+#define BMP_128X128_WRITER_DOC              "sfx2/res/128x128_writer_doc-p.png"
+
+#define SFX_BMP_PROPERTY_REMOVE             "sfx2/res/deleterow.png"
+#define SFX_BMP_CLOSE_DOC                   "sfx2/res/closedoc.png"
+
+#define RID_SFXBMP_WATERCAN                 "res/sc05554.png"
+#define RID_SFXBMP_NEW_BY_EXAMPLE           "res/sc05555.png"
+#define RID_SFXBMP_UPDATE_BY_EXAMPLE        "res/sc05556.png"
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sfx2/inc/doc.hrc b/sfx2/inc/doc.hrc
index 1faf84e21c01..f6ae529b83df 100644
--- a/sfx2/inc/doc.hrc
+++ b/sfx2/inc/doc.hrc
@@ -55,13 +55,6 @@
 
 #define STR_LABEL_FILEFORMAT                (RID_SFX_DOC_START+96)
 
-// some icons are commented out since they are removed
-#define BMP_128X128_CALC_DOC                (RID_SFX_DOC_START+99)
-#define BMP_128X128_DRAW_DOC                (RID_SFX_DOC_START+102)
-#define BMP_128X128_IMPRESS_DOC             (RID_SFX_DOC_START+104)
-#define BMP_128X128_MATH_DOC                (RID_SFX_DOC_START+107)
-#define BMP_128X128_WRITER_DOC              (RID_SFX_DOC_START+108)
-
 #define STR_HIDDENINFO_CONTAINS             (RID_SFX_DOC_START+110)
 #define STR_HIDDENINFO_RECORDCHANGES        (RID_SFX_DOC_START+111)
 #define STR_HIDDENINFO_NOTES                (RID_SFX_DOC_START+112)
@@ -91,7 +84,6 @@
 #define STR_QMSG_SEL_FOLDER_DELETE          (RID_SFX_DOC_START+146)
 #define STR_QMSG_TEMPLATE_OVERWRITE         (RID_SFX_DOC_START+147)
 #define STR_QMSG_SEL_TEMPLATE_DELETE        (RID_SFX_DOC_START+148)
-#define BMP_ACTION_REFRESH                  (RID_SFX_DOC_START+150)
 
 #define STR_OPEN                            (RID_SFX_DOC_START+151)
 #define STR_EDIT_TEMPLATE                   (RID_SFX_DOC_START+152)