unwind RID_SVXIMGLIST_XFORMS_TBX ImageList

Change-Id: Ib2e41e65dbc5079db12bf7ad63f857c8473cf0f3

6 files changed, 35 insertions, 33 deletions

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index cd7984d115a4..437db0331745 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -189,6 +189,12 @@
 #define RID_SVXBMP_FRAME11                  (RID_SVX_START +  85)
 #define RID_SVXBMP_FRAME12                  (RID_SVX_START +  86)
 
+#define RID_SVXBMP_ADD                      (RID_SVX_START +  87)
+#define RID_SVXBMP_ADD_ELEMENT              (RID_SVX_START +  88)
+#define RID_SVXBMP_ADD_ATTRIBUTE            (RID_SVX_START +  89)
+#define RID_SVXBMP_EDIT                     (RID_SVX_START +  90)
+#define RID_SVXBMP_REMOVE                   (RID_SVX_START +  91)
+
 // Menu for the ruler
 #define RID_SVXMN_RULER                     (RID_SVX_START +  92)
 
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index abdb36228be6..0e181ac47477 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -26,7 +26,6 @@
 
 // ImageList-Id's -----------------------------------------------------------
 #define RID_SVXIMGLIST_FMEXPL                       (RID_FORMS_START + 0)
-#define RID_SVXIMGLIST_XFORMS_TBX                   (RID_FORMS_START + 1)
 
 // Image-Id's -----------------------------------------------------------
 #define RID_SVXIMG_FORM                             SID_FM_CONFIG
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 165327340203..56b114c76cdb 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -308,7 +308,6 @@ namespace svxform
         m_pNaviWin      ( _pNaviWin ),
         m_bHasModel     ( false ),
         m_eGroup        ( _eGroup ),
-        m_TbxImageList  ( SVX_RES( RID_SVXIMGLIST_XFORMS_TBX ) ),
         m_bLinkOnce     ( false )
 
     {
@@ -329,13 +328,12 @@ namespace svxform
 
         m_pItemList->SetToolBoxItemIds(m_nAddId, m_nAddElementId, m_nAddAttributeId, m_nEditId, m_nRemoveId);
 
-        const ImageList& rImageList = m_TbxImageList;
         m_pToolBox->InsertSeparator(4,5);
-        m_pToolBox->SetItemImage( m_nAddId, rImageList.GetImage( IID_ITEM_ADD ) );
-        m_pToolBox->SetItemImage( m_nAddElementId, rImageList.GetImage( IID_ITEM_ADD_ELEMENT ) );
-        m_pToolBox->SetItemImage( m_nAddAttributeId, rImageList.GetImage( IID_ITEM_ADD_ATTRIBUTE ) );
-        m_pToolBox->SetItemImage( m_nEditId, rImageList.GetImage( IID_ITEM_EDIT ) );
-        m_pToolBox->SetItemImage( m_nRemoveId, rImageList.GetImage( IID_ITEM_REMOVE ) );
+        m_pToolBox->SetItemImage(m_nAddId, Image(BitmapEx(SVX_RES(RID_SVXBMP_ADD))));
+        m_pToolBox->SetItemImage(m_nAddElementId, Image(BitmapEx(SVX_RES(RID_SVXBMP_ADD_ELEMENT))));
+        m_pToolBox->SetItemImage(m_nAddAttributeId, Image(BitmapEx(SVX_RES(RID_SVXBMP_ADD_ATTRIBUTE))));
+        m_pToolBox->SetItemImage(m_nEditId, Image(BitmapEx(SVX_RES(RID_SVXBMP_EDIT))));
+        m_pToolBox->SetItemImage(m_nRemoveId, Image(BitmapEx(SVX_RES(RID_SVXBMP_REMOVE))));
 
         if ( DGTInstance == m_eGroup )
             m_pToolBox->RemoveItem( m_pToolBox->GetItemPos( m_nAddId ) );
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 56575ff19d82..1636d1a61c0f 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -22,23 +22,30 @@
 #include "svx/fmresids.hrc"
 #include "fmhelp.hrc"
 
-#define IMG_LST                 \
-IdList =                        \
-{                               \
-    IID_ITEM_ADD ;              \
-    IID_ITEM_ADD_ELEMENT ;      \
-    IID_ITEM_ADD_ATTRIBUTE ;    \
-    IID_ITEM_EDIT ;             \
-    IID_ITEM_REMOVE ;           \
-};                              \
-IdCount = { 5 ; } ;
-
-ImageList RID_SVXIMGLIST_XFORMS_TBX
-{
-    Prefix = "tb";
-    IMG_LST
-};
-#undef IMG_LST
+Bitmap RID_SVXBMP_ADD
+{
+    File = "tb01.png";
+};
+
+Bitmap RID_SVXBMP_ADD_ELEMENT
+{
+    File = "tb02.png";
+};
+
+Bitmap RID_SVXBMP_ADD_ATTRIBUTE
+{
+    File = "tb03.png";
+};
+
+Bitmap RID_SVXBMP_EDIT
+{
+    File = "tb04.png";
+};
+
+Bitmap RID_SVXBMP_REMOVE
+{
+    File = "tb05.png";
+};
 
 Bitmap RID_SVXBMP_GROUP_CLOSED
 {
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index 6fe3513d5224..f51cec3bc48a 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
@@ -32,13 +32,6 @@
 #define TBI_ITEM_EDIT           13
 #define TBI_ITEM_REMOVE         14
 
-// ImageIndexes
-#define IID_ITEM_ADD            1
-#define IID_ITEM_ADD_ELEMENT    2
-#define IID_ITEM_ADD_ATTRIBUTE  3
-#define IID_ITEM_EDIT           4
-#define IID_ITEM_REMOVE         5
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 4ff5938486b8..c573ff164d65 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -250,7 +250,6 @@ namespace svxform
         VclPtr<DataNavigatorWindow> m_pNaviWin;
         bool                        m_bHasModel;
         DataGroupType               m_eGroup;
-        ImageList                   m_TbxImageList;
         // these strings are not valid on the Submission and Binding Page
         // mb: furthermore these are properties of an instance, thus
         // it would be much better to get/set them through the UIHelper