unwind RID_SVXIL_DATANAVI ImageList

Change-Id: I0aae6774ee0b42d32838b9010ddddaa33324c6c6

5 files changed, 54 insertions, 58 deletions

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 4e2fab2baac2..cebaa5dc776d 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -142,7 +142,6 @@
 #define RID_SVXSW_FRAMEPOSITIONS            (RID_SVX_START + 289)
 
 #define RID_SVXIL_FRAME                     (RID_SVX_START +  65)
-#define RID_SVXIL_DATANAVI                  (RID_SVX_START +  66)
 
 #define RID_SVXIMAGE_LIGHT_ON               (RID_SVX_START + 210)
 #define RID_SVXIMAGE_LIGHT_OFF              (RID_SVX_START + 211)
@@ -172,6 +171,13 @@
 #define RID_SVXBMP_SLIDERDECREASE           (RID_SVX_START +  68)
 #define RID_SVXBMP_SLIDERINCREASE           (RID_SVX_START +  69)
 
+#define RID_SVXBMP_GROUP_CLOSED             (RID_SVX_START +  69)
+#define RID_SVXBMP_GROUP_OPEN               (RID_SVX_START +  70)
+#define RID_SVXBMP_ELEMENT                  (RID_SVX_START +  71)
+#define RID_SVXBMP_ATTRIBUTE                (RID_SVX_START +  72)
+#define RID_SVXBMP_TEXT                     (RID_SVX_START +  73)
+#define RID_SVXBMP_OTHER                    (RID_SVX_START +  74)
+
 // Menu for the ruler
 #define RID_SVXMN_RULER                     (RID_SVX_START +  92)
 
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 7a582b7396db..e50adbc3efce 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -399,9 +399,8 @@ namespace svxform
         EnableMenuItems( nullptr );
     }
 
-    void XFormsPage::AddChildren(
-        SvTreeListEntry* _pParent, const ImageList& _rImgLst,
-        const Reference< css::xml::dom::XNode >& _xNode )
+    void XFormsPage::AddChildren(SvTreeListEntry* _pParent,
+        const Reference< css::xml::dom::XNode >& _xNode)
     {
         DBG_ASSERT( m_xUIHelper.is(), "XFormsPage::AddChildren(): invalid UIHelper" );
 
@@ -420,16 +419,16 @@ namespace svxform
                     switch ( eChildType )
                     {
                         case css::xml::dom::NodeType_ATTRIBUTE_NODE:
-                            aExpImg = aCollImg = _rImgLst.GetImage( IID_ATTRIBUTE );
+                            aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_ATTRIBUTE)));
                             break;
                         case css::xml::dom::NodeType_ELEMENT_NODE:
-                            aExpImg = aCollImg = _rImgLst.GetImage( IID_ELEMENT );
+                            aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_ELEMENT)));
                             break;
                         case css::xml::dom::NodeType_TEXT_NODE:
-                            aExpImg = aCollImg = _rImgLst.GetImage( IID_TEXT );
+                            aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_TEXT)));
                             break;
                         default:
-                            aExpImg = aCollImg = _rImgLst.GetImage( IID_OTHER );
+                            aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_OTHER)));
                     }
 
                     OUString sName = m_xUIHelper->getNodeDisplayName( xChild, bShowDetails );
@@ -443,7 +442,7 @@ namespace svxform
                             Reference< css::xml::dom::XNamedNodeMap > xMap = xChild->getAttributes();
                             if ( xMap.is() )
                             {
-                                aExpImg = aCollImg = _rImgLst.GetImage( IID_ATTRIBUTE );
+                                aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_ATTRIBUTE)));
                                 sal_Int32 j, nMapLen = xMap->getLength();
                                 for ( j = 0; j < nMapLen; ++j )
                                 {
@@ -458,7 +457,7 @@ namespace svxform
                             }
                         }
                         if ( xChild->hasChildNodes() )
-                            AddChildren( pEntry, _rImgLst, xChild );
+                            AddChildren(pEntry, xChild);
                     }
                 }
             }
@@ -785,13 +784,10 @@ namespace svxform
         return bHandled;
     }
 
