unwind RID_SVXIMGLIST_RPTEXPL ImageList

Change-Id: I395dfb5e54f3196f59b5079c580714f57c992f2d

reportdesign/inc/RptResId.hrc

@@ -214,8 +214,24 @@
 #define RID_MENU_REPORT                     ( RID_MENU_START + 0 )
 #define RID_GROUPSROWPOPUPMENU              ( RID_MENU_START + 1 )
 #define RID_MENU_NAVIGATOR                  ( RID_MENU_START + 2 )
-
-#define RID_SVXIMGLIST_RPTEXPL              (RID_IMAGELIST_START + 4)
+// bitmaps
+#define RID_SVXBMP_SELECT_REPORT            (RID_BITMAP_START + 0 )
+#define RID_SVXBMP_FM_FIXEDTEXT             (RID_BITMAP_START + 1 )
+#define RID_SVXBMP_INSERT_HFIXEDLINE        (RID_BITMAP_START + 2 )
+#define RID_SVXBMP_INSERT_VFIXEDLINE        (RID_BITMAP_START + 3 )
+#define RID_SVXBMP_FM_IMAGECONTROL          (RID_BITMAP_START + 4 )
+#define RID_SVXBMP_FM_EDIT                  (RID_BITMAP_START + 5 )
+#define RID_SVXBMP_RPT_NEW_FUNCTION         (RID_BITMAP_START + 6 )
+#define RID_SVXBMP_REPORTHEADERFOOTER       (RID_BITMAP_START + 7 )
+#define RID_SVXBMP_PAGEHEADERFOOTER         (RID_BITMAP_START + 8 )
+#define RID_SVXBMP_GROUPHEADER              (RID_BITMAP_START + 9 )
+#define RID_SVXBMP_GROUPFOOTER              (RID_BITMAP_START + 10)
+#define RID_SVXBMP_COLLAPSEDNODE            (RID_BITMAP_START + 11)
+#define RID_SVXBMP_EXPANDEDNODE             (RID_BITMAP_START + 12)
+#define RID_SVXBMP_SORTINGANDGROUPING       (RID_BITMAP_START + 13)
+#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)
 
 // untyped ---------------------------------------------------------------------
 #define RID_STR_BOOL                        (RID_UNTYPED_START +  0 )

reportdesign/source/ui/dlg/Navigator.src

@@ -22,47 +22,101 @@
 #include <svx/svxids.hrc>
 #include <svl/solar.hrc>
 
-#define RID_SVXIMG_COLLAPSEDNODE                    (RID_FORMS_START + 2)
-#define RID_SVXIMG_EXPANDEDNODE                     (RID_FORMS_START + 3)
-#define RID_SVXIMG_FORMS                            (RID_FORMS_START +13)
-
-#define NAVIGATOR_IMAGEIDS \
-    IdList = \
-    { \
-        SID_SELECT_REPORT;\
-        SID_FM_FIXEDTEXT ; \
-        SID_INSERT_HFIXEDLINE ; \
-        SID_INSERT_VFIXEDLINE;\
-        SID_FM_IMAGECONTROL ; \
-        SID_FM_EDIT ; \
-        SID_RPT_NEW_FUNCTION;\
-        SID_REPORTHEADERFOOTER;\
-        SID_PAGEHEADERFOOTER;\
-        SID_GROUPHEADER;\
-        SID_GROUPFOOTER;\
-        RID_SVXIMG_COLLAPSEDNODE ; \
-        RID_SVXIMG_EXPANDEDNODE ; \
-        SID_SORTINGANDGROUPING;\
-        SID_DRAWTBX_CS_BASIC;\
-        SID_GROUP;\
-        SID_ICON_DETAIL;\
-    }; \
-    IdCount = 17
-
-ImageList RID_SVXIMGLIST_RPTEXPL
-{
-    Prefix = "sx";
-    NAVIGATOR_IMAGEIDS;
+Bitmap RID_SVXBMP_SELECT_REPORT
+{
+    File = "sx12464.png";
+};
+
+Bitmap RID_SVXBMP_FM_FIXEDTEXT
+{
+    File = "sx10597.png";
+};
+
+Bitmap RID_SVXBMP_INSERT_HFIXEDLINE
+{
+    File = "sx10928.png";
+};
+
+Bitmap RID_SVXBMP_INSERT_VFIXEDLINE
+{
+    File = "sx10929.png";
+};
+
+Bitmap RID_SVXBMP_FM_IMAGECONTROL
+{
+    File = "sx10710.png";
+};
+
+Bitmap RID_SVXBMP_FM_EDIT
+{
+    File = "sx10599.png";
+};
+
+Bitmap RID_SVXBMP_RPT_NEW_FUNCTION
+{
+    File = "sx12594.png";
+};
+
+Bitmap RID_SVXBMP_REPORTHEADERFOOTER
+{
+    File = "sx12453.png";
+};
+
+Bitmap RID_SVXBMP_PAGEHEADERFOOTER
+{
+    File = "sx12452.png";
+};
+
+Bitmap RID_SVXBMP_GROUPHEADER
+{
+    File = "sx12466.png";
+};
+
+Bitmap RID_SVXBMP_GROUPFOOTER
+{
+    File = "sx12468.png";
+};
+
+Bitmap RID_SVXBMP_COLLAPSEDNODE
+{
+    File = "sx18002.png";
+};
+
+Bitmap RID_SVXBMP_EXPANDEDNODE
+{
+    File = "sx18003.png";
+};
+
+Bitmap RID_SVXBMP_SORTINGANDGROUPING
+{
+    File = "sx12454.png";
+};
+
+Bitmap RID_SVXBMP_DRAWTBX_CS_BASIC
+{
+    File = "sx11047.png";
+};
+
+Bitmap RID_SVXBMP_GROUP
+{
+    File = "sx10454.png";
+};
+
+Bitmap RID_SVXBMP_ICON_DETAIL
+{
+    File = "sx12603.png";
 };
 
 String RID_STR_FUNCTIONS
 {
     Text [ en-US ] = "Functions" ;
 };
+
 String RID_STR_GROUPS
 {
     Text [ en-US ] = "Groups" ;
 };
+
 Menu RID_MENU_NAVIGATOR
 {
     ItemList =