diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-05 17:08:08 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-05 17:08:08 +0000 |
| commit | e7a3a9104a4ab5709583b7506b0bd10ec6163fba (patch) | |
| tree | 1ef92b98a8052c202c08d9eb185496e02eb8f734 | |
| parent | 9b392338474ee266ff90c5c72cccea1b96ddbe45 (diff) | |
unwind sc RID_STYLEFAMILY_IMAGELIST imagelist
Change-Id: I22bc4a615295bf43110633e22b5884b511777c2b
| -rw-r--r-- | sc/inc/sc.hrc | 3 | ||||
| -rw-r--r-- | sc/source/ui/app/scmod.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/styleui/scstyles.src | 12 |
3 files changed, 11 insertions, 10 deletions
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 64ae387c84e3..d5b87c4a2f0e 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1093,7 +1093,8 @@ #define RID_CELLSTYLEFAMILY (SC_DIALOGS_START + 138) #define RID_PAGESTYLEFAMILY (SC_DIALOGS_START + 139) -#define RID_STYLEFAMILY_IMAGELIST (SC_DIALOGS_START + 140) +#define BMP_STYLES_FAMILY_CELL (SC_DIALOGS_START + 140) +#define BMP_STYLES_FAMILY_PAGE (SC_DIALOGS_START + 141) #define RID_POPUP_FILTER (SC_DIALOGS_START + 153) diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 99e59de5383f..ff0b4c951a29 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2274,16 +2274,14 @@ SfxStyleFamilies* ScModule::CreateStyleFamilies() { SfxStyleFamilies *pStyleFamilies = new SfxStyleFamilies; - ImageList aEntryImages(ScResId(RID_STYLEFAMILY_IMAGELIST)); - pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, ScGlobal::GetRscString(STR_STYLE_FAMILY_CELL), - aEntryImages.GetImage(1), + Image(BitmapEx(ScResId(BMP_STYLES_FAMILY_CELL))), ScResId(RID_CELLSTYLEFAMILY))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page, ScGlobal::GetRscString(STR_STYLE_FAMILY_PAGE), - aEntryImages.GetImage(2), + Image(BitmapEx(ScResId(BMP_STYLES_FAMILY_PAGE))), ScResId(RID_PAGESTYLEFAMILY))); return pStyleFamilies; diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src index 2502ceef27c2..60f304bbbda2 100644 --- a/sc/source/ui/styleui/scstyles.src +++ b/sc/source/ui/styleui/scstyles.src @@ -41,12 +41,14 @@ StringArray RID_PAGESTYLEFAMILY }; }; -// style family images are now taken from an ImageList -// (for each family, there's one entry in the IdList) -ImageList RID_STYLEFAMILY_IMAGELIST +Bitmap BMP_STYLES_FAMILY_CELL { - Prefix = "sf"; - IdList = { 1; 2; }; + File = "sf01.png"; +}; + +Bitmap BMP_STYLES_FAMILY_PAGE +{ + File = "sf02.png"; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |