unwind RID_STYLEFAMILY_IMAGELIST imagelist

Change-Id: I03f4058114bb837c3d8edd25791464e7d7ba16ed

3 files changed, 45 insertions, 19 deletions

diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 2796e9c32e16..8e1dd67829eb 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -171,18 +171,41 @@ StringArray RID_TABLESTYLEFAMILY
     };
 };
 
-ImageList RID_STYLEFAMILY_IMAGELIST
+Bitmap BMP_STYLES_FAMILY_PARA
 {
-    Prefix = "sf";
-    IdList =
-    {
-        1; 2; 3; 4; 5; 6;
-    };
-    IdCount = 6;
+    File = "sf01.png" ;
+};
+
+Bitmap BMP_STYLES_FAMILY_CHAR
+{
+    File = "sf02.png" ;
+};
+
+Bitmap BMP_STYLES_FAMILY_FRAME
+{
+    File = "sf03.png" ;
+};
+
+Bitmap BMP_STYLES_FAMILY_PAGE
+{
+    File = "sf04.png" ;
+};
+
+Bitmap BMP_STYLES_FAMILY_LIST
+{
+    File = "sf05.png" ;
+};
+
+Bitmap BMP_STYLES_FAMILY_TABLE
+{
+    File = "sf06.png" ;
 };
 
 // Bitmap for the NumberingTemplates in the Organizer
-Bitmap BMP_STYLES_FAMILY_NUM { File = "styfamnu.bmp" ; };
+Bitmap BMP_STYLES_FAMILY_NUM
+{
+    File = "styfamnu.bmp" ;
+};
 
 String STR_ENV_TITLE
 {
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index b43c8fd01756..de6a73848e96 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -401,36 +401,34 @@ SfxStyleFamilies* SwModule::CreateStyleFamilies()
 {
     SfxStyleFamilies *pStyleFamilies = new SfxStyleFamilies;
 
-    ImageList aEntryImages(SW_RES(RID_STYLEFAMILY_IMAGELIST));
-
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para,
                                                     SW_RESSTR(STR_PARAGRAPHSTYLEFAMILY),
-                                                    aEntryImages.GetImage(1),
+                                                    Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_PARA))),
                                                     SW_RES(RID_PARAGRAPHSTYLEFAMILY)));
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Char,
                                                     SW_RESSTR(STR_CHARACTERSTYLEFAMILY),
-                                                    aEntryImages.GetImage(2),
+                                                    Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_CHAR))),
                                                     SW_RES(RID_CHARACTERSTYLEFAMILY)));
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Frame,
                                                     SW_RESSTR(STR_FRAMESTYLEFAMILY),
-                                                    aEntryImages.GetImage(3),
+                                                    Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_FRAME))),
                                                     SW_RES(RID_FRAMESTYLEFAMILY)));
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page,
                                                     SW_RESSTR(STR_PAGESTYLEFAMILY),
-                                                    aEntryImages.GetImage(4),
+                                                    Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_PAGE))),
                                                     SW_RES(RID_PAGESTYLEFAMILY)));
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo,
                                                     SW_RESSTR(STR_LISTSTYLEFAMILY),
-                                                    aEntryImages.GetImage(5),
+                                                    Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_LIST))),
                                                     SW_RES(RID_LISTSTYLEFAMILY)));
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Table,
                                                     SW_RESSTR(STR_TABLESTYLEFAMILY),
-                                                    aEntryImages.GetImage(6),
+                                                    Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_TABLE))),
                                                     SW_RES(RID_TABLESTYLEFAMILY)));
 
     return pStyleFamilies;
diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc
index d39e4d53df71..915e64a3b860 100644
--- a/sw/source/uibase/inc/app.hrc
+++ b/sw/source/uibase/inc/app.hrc
@@ -104,9 +104,14 @@
 #define RID_PAGESTYLEFAMILY             (RC_APP_BEGIN + 149)
 #define RID_LISTSTYLEFAMILY             (RC_APP_BEGIN + 150)
 #define RID_TABLESTYLEFAMILY            (RC_APP_BEGIN + 151)
-#define RID_STYLEFAMILY_IMAGELIST       (RC_APP_BEGIN + 152)
-
-#define APP_ACT_END                RID_STYLEFAMILY_IMAGELIST
+#define BMP_STYLES_FAMILY_PARA          (RC_APP_BEGIN + 152)
+#define BMP_STYLES_FAMILY_CHAR          (RC_APP_BEGIN + 153)
+#define BMP_STYLES_FAMILY_FRAME         (RC_APP_BEGIN + 154)
+#define BMP_STYLES_FAMILY_PAGE          (RC_APP_BEGIN + 155)
+#define BMP_STYLES_FAMILY_LIST          (RC_APP_BEGIN + 156)
+#define BMP_STYLES_FAMILY_TABLE         (RC_APP_BEGIN + 157)
+
+#define APP_ACT_END                  BMP_STYLES_FAMILY_TABLE
 
 #if APP_ACT_END > RC_APP_END
 #error Resource-Id Ueberlauf in #file, #line