remove another imagelist

Change-Id: Ica62a13b19134030c6f0e2eeaf41df3c0f1294a4

24 files changed, 42 insertions, 33 deletions

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 7b4c8c5ce048..08aa0898f295 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1267,10 +1267,10 @@ sw/res/nc20009.png cmd/sc_insertindexesentry.png
 sw/res/nc20010.png cmd/sc_showannotations.png
 sw/res/nc20011.png cmd/sc_toggleobjectbeziermode.png
 
-sw/imglst/re01.png cmd/lc_unsetcellsreadonly.png
-sw/imglst/re02.png cmd/lc_unsetcellsreadonly.png
-sw/imglst/re03.png cmd/sc_protect.png
-sw/imglst/re04.png cmd/sc_protect.png
+sw/res/re01.png cmd/lc_unsetcellsreadonly.png
+sw/res/re02.png cmd/lc_unsetcellsreadonly.png
+sw/res/re03.png cmd/sc_protect.png
+sw/res/re04.png cmd/sc_protect.png
 
 sw/imglst/sc20171.png cmd/sc_downsearch.png
 sw/imglst/sc20172.png cmd/sc_prevrecord.png
diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt
index ee2cfbf13220..58a37deb2ebd 100644
--- a/icon-themes/breeze_dark/links.txt
+++ b/icon-themes/breeze_dark/links.txt
@@ -1263,10 +1263,10 @@ sw/res/nc20009.png cmd/sc_insertindexesentry.png
 sw/res/nc20010.png cmd/sc_showannotations.png
 sw/res/nc20011.png cmd/sc_toggleobjectbeziermode.png
 
-sw/imglst/re01.png cmd/lc_unsetcellsreadonly.png
-sw/imglst/re02.png cmd/lc_unsetcellsreadonly.png
-sw/imglst/re03.png cmd/sc_protect.png
-sw/imglst/re04.png cmd/sc_protect.png
+sw/res/re01.png cmd/lc_unsetcellsreadonly.png
+sw/res/re02.png cmd/lc_unsetcellsreadonly.png
+sw/res/re03.png cmd/sc_protect.png
+sw/res/re04.png cmd/sc_protect.png
 
 sw/imglst/sc20171.png cmd/sc_downsearch.png
 sw/imglst/sc20172.png cmd/sc_prevrecord.png
diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt
index 204938a06831..74614e50f27e 100644
--- a/icon-themes/breeze_svg/links.txt
+++ b/icon-themes/breeze_svg/links.txt
@@ -1229,10 +1229,10 @@ sw/res/nc20009.png cmd/sc_insertindexesentry.png
 sw/res/nc20010.png cmd/sc_showannotations.png
 sw/res/nc20011.png cmd/sc_toggleobjectbeziermode.png
 
-sw/imglst/re01.png cmd/lc_unsetcellsreadonly.png
-sw/imglst/re02.png cmd/lc_unsetcellsreadonly.png
-sw/imglst/re03.png cmd/sc_protect.png
-sw/imglst/re04.png cmd/sc_protect.png
+sw/res/re01.png cmd/lc_unsetcellsreadonly.png
+sw/res/re02.png cmd/lc_unsetcellsreadonly.png
+sw/res/re03.png cmd/sc_protect.png
+sw/res/re04.png cmd/sc_protect.png
 
 sw/imglst/sc20171.png cmd/sc_downsearch.png
 sw/imglst/sc20172.png cmd/sc_prevrecord.png
