diff options
-rw-r--r-- | icon-themes/elementary/sd/res/sf01.png (renamed from icon-themes/elementary/sd/imglst/sf01.png) | bin | 418 -> 418 bytes | |||
-rw-r--r-- | icon-themes/elementary/sd/res/sf02.png (renamed from icon-themes/elementary/sd/imglst/sf02.png) | bin | 488 -> 488 bytes | |||
-rw-r--r-- | icon-themes/galaxy/sd/res/sf01.png (renamed from icon-themes/galaxy/sd/imglst/sf01.png) | bin | 421 -> 421 bytes | |||
-rw-r--r-- | icon-themes/galaxy/sd/res/sf02.png (renamed from icon-themes/galaxy/sd/imglst/sf02.png) | bin | 438 -> 438 bytes | |||
-rw-r--r-- | icon-themes/hicontrast/sd/res/sf01.png (renamed from icon-themes/hicontrast/sd/imglst/sf01.png) | bin | 149 -> 149 bytes | |||
-rw-r--r-- | icon-themes/hicontrast/sd/res/sf02.png (renamed from icon-themes/hicontrast/sd/imglst/sf02.png) | bin | 144 -> 144 bytes | |||
-rw-r--r-- | icon-themes/oxygen/sd/res/sf01.png (renamed from icon-themes/oxygen/sd/imglst/sf01.png) | bin | 240 -> 240 bytes | |||
-rw-r--r-- | icon-themes/oxygen/sd/res/sf02.png (renamed from icon-themes/oxygen/sd/imglst/sf02.png) | bin | 427 -> 427 bytes | |||
-rw-r--r-- | icon-themes/tango/sd/res/sf01.png (renamed from icon-themes/tango/sd/imglst/sf01.png) | bin | 773 -> 773 bytes | |||
-rw-r--r-- | icon-themes/tango/sd/res/sf02.png (renamed from icon-themes/tango/sd/imglst/sf02.png) | bin | 714 -> 714 bytes | |||
-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 |
13 files changed, 14 insertions, 16 deletions
diff --git a/icon-themes/elementary/sd/imglst/sf01.png b/icon-themes/elementary/sd/res/sf01.png Binary files differindex 97e111858d43..97e111858d43 100644 --- a/icon-themes/elementary/sd/imglst/sf01.png +++ b/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 Binary files differindex 60029c3a58d2..60029c3a58d2 100644 --- a/icon-themes/elementary/sd/imglst/sf02.png +++ b/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 Binary files differindex 83bcfde38c6c..83bcfde38c6c 100644 --- a/icon-themes/galaxy/sd/imglst/sf01.png +++ b/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 Binary files differindex 81f3e1fa0ab7..81f3e1fa0ab7 100644 --- a/icon-themes/galaxy/sd/imglst/sf02.png +++ b/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 Binary files differindex 3d3c180aef52..3d3c180aef52 100644 --- a/icon-themes/hicontrast/sd/imglst/sf01.png +++ b/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 Binary files differindex 2c992a49ed2d..2c992a49ed2d 100644 --- a/icon-themes/hicontrast/sd/imglst/sf02.png +++ b/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 Binary files differindex 7478614825b5..7478614825b5 100644 --- a/icon-themes/oxygen/sd/imglst/sf01.png +++ b/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 Binary files differindex 047b32699f09..047b32699f09 100644 --- a/icon-themes/oxygen/sd/imglst/sf02.png +++ b/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 Binary files differindex d541380d312a..d541380d312a 100644 --- a/icon-themes/tango/sd/imglst/sf01.png +++ b/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 Binary files differindex ca3e6424b095..ca3e6424b095 100644 --- a/icon-themes/tango/sd/imglst/sf02.png +++ b/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 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: */ |