unwind RID_STYLEFAMILY_IMAGELIST imagelist

Change-Id: I03f4058114bb837c3d8edd25791464e7d7ba16ed

41 files changed, 45 insertions, 19 deletions

diff --git a/icon-themes/elementary/sw/imglst/sf01.png b/icon-themes/elementary/sw/res/sf01.png
index fbf12c6ae5d2..fbf12c6ae5d2 100644
--- a/icon-themes/elementary/sw/imglst/sf01.png
+++ b/icon-themes/elementary/sw/res/sf01.png
diff --git a/icon-themes/elementary/sw/imglst/sf02.png b/icon-themes/elementary/sw/res/sf02.png
index d8703f7579b1..d8703f7579b1 100644
--- a/icon-themes/elementary/sw/imglst/sf02.png
+++ b/icon-themes/elementary/sw/res/sf02.png
diff --git a/icon-themes/elementary/sw/imglst/sf03.png b/icon-themes/elementary/sw/res/sf03.png
index 5a826d89cd2f..5a826d89cd2f 100644
--- a/icon-themes/elementary/sw/imglst/sf03.png
+++ b/icon-themes/elementary/sw/res/sf03.png
diff --git a/icon-themes/elementary/sw/imglst/sf04.png b/icon-themes/elementary/sw/res/sf04.png
index 6e831fa4dab7..6e831fa4dab7 100644
--- a/icon-themes/elementary/sw/imglst/sf04.png
+++ b/icon-themes/elementary/sw/res/sf04.png
diff --git a/icon-themes/elementary/sw/imglst/sf05.png b/icon-themes/elementary/sw/res/sf05.png
index 615778d6d8f0..615778d6d8f0 100644
--- a/icon-themes/elementary/sw/imglst/sf05.png
+++ b/icon-themes/elementary/sw/res/sf05.png
diff --git a/icon-themes/galaxy/sw/imglst/sf01.png b/icon-themes/galaxy/sw/res/sf01.png
index 44c9a440a079..44c9a440a079 100644
--- a/icon-themes/galaxy/sw/imglst/sf01.png
+++ b/icon-themes/galaxy/sw/res/sf01.png
diff --git a/icon-themes/galaxy/sw/imglst/sf02.png b/icon-themes/galaxy/sw/res/sf02.png
index 142efad2b8fe..142efad2b8fe 100644
--- a/icon-themes/galaxy/sw/imglst/sf02.png
+++ b/icon-themes/galaxy/sw/res/sf02.png
diff --git a/icon-themes/galaxy/sw/imglst/sf03.png b/icon-themes/galaxy/sw/res/sf03.png
index 6b16b9f5ed40..6b16b9f5ed40 100644
--- a/icon-themes/galaxy/sw/imglst/sf03.png
+++ b/icon-themes/galaxy/sw/res/sf03.png
diff --git a/icon-themes/galaxy/sw/imglst/sf04.png b/icon-themes/galaxy/sw/res/sf04.png
index 1a15efb9cee3..1a15efb9cee3 100644
--- a/icon-themes/galaxy/sw/imglst/sf04.png
+++ b/icon-themes/galaxy/sw/res/sf04.png
diff --git a/icon-themes/galaxy/sw/imglst/sf05.png b/icon-themes/galaxy/sw/res/sf05.png
index f7f20b599381..f7f20b599381 100644
--- a/icon-themes/galaxy/sw/imglst/sf05.png
+++ b/icon-themes/galaxy/sw/res/sf05.png
diff --git a/icon-themes/galaxy/sw/imglst/sf06.png b/icon-themes/galaxy/sw/res/sf06.png
index b09bf3384af5..b09bf3384af5 100644
--- a/icon-themes/galaxy/sw/imglst/sf06.png
+++ b/icon-themes/galaxy/sw/res/sf06.png
diff --git a/icon-themes/hicontrast/sw/imglst/sf01.png b/icon-themes/hicontrast/sw/res/sf01.png
index 8de0d14439b2..8de0d14439b2 100644
--- a/icon-themes/hicontrast/sw/imglst/sf01.png
+++ b/icon-themes/hicontrast/sw/res/sf01.png
diff --git a/icon-themes/hicontrast/sw/imglst/sf02.png b/icon-themes/hicontrast/sw/res/sf02.png
index 478ab3ff08e4..478ab3ff08e4 100644
--- a/icon-themes/hicontrast/sw/imglst/sf02.png
+++ b/icon-themes/hicontrast/sw/res/sf02.png
diff --git a/icon-themes/hicontrast/sw/imglst/sf03.png b/icon-themes/hicontrast/sw/res/sf03.png
index 400d0c15ef4a..400d0c15ef4a 100644
--- a/icon-themes/hicontrast/sw/imglst/sf03.png
+++ b/icon-themes/hicontrast/sw/res/sf03.png
diff --git a/icon-themes/hicontrast/sw/imglst/sf04.png b/icon-themes/hicontrast/sw/res/sf04.png
index e3304d3055ef..e3304d3055ef 100644
--- a/icon-themes/hicontrast/sw/imglst/sf04.png
+++ b/icon-themes/hicontrast/sw/res/sf04.png
diff --git a/icon-themes/hicontrast/sw/imglst/sf05.png b/icon-themes/hicontrast/sw/res/sf05.png
index 8846523d335a..8846523d335a 100644
--- a/icon-themes/hicontrast/sw/imglst/sf05.png
+++ b/icon-themes/hicontrast/sw/res/sf05.png
diff --git a/icon-themes/oxygen/sw/imglst/sf01.png b/icon-themes/oxygen/sw/res/sf01.png
index 4004e0eb77b2..4004e0eb77b2 100644
--- a/icon-themes/oxygen/sw/imglst/sf01.png
+++ b/icon-themes/oxygen/sw/res/sf01.png
diff --git a/icon-themes/oxygen/sw/imglst/sf02.png b/icon-themes/oxygen/sw/res/sf02.png
index a4b0d3980c89..a4b0d3980c89 100644
--- a/icon-themes/oxygen/sw/imglst/sf02.png
+++ b/icon-themes/oxygen/sw/res/sf02.png
diff --git a/icon-themes/oxygen/sw/imglst/sf03.png b/icon-themes/oxygen/sw/res/sf03.png
index d5a5a30917c0..d5a5a30917c0 100644
--- a/icon-themes/oxygen/sw/imglst/sf03.png
+++ b/icon-themes/oxygen/sw/res/sf03.png
diff --git a/icon-themes/oxygen/sw/imglst/sf04.png b/icon-themes/oxygen/sw/res/sf04.png
index 2fb761cd7833..2fb761cd7833 100644
--- a/icon-themes/oxygen/sw/imglst/sf04.png
+++ b/icon-themes/oxygen/sw/res/sf04.png
diff --git a/icon-themes/oxygen/sw/imglst/sf05.png b/icon-themes/oxygen/sw/res/sf05.png
index 31a8a53213a6..31a8a53213a6 100644
--- a/icon-themes/oxygen/sw/imglst/sf05.png
+++ b/icon-themes/oxygen/sw/res/sf05.png
diff --git a/icon-themes/sifr/sw/imglst/sf03.png b/icon-themes/sifr/sw/res/sf03.png
index dd211c66a1df..dd211c66a1df 100644
--- a/icon-themes/sifr/sw/imglst/sf03.png
+++ b/icon-themes/sifr/sw/res/sf03.png
diff --git a/icon-themes/tango/sw/imglst/sf01.png b/icon-themes/tango/sw/res/sf01.png
index 3eb397cbebef..3eb397cbebef 100644
--- a/icon-themes/tango/sw/imglst/sf01.png
+++ b/icon-themes/tango/sw/res/sf01.png
diff --git a/icon-themes/tango/sw/imglst/sf02.png b/icon-themes/tango/sw/res/sf02.png
index 2ccba94c75de..2ccba94c75de 100644
--- a/icon-themes/tango/sw/imglst/sf02.png
+++ b/icon-themes/tango/sw/res/sf02.png
diff --git a/icon-themes/tango/sw/imglst/sf03.png b/icon-themes/tango/sw/res/sf03.png
index 3416cc39c596..3416cc39c596 100644
--- a/icon-themes/tango/sw/imglst/sf03.png
+++ b/icon-themes/tango/sw/res/sf03.png
diff --git a/icon-themes/tango/sw/imglst/sf04.png b/icon-themes/tango/sw/res/sf04.png
index a8717549b3b9..a8717549b3b9 100644
--- a/icon-themes/tango/sw/imglst/sf04.png
+++ b/icon-themes/tango/sw/res/sf04.png
diff --git a/icon-themes/tango/sw/imglst/sf05.png b/icon-themes/tango/sw/res/sf05.png
index 188d8b89a915..188d8b89a915 100644
--- a/icon-themes/tango/sw/imglst/sf05.png
+++ b/icon-themes/tango/sw/res/sf05.png
diff --git a/icon-themes/tango/sw/imglst/sf06.png b/icon-themes/tango/sw/res/sf06.png
index 2214d0453df7..2214d0453df7 100644
--- a/icon-themes/tango/sw/imglst/sf06.png
+++ b/icon-themes/tango/sw/res/sf06.png
diff --git a/icon-themes/tango_testing/sw/imglst/sf01.png b/icon-themes/tango_testing/sw/res/sf01.png
index d2882427390b..d2882427390b 100644
--- a/icon-themes/tango_testing/sw/imglst/sf01.png
+++ b/icon-themes/tango_testing/sw/res/sf01.png
diff --git a/icon-themes/tango_testing/sw/imglst/sf01.svg b/icon-themes/tango_testing/sw/res/sf01.svg
index 1545d13361e8..1545d13361e8 100644
--- a/icon-themes/tango_testing/sw/imglst/sf01.svg
+++ b/icon-themes/tango_testing/sw/res/sf01.svg
diff --git a/icon-themes/tango_testing/sw/imglst/sf02.png b/icon-themes/tango_testing/sw/res/sf02.png
index c5597685e1c8..c5597685e1c8 100644
--- a/icon-themes/tango_testing/sw/imglst/sf02.png
+++ b/icon-themes/tango_testing/sw/res/sf02.png
diff --git a/icon-themes/tango_testing/sw/imglst/sf02.svg b/icon-themes/tango_testing/sw/res/sf02.svg
index a499fc0a467d..a499fc0a467d 100644
--- a/icon-themes/tango_testing/sw/imglst/sf02.svg
+++ b/icon-themes/tango_testing/sw/res/sf02.svg
diff --git a/icon-themes/tango_testing/sw/imglst/sf03.png b/icon-themes/tango_testing/sw/res/sf03.png
index 01f2a99c9504..01f2a99c9504 100644
--- a/icon-themes/tango_testing/sw/imglst/sf03.png
+++ b/icon-themes/tango_testing/sw/res/sf03.png
diff --git a/icon-themes/tango_testing/sw/imglst/sf03.svg b/icon-themes/tango_testing/sw/res/sf03.svg
index f621f6ebd8d8..f621f6ebd8d8 100644
--- a/icon-themes/tango_testing/sw/imglst/sf03.svg
+++ b/icon-themes/tango_testing/sw/res/sf03.svg
diff --git a/icon-themes/tango_testing/sw/imglst/sf04.png b/icon-themes/tango_testing/sw/res/sf04.png
index 694d6a394452..694d6a394452 100644
--- a/icon-themes/tango_testing/sw/imglst/sf04.png
+++ b/icon-themes/tango_testing/sw/res/sf04.png
diff --git a/icon-themes/tango_testing/sw/imglst/sf04.svg b/icon-themes/tango_testing/sw/res/sf04.svg
index f235516afac3..f235516afac3 100644
--- a/icon-themes/tango_testing/sw/imglst/sf04.svg
+++ b/icon-themes/tango_testing/sw/res/sf04.svg
diff --git a/icon-themes/tango_testing/sw/imglst/sf05.png b/icon-themes/tango_testing/sw/res/sf05.png
index 2e2ffab4705b..2e2ffab4705b 100644
--- a/icon-themes/tango_testing/sw/imglst/sf05.png
+++ b/icon-themes/tango_testing/sw/res/sf05.png
diff --git a/icon-themes/tango_testing/sw/imglst/sf05.svg b/icon-themes/tango_testing/sw/res/sf05.svg
index 3ca999aa6127..3ca999aa6127 100644
--- a/icon-themes/tango_testing/sw/imglst/sf05.svg
+++ b/icon-themes/tango_testing/sw/res/sf05.svg
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