diff --git a/icon-themes/elementary/sw/imglst/re01.png b/icon-themes/elementary/sw/res/re01.png
index aa911770ecba..aa911770ecba 100644
--- a/icon-themes/elementary/sw/imglst/re01.png
+++ b/icon-themes/elementary/sw/res/re01.png
diff --git a/icon-themes/elementary/sw/imglst/re02.png b/icon-themes/elementary/sw/res/re02.png
index d5d627e491b6..d5d627e491b6 100644
--- a/icon-themes/elementary/sw/imglst/re02.png
+++ b/icon-themes/elementary/sw/res/re02.png
diff --git a/icon-themes/elementary/sw/imglst/re03.png b/icon-themes/elementary/sw/res/re03.png
index 571602aa92ae..571602aa92ae 100644
--- a/icon-themes/elementary/sw/imglst/re03.png
+++ b/icon-themes/elementary/sw/res/re03.png
diff --git a/icon-themes/elementary/sw/imglst/re04.png b/icon-themes/elementary/sw/res/re04.png
index 45053cec03c6..45053cec03c6 100644
--- a/icon-themes/elementary/sw/imglst/re04.png
+++ b/icon-themes/elementary/sw/res/re04.png
diff --git a/icon-themes/galaxy/sw/imglst/re01.png b/icon-themes/galaxy/sw/res/re01.png
index ed47ccf20d34..ed47ccf20d34 100644
--- a/icon-themes/galaxy/sw/imglst/re01.png
+++ b/icon-themes/galaxy/sw/res/re01.png
diff --git a/icon-themes/galaxy/sw/imglst/re02.png b/icon-themes/galaxy/sw/res/re02.png
index 453949425fbe..453949425fbe 100644
--- a/icon-themes/galaxy/sw/imglst/re02.png
+++ b/icon-themes/galaxy/sw/res/re02.png
diff --git a/icon-themes/galaxy/sw/imglst/re03.png b/icon-themes/galaxy/sw/res/re03.png
index 57168abfe379..57168abfe379 100644
--- a/icon-themes/galaxy/sw/imglst/re03.png
+++ b/icon-themes/galaxy/sw/res/re03.png
diff --git a/icon-themes/galaxy/sw/imglst/re04.png b/icon-themes/galaxy/sw/res/re04.png
index 8a7fc06c16db..8a7fc06c16db 100644
--- a/icon-themes/galaxy/sw/imglst/re04.png
+++ b/icon-themes/galaxy/sw/res/re04.png
diff --git a/icon-themes/hicontrast/sw/imglst/re01.png b/icon-themes/hicontrast/sw/res/re01.png
index ef7d99fccd1a..ef7d99fccd1a 100644
--- a/icon-themes/hicontrast/sw/imglst/re01.png
+++ b/icon-themes/hicontrast/sw/res/re01.png
diff --git a/icon-themes/hicontrast/sw/imglst/re02.png b/icon-themes/hicontrast/sw/res/re02.png
index cd5e178cb4ad..cd5e178cb4ad 100644
--- a/icon-themes/hicontrast/sw/imglst/re02.png
+++ b/icon-themes/hicontrast/sw/res/re02.png
diff --git a/icon-themes/hicontrast/sw/imglst/re03.png b/icon-themes/hicontrast/sw/res/re03.png
index 12a454406a2c..12a454406a2c 100644
--- a/icon-themes/hicontrast/sw/imglst/re03.png
+++ b/icon-themes/hicontrast/sw/res/re03.png
diff --git a/icon-themes/hicontrast/sw/imglst/re04.png b/icon-themes/hicontrast/sw/res/re04.png
index 8b1c28bac4b3..8b1c28bac4b3 100644
--- a/icon-themes/hicontrast/sw/imglst/re04.png
+++ b/icon-themes/hicontrast/sw/res/re04.png
diff --git a/icon-themes/oxygen/sw/imglst/re01.png b/icon-themes/oxygen/sw/res/re01.png
index 584088ea0221..584088ea0221 100644
--- a/icon-themes/oxygen/sw/imglst/re01.png
+++ b/icon-themes/oxygen/sw/res/re01.png
diff --git a/icon-themes/oxygen/sw/imglst/re02.png b/icon-themes/oxygen/sw/res/re02.png
index 9cd53517931a..9cd53517931a 100644
--- a/icon-themes/oxygen/sw/imglst/re02.png
+++ b/icon-themes/oxygen/sw/res/re02.png
diff --git a/icon-themes/oxygen/sw/imglst/re03.png b/icon-themes/oxygen/sw/res/re03.png
index a44fc60a5f8f..a44fc60a5f8f 100644
--- a/icon-themes/oxygen/sw/imglst/re03.png
+++ b/icon-themes/oxygen/sw/res/re03.png
diff --git a/icon-themes/oxygen/sw/imglst/re04.png b/icon-themes/oxygen/sw/res/re04.png
index cebd031ad415..cebd031ad415 100644
--- a/icon-themes/oxygen/sw/imglst/re04.png
+++ b/icon-themes/oxygen/sw/res/re04.png
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 1959e52720cb..6635c1b77f32 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -114,7 +114,7 @@
 #define SW_STR_READONLY             (RC_GLOBALS_BEGIN + 46)
 
 #define STR_READONLY_PATH           (RC_GLOBALS_BEGIN + 47)
-#define IL_SECTION_BITMAPS          (RC_GLOBALS_BEGIN + 48)
+//free
 #define IL_VALUES                   (RC_GLOBALS_BEGIN + 49)
 
 // INFOBOX ------------------------------------------------------------
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 15ee51f64e8b..8eb04e528f5d 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -305,7 +305,6 @@ SwEditRegionDlg::SwEditRegionDlg( vcl::Window* pParent, SwWrtShell& rWrtSh )
     : SfxModalDialog(pParent, "EditSectionDialog",
         "modules/swriter/ui/editsectiondialog.ui")
     , m_bSubRegionsFilled(false)