-
     SvTreeListEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement )
     {
         SvTreeListEntry* pParent = m_pItemList->FirstSelected();
-        const ImageList& rImageList = m_pNaviWin->GetItemImageList();
-        sal_uInt16 nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE;
-        Image aImage = rImageList.GetImage( nImageID );
+        Image aImage(BitmapEx(SVX_RES(_bIsElement ? RID_SVXBMP_ELEMENT : RID_SVXBMP_ATTRIBUTE)));
         OUString sName;
         try
         {
@@ -806,12 +802,10 @@ namespace svxform
             sName, aImage, aImage, pParent, false, TREELIST_APPEND, _pNewNode );
     }
 
-
     SvTreeListEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry )
     {
         SvTreeListEntry* pEntry = nullptr;
-        const ImageList& rImageList = m_pNaviWin->GetItemImageList();
-        Image aImage = rImageList.GetImage( IID_ELEMENT );
+        Image aImage(BitmapEx(SVX_RES(RID_SVXBMP_ELEMENT)));
 
         ItemNode* pNode = new ItemNode( _rEntry );
         OUString sTemp;
@@ -1064,7 +1058,6 @@ namespace svxform
         m_xUIHelper.set( _xModel, UNO_QUERY );
         OUString sRet;
         m_bHasModel = true;
-        const ImageList& rImageList = m_pNaviWin->GetItemImageList();
 
         switch ( m_eGroup )
         {
@@ -1091,7 +1084,7 @@ namespace svxform
                                     Sequence< PropertyValue > xPropSeq;
                                     Any aAny = xNum->nextElement();
                                     if ( aAny >>= xPropSeq )
-                                        sRet = LoadInstance( xPropSeq, rImageList );
+                                        sRet = LoadInstance(xPropSeq);
                                     else
                                     {
                                         SAL_WARN( "svx.form", "XFormsPage::SetModel(): invalid instance" );
@@ -1161,8 +1154,7 @@ namespace svxform
                         Reference < XEnumeration > xNum = xNumAccess->createEnumeration();
                         if ( xNum.is() && xNum->hasMoreElements() )
                         {
-                            Image aImage1 = rImageList.GetImage( IID_ELEMENT );
-                            Image aImage2 = rImageList.GetImage( IID_ELEMENT );
+                            Image aImage(BitmapEx(SVX_RES(RID_SVXBMP_ELEMENT)));
                             OUString sDelim( ": " );
                             while ( xNum->hasMoreElements() )
                             {
@@ -1180,7 +1172,7 @@ namespace svxform
 
                                     ItemNode* pNode = new ItemNode( xPropSet );
                                     m_pItemList->InsertEntry(
-                                        sEntry, aImage1, aImage2, nullptr, false, TREELIST_APPEND, pNode );
+                                        sEntry, aImage, aImage, nullptr, false, TREELIST_APPEND, pNode );
                                 }
                             }
                         }
@@ -1208,8 +1200,7 @@ namespace svxform
         m_pItemList->DeleteAndClear();
     }
 
-    OUString XFormsPage::LoadInstance(
-        const Sequence< PropertyValue >& _xPropSeq, const ImageList& _rImgLst )
+    OUString XFormsPage::LoadInstance(const Sequence< PropertyValue >& _xPropSeq)
     {
         OUString sRet;
         OUString sTemp;
@@ -1239,7 +1230,7 @@ namespace svxform
                         if ( sNodeName.isEmpty() )
                             sNodeName = xRoot->getNodeName();
                         if ( xRoot->hasChildNodes() )
-                            AddChildren( nullptr, _rImgLst, xRoot );
+                            AddChildren(nullptr, xRoot);
                     }
                     catch ( Exception& )
                     {
@@ -1363,7 +1354,6 @@ namespace svxform
         , m_nLastSelectedPos(LISTBOX_ENTRY_NOTFOUND)
         , m_bShowDetails(false)
         , m_bIsNotifyDisabled(false)
-        , m_aItemImageList(SVX_RES(RID_SVXIL_DATANAVI))
         , m_xDataListener(new DataListener(this))
     {
         m_pUIBuilder = new VclBuilder(this, getUIRootDir(), "svx/ui/datanavigator.ui", "DataNavigator");
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index e516ab8a26fb..56575ff19d82 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -40,19 +40,34 @@ ImageList RID_SVXIMGLIST_XFORMS_TBX
 };
 #undef IMG_LST
 
-ImageList RID_SVXIL_DATANAVI
+Bitmap RID_SVXBMP_GROUP_CLOSED
 {
-    Prefix = "da";
-    IdList =
-    {
-        IID_GROUP_CLOSED ;
-        IID_GROUP_OPEN ;
-        IID_ELEMENT ;
-        IID_ATTRIBUTE ;
-        IID_TEXT ;
-        IID_OTHER ;
-    };
-    IdCount = { 6 ; } ;
+    File = "da01.png";
+};
+
+Bitmap RID_SVXBMP_GROUP_OPEN
+{
+    File = "da02.png";
+};
+
+Bitmap RID_SVXBMP_ELEMENT
+{
+    File = "da03.png";
+};
+
+Bitmap RID_SVXBMP_ATTRIBUTE
+{
+    File = "da04.png";
+};
+
+Bitmap RID_SVXBMP_TEXT
+{
+    File = "da05.png";
+};
+
+Bitmap RID_SVXBMP_OTHER
+{
+    File = "da06.png";
 };
 
 String RID_STR_QRY_REMOVE_MODEL
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index 7f24e141d88b..6fe3513d5224 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
@@ -39,14 +39,6 @@
 #define IID_ITEM_EDIT           4
 #define IID_ITEM_REMOVE         5
 
-// ImageIndexes
-#define IID_GROUP_CLOSED        1
-#define IID_GROUP_OPEN          2
-#define IID_ELEMENT             3
-#define IID_ATTRIBUTE           4
-#define IID_TEXT                5
-#define IID_OTHER               6
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 2141695275dd..4ff5938486b8 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -231,7 +231,6 @@ namespace svxform
         }
     };
 
