dev/null |binary icon-themes/elementary/sd/res/sf01.png |binary icon-themes/elementary/sd/res/sf02.png |binary icon-themes/galaxy/sd/res/sf01.png |binary icon-themes/galaxy/sd/res/sf02.png |binary icon-themes/hicontrast/sd/res/sf01.png |binary icon-themes/hicontrast/sd/res/sf02.png |binary icon-themes/oxygen/sd/res/sf01.png |binary icon-themes/oxygen/sd/res/sf02.png |binary icon-themes/tango/sd/res/sf01.png |binary icon-themes/tango/sd/res/sf02.png |binary sd/source/ui/app/res_bmp.src | 14 +++++++------- sd/source/ui/app/sdmod2.cxx | 7 ++----- sd/source/ui/inc/res_bmp.hrc | 9 +++++---- 14 files changed, 14 insertions(+), 16 deletions(-)
New commits: commit 9b392338474ee266ff90c5c72cccea1b96ddbe45 Author: Caolán McNamara <[email protected]> Date: Mon Dec 5 17:01:56 2016 +0000 unwind sd RID_STYLEFAMILY_IMAGELIST imagelist Change-Id: I1096374eeada6a4ca2ba1acf9f094d6f6d80c3ad diff --git a/icon-themes/elementary/sd/imglst/sf01.png b/icon-themes/elementary/sd/res/sf01.png similarity index 100% rename from icon-themes/elementary/sd/imglst/sf01.png rename to icon-themes/elementary/sd/res/sf01.png diff --git a/icon-themes/elementary/sd/imglst/sf02.png b/icon-themes/elementary/sd/res/sf02.png similarity index 100% rename from icon-themes/elementary/sd/imglst/sf02.png rename to icon-themes/elementary/sd/res/sf02.png diff --git a/icon-themes/galaxy/sd/imglst/sf01.png b/icon-themes/galaxy/sd/res/sf01.png similarity index 100% rename from icon-themes/galaxy/sd/imglst/sf01.png rename to icon-themes/galaxy/sd/res/sf01.png diff --git a/icon-themes/galaxy/sd/imglst/sf02.png b/icon-themes/galaxy/sd/res/sf02.png similarity index 100% rename from icon-themes/galaxy/sd/imglst/sf02.png rename to icon-themes/galaxy/sd/res/sf02.png diff --git a/icon-themes/hicontrast/sd/imglst/sf01.png b/icon-themes/hicontrast/sd/res/sf01.png similarity index 100% rename from icon-themes/hicontrast/sd/imglst/sf01.png rename to icon-themes/hicontrast/sd/res/sf01.png diff --git a/icon-themes/hicontrast/sd/imglst/sf02.png b/icon-themes/hicontrast/sd/res/sf02.png similarity index 100% rename from icon-themes/hicontrast/sd/imglst/sf02.png rename to icon-themes/hicontrast/sd/res/sf02.png diff --git a/icon-themes/oxygen/sd/imglst/sf01.png b/icon-themes/oxygen/sd/res/sf01.png similarity index 100% rename from icon-themes/oxygen/sd/imglst/sf01.png rename to icon-themes/oxygen/sd/res/sf01.png diff --git a/icon-themes/oxygen/sd/imglst/sf02.png b/icon-themes/oxygen/sd/res/sf02.png similarity index 100% rename from icon-themes/oxygen/sd/imglst/sf02.png rename to icon-themes/oxygen/sd/res/sf02.png diff --git a/icon-themes/tango/sd/imglst/sf01.png b/icon-themes/tango/sd/res/sf01.png similarity index 100% rename from icon-themes/tango/sd/imglst/sf01.png rename to icon-themes/tango/sd/res/sf01.png diff --git a/icon-themes/tango/sd/imglst/sf02.png b/icon-themes/tango/sd/res/sf02.png similarity index 100% rename from icon-themes/tango/sd/imglst/sf02.png rename to icon-themes/tango/sd/res/sf02.png diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index dab95cb..d18a804 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 79af5b8..88b261a 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 733035f..dfa0f40 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: */
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
