#i32850# wrong resource handling fixed

1 files changed, 15 insertions, 16 deletions

diff --git a/svx/source/dialog/selector.cxx b/svx/source/dialog/selector.cxx
index 8bad09ec721f..49f98f8b4b0b 100644
--- a/svx/source/dialog/selector.cxx
+++ b/svx/source/dialog/selector.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: selector.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: hr $ $Date: 2004-08-02 15:14:39 $
+ *  last change: $Author: obo $ $Date: 2004-08-13 13:26:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -356,7 +356,13 @@ SvxConfigGroupListBox_Impl::SvxConfigGroupListBox_Impl(
     m_sMyMacros(ResId(STR_MYMACROS)),
     m_sProdMacros(ResId(STR_PRODMACROS)),
     m_hdImage(ResId(IMG_HARDDISK)),
-    m_hdImage_hc(ResId(IMG_HARDDISK_HC))
+    m_hdImage_hc(ResId(IMG_HARDDISK_HC)),
+    m_libImage(ResId(IMG_LIB)),
+    m_libImage_hc(ResId(IMG_LIB_HC)),
+    m_macImage(ResId(IMG_MACRO)),
+    m_macImage_hc(ResId(IMG_MACRO_HC)),
+    m_docImage(ResId(IMG_DOC)),
+    m_docImage_hc(ResId(IMG_DOC_HC))
 {
     FreeResource();
     SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
@@ -373,13 +379,6 @@ SvxConfigGroupListBox_Impl::SvxConfigGroupListBox_Impl(
         aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
         BMP_COLOR_HIGHCONTRAST );
 
-    ::rtl::OUString aResName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "basctl" ));
-    aResName += rtl::OUString::valueOf( sal_Int32( SUPD ));
-    ResMgr* pBasResMgr = ResMgr::CreateResMgr( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US ));
-    m_aImagesNormal = ImageList(ResId(RID_IMGLST_OBJECTS, pBasResMgr ));
-    m_aImagesHighContrast = ImageList(ResId(RID_IMGLST_OBJECTS_HC, pBasResMgr ));
-    //m_hdImage = Image(ResId(IMG_HARDDISK));
-    //m_hdImage_hc = Image(ResId(IMG_HARDDISK_HC));
     // Check configuration to see whether only Basic macros,
     // only Scripting Framework scripts, or both should be listed
     Any value;
@@ -821,9 +820,9 @@ Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
             else
             {
                 if( bHighContrast == BMP_COLOR_NORMAL )
-                    aImage = m_aImagesNormal.GetImage(IMGID_DOCUMENT);
+                    aImage = m_docImage;
                 else
-                    aImage = m_aImagesHighContrast.GetImage(IMGID_DOCUMENT);
+                    aImage = m_docImage_hc;
             }
         }
     }
@@ -832,16 +831,16 @@ Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
         if( node->getType() == browse::BrowseNodeTypes::SCRIPT )
         {
             if( bHighContrast == BMP_COLOR_NORMAL )
-                aImage = m_aImagesNormal.GetImage(IMGID_MODULE);
+                aImage = m_macImage;
             else
-                aImage = m_aImagesHighContrast.GetImage(IMGID_MODULE);
+                aImage = m_macImage_hc;
         }
         else
         {
             if( bHighContrast == BMP_COLOR_NORMAL )
-                aImage = m_aImagesNormal.GetImage(IMGID_LIB);
+                aImage = m_libImage;
             else
-                aImage = m_aImagesHighContrast.GetImage(IMGID_LIB);
+                aImage = m_libImage_hc;
         }
     }
     return aImage;