-
     class XFormsPage : public TabPage
     {
     private:
@@ -263,9 +262,8 @@ namespace svxform
         DECL_LINK(TbxSelectHdl, ToolBox *, void);
         DECL_LINK(ItemSelectHdl, SvTreeListBox*, void);
 
-        void                        AddChildren( SvTreeListEntry* _pParent,
-                                                 const ImageList& _rImgLst,
-                                                 const XNode_ref& _xNode );
+        void                        AddChildren(SvTreeListEntry* _pParent,
+                                                const XNode_ref& _xNode);
         bool                        DoToolBoxAction( sal_uInt16 _nToolBoxID );
         SvTreeListEntry*            AddEntry( ItemNode* _pNewNode, bool _bIsElement );
         SvTreeListEntry*            AddEntry( const XPropertySet_ref& _rPropSet );
@@ -285,8 +283,7 @@ namespace svxform
         inline bool                 HasModel() const { return m_bHasModel; }
         OUString                    SetModel( const XModel_ref& _xModel, sal_uInt16 _nPagePos );
         void                        ClearModel();
-        OUString                    LoadInstance( const PropertyValue_seq& _xPropSeq,
-                                                  const ImageList& _rImgLst );
+        OUString                    LoadInstance(const PropertyValue_seq& _xPropSeq);
 
         bool                        DoMenuAction( sal_uInt16 _nMenuID );
         void                        EnableMenuItems( Menu* _pMenu );
@@ -304,7 +301,6 @@ namespace svxform
         const XFormsUIHelper1_ref&  GetXFormsHelper() const { return m_xUIHelper; }
     };
 
-
     typedef std::vector< VclPtr<XFormsPage> >   PageList;
     typedef ::rtl::Reference < DataListener >   DataListener_ref;
 
@@ -323,7 +319,6 @@ namespace svxform
         sal_Int32                   m_nLastSelectedPos;
         bool                        m_bShowDetails;
         bool                        m_bIsNotifyDisabled;
-        ImageList                   m_aItemImageList;
         PageList                    m_aPageList;
         ContainerList               m_aContainerList;
         EventTargetList             m_aEventTargetList;
@@ -366,12 +361,10 @@ namespace svxform
         void                        AddEventBroadcaster( const XEventTarget_ref& xTarget );
         void                        RemoveBroadcaster();
 
-        inline const ImageList&     GetItemImageList() const { return m_aItemImageList; }
-        inline bool                 IsShowDetails() const { return m_bShowDetails; }
-        inline void                 DisableNotify( bool _bDisable ) { m_bIsNotifyDisabled = _bDisable; }
+        bool                        IsShowDetails() const { return m_bShowDetails; }
+        void                        DisableNotify( bool _bDisable ) { m_bIsNotifyDisabled = _bDisable; }
     };
 
-
     class DataNavigator : public SfxDockingWindow, public SfxControllerItem
     {
     private: