r*: load BitmapEx resources instead of Image ones

Change-Id: I9931345912bdb7d3200b1a74742c1fcde1544bc3

reportdesign/inc/RptResId.hrc

@@ -207,9 +207,6 @@
 #define RID_STR_VERTICALALIGN               (RID_STRING_START + 160)
 #define RID_STR_PARAADJUST                  (RID_STRING_START + 161)
 
-#define RID_IMG_TREENODE_COLLAPSED          ( RID_IMAGE_START +   1 )
-#define RID_IMG_TREENODE_EXPANDED           ( RID_IMAGE_START +   2 )
-#define REPORT_TREE_ICON                    ( RID_IMAGE_START +   5 )
 // menu -----------------------------------------------------------------------
 #define RID_MENU_REPORT                     ( RID_MENU_START + 0 )
 #define RID_GROUPSROWPOPUPMENU              ( RID_MENU_START + 1 )
@@ -232,6 +229,9 @@
 #define RID_SVXBMP_DRAWTBX_CS_BASIC         (RID_BITMAP_START + 14)
 #define RID_SVXBMP_GROUP                    (RID_BITMAP_START + 15)
 #define RID_SVXBMP_ICON_DETAIL              (RID_BITMAP_START + 16)
+#define RID_BMP_TREENODE_COLLAPSED          (RID_BITMAP_START + 17)
+#define RID_BMP_TREENODE_EXPANDED           (RID_BITMAP_START + 18)
+#define RID_BMP_REPORT_TREE_ICON            (RID_BITMAP_START + 19)
 
 // untyped ---------------------------------------------------------------------
 #define RID_STR_BOOL                        (RID_UNTYPED_START +  0 )

reportdesign/source/ui/report/StartMarker.cxx

@@ -194,8 +194,8 @@ void OStartMarker::initDefaultNodeImages()
 {
     if ( !s_pDefCollapsed )
     {
-        s_pDefCollapsed     = new Image( ModuleRes( RID_IMG_TREENODE_COLLAPSED      ) );
-        s_pDefExpanded      = new Image( ModuleRes( RID_IMG_TREENODE_EXPANDED       ) );
+        s_pDefCollapsed = new Image(BitmapEx(ModuleRes(RID_BMP_TREENODE_COLLAPSED)));
+        s_pDefExpanded = new Image(BitmapEx(ModuleRes(RID_BMP_TREENODE_EXPANDED)));
     }
 
     Image* pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded;

reportdesign/source/ui/report/report.src

@@ -92,14 +92,14 @@ String RID_STR_PROPTITLE_GROUP
     Text [ en-US ] = "Group";
 };
 
-Image RID_IMG_TREENODE_COLLAPSED
+Bitmap RID_BMP_TREENODE_COLLAPSED
 {
-    ImageBitmap = Bitmap { File = "plus.png"; } ;
+    File = "plus.png";
 };
 
-Image RID_IMG_TREENODE_EXPANDED
+Bitmap RID_BMP_TREENODE_EXPANDED
 {
-    ImageBitmap = Bitmap { File = "minus.png"; } ;
+    File = "minus.png";
 };
 
 String STR_SHOW_RULER
@@ -585,10 +585,12 @@ String RID_STR_FUNCTION
 {
     Text [ en-US ] = "Function" ;
 };
-Image REPORT_TREE_ICON
+
+Bitmap RID_BMP_REPORT_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "report_16"; };
+    File = "report_16";
 };
+
 String RID_STR_COULD_NOT_CREATE_REPORT
 {
     Text [ en-US ] = "An error occurred while creating the report." ;