-    , aImageIL(SW_RES(IL_SECTION_BITMAPS))
     , rSh(rWrtSh)
     , m_pDocInserter(nullptr)
     , bDontCheckPasswd(true)
@@ -1367,10 +1366,11 @@ IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent&, rEvent, void )
     }
 }
 
-Image SwEditRegionDlg::BuildBitmap( bool bProtect, bool bHidden )
+Image SwEditRegionDlg::BuildBitmap(bool bProtect, bool bHidden)
 {
-    ImageList& rImgLst = aImageIL;
-    return rImgLst.GetImage((int(!bHidden)+((bProtect ? 1 : 0)<<1)) + 1);
+    if (bProtect)
+        return Image(BitmapEx(SW_RES(bHidden ? RID_BMP_PROT_HIDE : RID_BMP_PROT_NO_HIDE)));
+    return Image(BitmapEx(SW_RES(bHidden ? RID_BMP_HIDE : RID_BMP_NO_HIDE)));
 }
 
 // helper function - read region names from medium
diff --git a/sw/source/uibase/dialog/regionsw.hrc b/sw/source/uibase/dialog/regionsw.hrc
index bef48c92a349..2b6e9c2ef6b5 100644
--- a/sw/source/uibase/dialog/regionsw.hrc
+++ b/sw/source/uibase/dialog/regionsw.hrc
@@ -31,11 +31,10 @@
 #define STR_WRONG_PASSWORD      (RC_REGIONSW_BEGIN+11)
 #define STR_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12)
 
-//ImageList elements
-#define BMP_HIDE            1
-#define BMP_NO_HIDE         2
-#define BMP_PROT_HIDE       3
-#define BMP_PROT_NO_HIDE    4
+#define RID_BMP_HIDE            (RC_REGIONSW_BEGIN+13)
+#define RID_BMP_NO_HIDE         (RC_REGIONSW_BEGIN+14)
+#define RID_BMP_PROT_HIDE       (RC_REGIONSW_BEGIN+15)
+#define RID_BMP_PROT_NO_HIDE    (RC_REGIONSW_BEGIN+16)
 
 #endif
 
diff --git a/sw/source/uibase/dialog/regionsw.src b/sw/source/uibase/dialog/regionsw.src
index 8558ed38e41f..4a7602f061e9 100644
--- a/sw/source/uibase/dialog/regionsw.src
+++ b/sw/source/uibase/dialog/regionsw.src
@@ -22,35 +22,46 @@
 #include "globals.hrc"
 #include "helpid.h"
 
-ImageList IL_SECTION_BITMAPS
+Bitmap RID_BMP_HIDE
 {
-    Prefix = "re";
-    IdList =
-    {
-        BMP_HIDE           /*1*/ ;
-        BMP_NO_HIDE        /*2*/ ;
-        BMP_PROT_HIDE      /*3*/ ;
-        BMP_PROT_NO_HIDE   /*4*/ ;
-    };
-    IdCount = { 4 ; };
+    File = "re01.png";
+};
+
+Bitmap RID_BMP_NO_HIDE
+{
+    File = "re02.png";
+};
+
+Bitmap RID_BMP_PROT_HIDE
+{
+    File = "re03.png";
+};
+
+Bitmap RID_BMP_PROT_NO_HIDE
+{
+    File = "re04.png";
 };
 
 String STR_REG_DUPLICATE
 {
     Text [ en-US ] = "Section name changed:" ;
 };
+
 String STR_INFO_DUPLICATE
 {
     Text [ en-US ] = "Duplicate section name" ;
 };
+
 String STR_QUERY_CONNECT
 {
     Text[ en-US ] = "A file connection will delete the contents of the current section. Connect anyway?" ;
 };
+
 String STR_WRONG_PASSWORD
 {
     Text [ en-US ] = "The password entered is invalid." ;
 };
+
 String STR_WRONG_PASSWD_REPEAT
 {
     Text [ en-US ] = "The password has not been set." ;
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index 8bc5e03e54a8..9abc8c8aad33 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -89,7 +89,6 @@ class SwEditRegionDlg : public SfxModalDialog
     VclPtr<OKButton>       m_pOK;
     VclPtr<PushButton>     m_pOptionsPB;
     VclPtr<PushButton>     m_pDismiss;
-    ImageList       aImageIL;
 
     SwWrtShell&             rSh;
     SectReprs_t             m_SectReprs;