unwind RID_IMGLST_LAYOUT imagelist

Change-Id: I17146905c93162977effe9179c844ba691320d35

basctl/inc/basidesh.hrc

@@ -38,7 +38,6 @@
 #define RID_IMG_DLGLIBNOTLOADED         ( RID_BASICIDE_START + 34 )
 #define RID_IMG_DIALOG                  ( RID_BASICIDE_START + 36 )
 #define RID_IMG_LOCKED                  ( RID_BASICIDE_START + 41 )
-#define RID_IMGLST_LAYOUT               ( RID_BASICIDE_START + 49 )
 
 #define RID_STR_SEARCHALLMODULES        ( RID_BASICIDE_START +  1 )
 #define RID_STR_SEARCHFROMSTART         ( RID_BASICIDE_START +  2 )
@@ -141,8 +140,11 @@
 #define RID_STR_USERFORMS               ( RID_BASICIDE_START + 119 )
 #define RID_STR_NORMAL_MODULES          ( RID_BASICIDE_START + 120 )
 #define RID_STR_CLASS_MODULES           ( RID_BASICIDE_START + 121 )
+#define RID_BMP_BRKENABLED              ( SID_BASICIDE_START + 122 )
+#define RID_BMP_BRKDISABLED             ( SID_BASICIDE_START + 123 )
+#define RID_BMP_STEPMARKER              ( SID_BASICIDE_START + 124 )
+#define RID_BMP_ERRORMARKER             ( SID_BASICIDE_START + 125 )
 //free slots
-
 #define RID_STR_PRINTDLG_RANGE          ( RID_BASICIDE_START + 130 )
 #define RID_STR_PRINTDLG_ALLPAGES       ( RID_BASICIDE_START + 131 )
 #define RID_STR_PRINTDLG_PAGES          ( RID_BASICIDE_START + 132 )

basctl/source/basicide/baside2.hrc

@@ -33,12 +33,6 @@
 // RID_POPUP_TABBAR
 #define RID_INSERT              1
 
-// ModulWindowLayout
-#define IMGID_BRKENABLED        ( SID_BASICIDE_IMAGESTART + 20 )
-#define IMGID_BRKDISABLED       ( SID_BASICIDE_IMAGESTART + 21 )
-#define IMGID_STEPMARKER        ( SID_BASICIDE_IMAGESTART + 22 )
-#define IMGID_ERRORMARKER       ( SID_BASICIDE_IMAGESTART + 23 )
-
 #endif // BASCTL_BASIDE2_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

basctl/source/basicide/baside2b.cxx

@@ -76,8 +76,7 @@ SbxVariable* IsSbxVariable (SbxBase* pBase)
 
 Image GetImage (unsigned nId)
 {
-    static ImageList const aImagesNormal(IDEResId(RID_IMGLST_LAYOUT));
-    return aImagesNormal.GetImage(nId);
+    return Image(BitmapEx(IDEResId(nId)));
 }
 
 int const nScrollLine = 12;
@@ -1352,8 +1351,8 @@ void BreakPointWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle
 
     Image const aBrk[2] =
     {
-        GetImage(IMGID_BRKDISABLED),
-        GetImage(IMGID_BRKENABLED)
+        GetImage(RID_BMP_BRKDISABLED),
+        GetImage(RID_BMP_BRKENABLED)
     };
 
     Size const aBmpSz = rRenderContext.PixelToLogic(aBrk[1].GetSizePixel());
@@ -1379,7 +1378,7 @@ void BreakPointWindow::ShowMarker(vcl::RenderContext& rRenderContext)
     Size const aOutSz = GetOutputSize();
     long const nLineHeight = GetTextHeight();
 
-    Image aMarker = GetImage(bErrorMarker ? IMGID_ERRORMARKER : IMGID_STEPMARKER);
+    Image aMarker = GetImage(bErrorMarker ? RID_BMP_ERRORMARKER : RID_BMP_STEPMARKER);
 
     Size aMarkerSz(aMarker.GetSizePixel());
     aMarkerSz = rRenderContext.PixelToLogic(aMarkerSz);

basctl/source/basicide/basidesh.src

@@ -422,17 +422,26 @@ Menu RID_POPUP_TABBAR
     };
 };
 
-ImageList RID_IMGLST_LAYOUT
+Bitmap RID_BMP_BRKENABLED
 {
-    Prefix = "im";
-    IdList =
-    {
-        IMGID_BRKENABLED ;
-        IMGID_BRKDISABLED ;
-        IMGID_STEPMARKER ;
-        IMGID_ERRORMARKER ;
-    };
+    File = "im30820.png";
+};
+
+Bitmap RID_BMP_BRKDISABLED
+{
+    File = "im30821.png";
+};
+
+Bitmap RID_BMP_STEPMARKER
+{
+    File = "im30822.png";
+};
+
+Bitmap RID_BMP_ERRORMARKER
+{
+    File = "im30823.png";
 };
+
 Image RID_IMG_LOCKED
 {
     ImageBitmap = Bitmap { File = "lock.png" ; };