diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-05 17:01:56 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-05 17:04:04 +0000 |
| commit | 9b392338474ee266ff90c5c72cccea1b96ddbe45 (patch) | |
| tree | 31fa95e7e6b82f5fa7dc60104d6f19f01e3b0760 /sd | |
| parent | 59a59de8beef6397370f050b4572da61b95e4d7c (diff) | |
unwind sd RID_STYLEFAMILY_IMAGELIST imagelist
Change-Id: I1096374eeada6a4ca2ba1acf9f094d6f6d80c3ad
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/app/res_bmp.src | 14 | ||||
| -rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 7 | ||||
| -rw-r--r-- | sd/source/ui/inc/res_bmp.hrc | 9 |
3 files changed, 14 insertions, 16 deletions
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index dab95cbfb89e..d18a804dbc4c 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -300,14 +300,14 @@ StringArray RID_PRESENTATIONSTYLEFAMILY }; }; -ImageList RID_STYLEFAMILY_IMAGELIST +Bitmap BMP_STYLES_FAMILY_GRAPHICS { - Prefix = "sf"; - IdList = - { - 1; 2; - }; - IdCount = 2; + File = "sf01.png" ; +}; + +Bitmap BMP_STYLES_FAMILY_PRESENTATIONS +{ + File = "sf02.png" ; }; Bitmap BMP_PRESOBJ_GRAPHIC diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 79af5b81f845..88b261a8fe60 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -804,17 +804,14 @@ SfxStyleFamilies* SdModule::CreateStyleFamilies() { SfxStyleFamilies *pStyleFamilies = new SfxStyleFamilies; - ImageList aEntryImages(SdResId(RID_STYLEFAMILY_IMAGELIST)); - - pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, SD_RESSTR(STR_GRAPHICS_STYLE_FAMILY), - aEntryImages.GetImage(1), + Image(BitmapEx(SdResId(BMP_STYLES_FAMILY_GRAPHICS))), SdResId(RID_GRAPHICSTYLEFAMILY))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo, SD_RESSTR(STR_PRESENTATIONS_STYLE_FAMILY), - aEntryImages.GetImage(2), + Image(BitmapEx(SdResId(BMP_STYLES_FAMILY_PRESENTATIONS))), SdResId(RID_PRESENTATIONSTYLEFAMILY))); return pStyleFamilies; diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index 733035fda567..dfa0f408a60a 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -208,10 +208,11 @@ #define RID_GRAPHICSTYLEFAMILY RID_APP_START+395 #define RID_PRESENTATIONSTYLEFAMILY RID_APP_START+396 -#define RID_STYLEFAMILY_IMAGELIST RID_APP_START+397 +#define BMP_STYLES_FAMILY_GRAPHICS RID_APP_START+397 +#define BMP_STYLES_FAMILY_PRESENTATIONS RID_APP_START+398 -#define IMG_EMBEDDED RID_APP_START+398 -#define IMG_LINK RID_APP_START+399 -#define IMG_HYPERLINK RID_APP_START+400 +#define IMG_EMBEDDED RID_APP_START+399 +#define IMG_LINK RID_APP_START+400 +#define IMG_HYPERLINK RID_APP_START+401 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |