remove hicontrast stuff

14 files changed, 24 insertions, 147 deletions

diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index eba35852b8b1..83702dd31d98 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -59,25 +59,15 @@
 
 #define RID_IMGBTN_REMOVEWATCH          ( RID_BASICIDE_START +  8 )
 #define RID_IMGBTN_GOTOCALL             ( RID_BASICIDE_START +  9 )
-#define RID_IMGLST_LAYOUT_HC            ( RID_BASICIDE_START + 14 )
 #define RID_IMG_INSTALLATION            ( RID_BASICIDE_START + 20 )
-#define RID_IMG_INSTALLATION_HC         ( RID_BASICIDE_START + 21 )
 #define RID_IMG_DOCUMENT                ( RID_BASICIDE_START + 22 )
-#define RID_IMG_DOCUMENT_HC             ( RID_BASICIDE_START + 23 )
 #define RID_IMG_MODLIB                  ( RID_BASICIDE_START + 24 )
-#define RID_IMG_MODLIB_HC               ( RID_BASICIDE_START + 25 )
 #define RID_IMG_MODLIBNOTLOADED         ( RID_BASICIDE_START + 26 )
-#define RID_IMG_MODLIBNOTLOADED_HC      ( RID_BASICIDE_START + 27 )
 #define RID_IMG_MODULE                  ( RID_BASICIDE_START + 28 )
-#define RID_IMG_MODULE_HC               ( RID_BASICIDE_START + 29 )
 #define RID_IMG_MACRO                   ( RID_BASICIDE_START + 30 )
-#define RID_IMG_MACRO_HC                ( RID_BASICIDE_START + 31 )
 #define RID_IMG_DLGLIB                  ( RID_BASICIDE_START + 32 )
-#define RID_IMG_DLGLIB_HC               ( RID_BASICIDE_START + 33 )
 #define RID_IMG_DLGLIBNOTLOADED         ( RID_BASICIDE_START + 34 )
-#define RID_IMG_DLGLIBNOTLOADED_HC      ( RID_BASICIDE_START + 35 )
 #define RID_IMG_DIALOG                  ( RID_BASICIDE_START + 36 )
-#define RID_IMG_DIALOG_HC               ( RID_BASICIDE_START + 37 )
 #define RID_IMG_LOCKED                  ( RID_BASICIDE_START + 41 )
 #define RID_IMGLST_LAYOUT               ( RID_BASICIDE_START + 49 )
 
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index ef1289736106..d2688fb696ba 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1461,8 +1461,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
     bVSplitted(FALSE),
     bHSplitted(FALSE),
     m_pModulWindow(0),
-    m_aImagesNormal(IDEResId(RID_IMGLST_LAYOUT)),
-    m_aImagesHighContrast(IDEResId(RID_IMGLST_LAYOUT_HC))
+    m_aImagesNormal(IDEResId(RID_IMGLST_LAYOUT))
 {
     SetBackground(GetSettings().GetStyleSettings().GetWindowColor());
 
@@ -1750,10 +1749,9 @@ void ModulWindowLayout::updateSyntaxHighlighting()
     }
 }
 
-Image ModulWindowLayout::getImage(USHORT nId, bool bHighContrastMode) const
+Image ModulWindowLayout::getImage(USHORT nId) const
 {
-    return (bHighContrastMode ? m_aImagesHighContrast : m_aImagesNormal).
-        GetImage(nId);
+    return m_aImagesNormal.GetImage(nId);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 12ae6a23fb6f..9d22f36a47f0 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -192,7 +192,6 @@ private:
     BreakPointList  aBreakPointList;
     ModulWindow*    pModulWindow;
     BOOL            bErrorMarker;
-    bool m_bHighContrastMode;
 
     virtual void DataChanged(DataChangedEvent const & rDCEvt);
 
@@ -467,7 +466,6 @@ private:
     svtools::ColorConfig m_aColorConfig;
 
     ImageList m_aImagesNormal;
-    ImageList m_aImagesHighContrast;
 
     virtual void DataChanged(DataChangedEvent const & rDCEvt);
 
@@ -496,7 +494,7 @@ public:
     WatchWindow&    GetWatchWindow()    { return aWatchWindow; }
     StackWindow&    GetStackWindow()    { return aStackWindow; }
 
-    Image getImage(USHORT nId, bool bHighContrastMode) const;
+    Image getImage(USHORT nId) const;
 
     inline Color const & getSyntaxColor(TokenTypes eType) const
     { return m_aSyntaxColors[eType]; }
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 8299fcfac775..601f8b99dc1b 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -937,7 +937,6 @@ BreakPointWindow::BreakPointWindow( Window* pParent ) :
     pModulWindow = 0;
     nCurYOffset = 0;
     setBackgroundColor(GetSettings().GetStyleSettings().GetFieldColor());
-    m_bHighContrastMode = GetSettings().GetStyleSettings().GetHighContrastMode();
     nMarkerPos = MARKER_NOMARKER;
 
     // nCurYOffset merken und nicht von EditEngine holen.
@@ -971,9 +970,9 @@ void __EXPORT BreakPointWindow::Paint( const Rectangle& )
     long nLineHeight = GetTextHeight();
 
     Image aBrk1(((ModulWindowLayout *) pModulWindow->GetLayoutWindow())->
-                getImage(IMGID_BRKENABLED, m_bHighContrastMode));
+                getImage(IMGID_BRKENABLED));
     Image aBrk0(((ModulWindowLayout *) pModulWindow->GetLayoutWindow())->
-                getImage(IMGID_BRKDISABLED, m_bHighContrastMode));
+                getImage(IMGID_BRKDISABLED));
     Size aBmpSz( aBrk1.GetSizePixel() );
     aBmpSz = PixelToLogic( aBmpSz );
     Point aBmpOff( 0, 0 );
@@ -1022,8 +1021,7 @@ void BreakPointWindow::ShowMarker( BOOL bShow )
 
     Image aMarker(((ModulWindowLayout*)pModulWindow->GetLayoutWindow())->
                   getImage(bErrorMarker
-                           ? IMGID_ERRORMARKER : IMGID_STEPMARKER,
-                           m_bHighContrastMode));
+                           ? IMGID_ERRORMARKER : IMGID_STEPMARKER));
 
     Size aMarkerSz( aMarker.GetSizePixel() );
     aMarkerSz = PixelToLogic( aMarkerSz );
@@ -1155,7 +1153,6 @@ void BreakPointWindow::DataChanged(DataChangedEvent const & rDCEvt)
             != rDCEvt.GetOldSettings()->GetStyleSettings().GetFieldColor())
         {
             setBackgroundColor(aColor);
-            m_bHighContrastMode = GetSettings().GetStyleSettings().GetHighContrastMode();
             Invalidate();
         }
     }
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 9615f869f6b1..f892daa25f91 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -343,7 +343,6 @@ ImageButton RID_IMGBTN_REMOVEWATCH
     };
     QuickHelpText [ en-US ] = "Remove Watch" ;
 };
-
 ImageButton RID_IMGBTN_GOTOCALL
 {
     HelpId = HID_BASICIDE_GOTOALL ;
@@ -509,18 +508,6 @@ ImageList RID_IMGLST_LAYOUT
         IMGID_ERRORMARKER ;
     };
 };
-ImageList RID_IMGLST_LAYOUT_HC
-{
-    Prefix = "imh";
-    MASKCOLOR
-    IdList =
-    {
-        IMGID_BRKENABLED ;
-        IMGID_BRKDISABLED ;
-        IMGID_STEPMARKER ;
-        IMGID_ERRORMARKER ;
-    };
-};
 Image RID_IMG_LOCKED
 {
     ImageBitmap = Bitmap { File = "locked.bmp" ; };
@@ -531,91 +518,46 @@ Image RID_IMG_INSTALLATION
     ImageBitmap = Bitmap { File = "harddisk_16.png"; };
     MASKCOLOR
 };
-Image RID_IMG_INSTALLATION_HC
-{
-    ImageBitmap = Bitmap { File = "harddisk_16_h.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_DOCUMENT
 {
     ImageBitmap = Bitmap { File = "im30826.png"; };
     MASKCOLOR
 };
-Image RID_IMG_DOCUMENT_HC
-{
-    ImageBitmap = Bitmap { File = "imh30826.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_MODLIB
 {
     ImageBitmap = Bitmap { File = "im30820.png"; };
     MASKCOLOR
 };
-Image RID_IMG_MODLIB_HC
-{
-    ImageBitmap = Bitmap { File = "imh30820.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_MODLIBNOTLOADED
 {
     ImageBitmap = Bitmap { File = "im30827.png"; };
     MASKCOLOR
 };
-Image RID_IMG_MODLIBNOTLOADED_HC
-{
-    ImageBitmap = Bitmap { File = "imh30827.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_MODULE
 {
     ImageBitmap = Bitmap { File = "im30821.png"; };
     MASKCOLOR
 };
-Image RID_IMG_MODULE_HC
-{
-    ImageBitmap = Bitmap { File = "imh30821.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_MACRO
 {
     ImageBitmap = Bitmap { File = "im30822.png"; };
     MASKCOLOR
 };
-Image RID_IMG_MACRO_HC
-{
-    ImageBitmap = Bitmap { File = "imh30822.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_DLGLIB
 {
     ImageBitmap = Bitmap { File = "dialogfolder_16.png"; };
     MASKCOLOR
 };
-Image RID_IMG_DLGLIB_HC
-{
-    ImageBitmap = Bitmap { File = "dialogfolder_16_h.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_DLGLIBNOTLOADED
 {
     ImageBitmap = Bitmap { File = "dialogfoldernot_16.png"; };
     MASKCOLOR
 };
-Image RID_IMG_DLGLIBNOTLOADED_HC
-{
-    ImageBitmap = Bitmap { File = "dialogfoldernot_16_h.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_DIALOG
 {
     ImageBitmap = Bitmap { File = "im30823.png"; };
     MASKCOLOR
 };
-Image RID_IMG_DIALOG_HC
-{
-    ImageBitmap = Bitmap { File = "imh30823.png"; };
-    MASKCOLOR
-};
 String RID_STR_QUERYREPLACEMACRO
 {
     Text [ en-US ] = "Do you want to overwrite the XX macro?" ;
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 2299e1a720ad..55e17fec4b63 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -234,12 +234,10 @@ void BasicTreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocati
     {
         String aRootName( GetRootEntryName( rDocument, eLocation ) );
         Image aImage;
-        Image aImageHC;
-        GetRootEntryBitmaps( rDocument, aImage, aImageHC );
+        GetRootEntryBitmaps( rDocument, aImage );
         pDocumentRootEntry = AddEntry(
             aRootName,
             aImage,
-            aImageHC,
             0, true,
             std::auto_ptr< BasicEntry >( new BasicDocumentEntry( rDocument, eLocation ) ) );
     }
@@ -286,21 +284,15 @@ void BasicTreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, con
             }
 
             // create tree list box entry
-            USHORT nId, nIdHC;
+            USHORT nId;
             if ( ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES ) )
-            {
                 nId = bLoaded ? RID_IMG_DLGLIB : RID_IMG_DLGLIBNOTLOADED;
-                nIdHC = bLoaded ? RID_IMG_DLGLIB_HC : RID_IMG_DLGLIBNOTLOADED_HC;
-            }
             else
-            {
                 nId = bLoaded ? RID_IMG_MODLIB : RID_IMG_MODLIBNOTLOADED;
-                nIdHC = bLoaded ? RID_IMG_MODLIB_HC : RID_IMG_MODLIBNOTLOADED_HC;
-            }
             SvLBoxEntry* pLibRootEntry = FindEntry( pDocumentRootEntry, aLibName, OBJ_TYPE_LIBRARY );
             if ( pLibRootEntry )
             {
-                SetEntryBitmaps( pLibRootEntry, Image( IDEResId( nId ) ), Image( IDEResId( nIdHC ) ) );
+                SetEntryBitmaps( pLibRootEntry, Image( IDEResId( nId ) ) );
                 if ( IsExpanded( pLibRootEntry ) )
                     ImpCreateLibSubEntries( pLibRootEntry, rDocument, aLibName );
             }
@@ -309,7 +301,6 @@ void BasicTreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, con
                 pLibRootEntry = AddEntry(
                     aLibName,
                     Image( IDEResId( nId ) ),
-                    Image( IDEResId( nIdHC ) ),
                     pDocumentRootEntry, true,
                     std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_LIBRARY ) ) );
             }
@@ -347,7 +338,6 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const
                             pModuleEntry = AddEntry(
                                 aModName,
                                 Image( IDEResId( RID_IMG_MODULE ) ),
-                                Image( IDEResId( RID_IMG_MODULE_HC ) ),
                                 pLibRootEntry, false,
                                 std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
 
@@ -366,7 +356,6 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const
                                     pEntry = AddEntry(
                                         aName,
                                         Image( IDEResId( RID_IMG_MACRO ) ),
-                                        Image( IDEResId( RID_IMG_MACRO_HC ) ),
                                         pModuleEntry, false,
                                         std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_METHOD ) ) );
                             }
@@ -403,7 +392,6 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const
                         pDialogEntry = AddEntry(
                             aDlgName,
                             Image( IDEResId( RID_IMG_DIALOG ) ),
-                            Image( IDEResId( RID_IMG_DIALOG_HC ) ),
                             pLibRootEntry, false,
                             std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_DIALOG ) ) );
                 }
@@ -433,7 +421,7 @@ void BasicTreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEnt
         SvLBoxEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType );
         if( pLibSubRootEntry )
         {
-            SetEntryBitmaps( pLibSubRootEntry, Image( IDEResId( RID_IMG_MODLIB ) ), Image( IDEResId( RID_IMG_MODLIB_HC ) ) );
+            SetEntryBitmaps( pLibSubRootEntry, Image( IDEResId( RID_IMG_MODLIB ) ) );
             if ( IsExpanded( pLibSubRootEntry ) )
                 ImpCreateLibSubSubEntriesInVBAMode( pLibSubRootEntry, rDocument, rLibName );
         }
@@ -442,7 +430,6 @@ void BasicTreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEnt
             pLibSubRootEntry = AddEntry(
                 aEntryName,
                 Image( IDEResId( RID_IMG_MODLIB ) ),
-                Image( IDEResId( RID_IMG_MODLIB_HC ) ),
                 pLibRootEntry, true,
                 std::auto_ptr< BasicEntry >( new BasicEntry( eType ) ) );
         }
@@ -504,7 +491,6 @@ void BasicTreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubR
                 pModuleEntry = AddEntry(
                     aEntryName,
                     Image( IDEResId( RID_IMG_MODULE ) ),
-                    Image( IDEResId( RID_IMG_MODULE_HC ) ),
                     pLibSubRootEntry, false,
                     std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
 
@@ -523,7 +509,6 @@ void BasicTreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubR
                         pEntry = AddEntry(
                             aName,
                             Image( IDEResId( RID_IMG_MACRO ) ),
-                            Image( IDEResId( RID_IMG_MACRO_HC ) ),
                             pModuleEntry, false,
                             std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_METHOD ) ) );
                 }
@@ -712,7 +697,7 @@ BOOL BasicTreeListBox::IsEntryProtected( SvLBoxEntry* pEntry )
 }
 
 SvLBoxEntry* BasicTreeListBox::AddEntry(
-    const String& rText, const Image& rImage, const Image& rImageHC,
+    const String& rText, const Image& rImage,
     SvLBoxEntry* pParent, bool bChildrenOnDemand, std::auto_ptr< BasicEntry > aUserData )
 {
     SvLBoxEntry* p = InsertEntry(
@@ -721,7 +706,7 @@ SvLBoxEntry* BasicTreeListBox::AddEntry(
     return p;
 }
 
-void BasicTreeListBox::SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage, const Image& rImageHC )
+void BasicTreeListBox::SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage )
 {
     SetExpandedEntryBmp(  pEntry, rImage );
     SetCollapsedEntryBmp( pEntry, rImage );
@@ -742,7 +727,7 @@ String BasicTreeListBox::GetRootEntryName( const ScriptDocument& rDocument, Libr
     return rDocument.getTitle( eLocation, GetLibraryType() );
 }
 
-void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& rImage, Image& rImageHC )
+void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& rImage )
 {
     OSL_ENSURE( rDocument.isValid(), "BasicTreeListBox::GetRootEntryBitmaps: illegal document!" );
     if ( !rDocument.isValid() )
@@ -787,22 +772,16 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima
             rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ),
                 FALSE /* small */,
                 FALSE /* normal */ );
-
-            rImageHC = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ),
-                FALSE /* small */,
-                TRUE /* high contrast */ );
         }
         else
         {
             // default icon
             rImage = Image( IDEResId( RID_IMG_DOCUMENT ) );
-            rImageHC = Image( IDEResId( RID_IMG_DOCUMENT_HC ) );
         }
     }
     else
     {
         rImage = Image( IDEResId( RID_IMG_INSTALLATION ) );
-        rImageHC = Image( IDEResId( RID_IMG_INSTALLATION_HC ) );
     }
 }
 
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index 08fb03d1c689..492e48da27bd 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -156,7 +156,7 @@ private:
     USHORT                          nMode;
     ::basctl::DocumentEventNotifier m_aNotifier;
 
-    void            SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage, const Image& rImageHC );
+    void            SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage );
 
 protected:
     virtual void            RequestingChilds( SvLBoxEntry* pParent );
@@ -204,12 +204,12 @@ public:
     USHORT          ConvertType( BasicEntryType eType );
     bool            IsValidEntry( SvLBoxEntry* pEntry );
 
-    SvLBoxEntry*    AddEntry( const String& rText, const Image& rImage, const Image& rImageHC,
+    SvLBoxEntry*    AddEntry( const String& rText, const Image& rImage,
                               SvLBoxEntry* pParent, bool bChildrenOnDemand,
                               std::auto_ptr< BasicEntry > aUserData );
 
     String          GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const;
-    void            GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& rImage, Image& rImageHC );
+    void            GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& rImage );
 
     void            SetCurrentEntry( BasicEntryDescriptor& rDesc );
 
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 3f114b190587..9b1a18614f1e 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -123,8 +123,7 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
                 // exchange image
                 bool bDlgMode = ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES );
                 Image aImage( IDEResId( bDlgMode ? RID_IMG_DLGLIB : RID_IMG_MODLIB ) );
-                Image aImageHC( IDEResId( bDlgMode ? RID_IMG_DLGLIB_HC : RID_IMG_MODLIB_HC ) );
-                SetEntryBitmaps( pEntry, aImage, aImageHC );
+                SetEntryBitmaps( pEntry, aImage );
             }
             else
             {
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index b9445dc1f675..908aca7e0abd 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1687,11 +1687,9 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
                     USHORT nMode = pBasicBox->GetMode();
                     bool bDlgMode = ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES );
                     USHORT nId = bDlgMode ? RID_IMG_DLGLIB : RID_IMG_MODLIB;
-                    USHORT nIdHC = bDlgMode ? RID_IMG_DLGLIB_HC : RID_IMG_MODLIB_HC;
                     SvLBoxEntry* pNewLibEntry = pBasicBox->AddEntry(
                         aLibName,
                         Image( IDEResId( nId ) ),
-                        Image( IDEResId( nIdHC ) ),
                         pRootEntry, false,
                         std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_LIBRARY ) ) );
                     DBG_ASSERT( pNewLibEntry, "InsertEntry fehlgeschlagen!" );
@@ -1701,7 +1699,6 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
                         SvLBoxEntry* pEntry_ = pBasicBox->AddEntry(
                             aModName,
                             Image( IDEResId( RID_IMG_MODULE ) ),
-                            Image( IDEResId( RID_IMG_MODULE_HC ) ),
                             pNewLibEntry, false,
                             std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
                         DBG_ASSERT( pEntry_, "InsertEntry fehlgeschlagen!" );
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index fcc2858670d1..0b5df85985e6 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -865,7 +865,6 @@ void ObjectPage::NewDialog()
                             pEntry = aBasicBox.AddEntry(
                                 aDlgName,
                                 Image( IDEResId( RID_IMG_DIALOG ) ),
-                                Image( IDEResId( RID_IMG_DIALOG_HC ) ),
                                 pLibEntry, false,
                                 std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_DIALOG ) ) );
                             DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" );
@@ -1039,7 +1038,6 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
                         pEntry = rBasicBox.AddEntry(
                             aModName,
                             Image( IDEResId( RID_IMG_MODULE ) ),
-                            Image( IDEResId( RID_IMG_MODULE_HC ) ),
                             pSubRootEntry, false,
                             std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
                         DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" );
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index f3998287a2b8..7b4169dcb138 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -88,7 +88,7 @@ void ObjectTreeListBox::MouseButtonDown( const MouseEvent& rMEvt )
 ObjectCatalog::ObjectCatalog( Window * pParent )
     :FloatingWindow( pParent, IDEResId( RID_BASICIDE_OBJCAT ) )
     ,aMacroTreeList( this, IDEResId( RID_TLB_MACROS ) )
-    ,aToolBox(this, IDEResId(RID_TB_TOOLBOX), IDEResId(RID_IMGLST_TB_HC))
+    ,aToolBox(this, IDEResId(RID_TB_TOOLBOX))
     ,aMacroDescr( this, IDEResId( RID_FT_MACRODESCR ) )
 {
     FreeResource();
@@ -270,12 +270,9 @@ void ObjectCatalog::SetCurrentEntry( BasicEntryDescriptor& rDesc )
 }
 
 ObjectCatalogToolBox_Impl::ObjectCatalogToolBox_Impl(
-    Window * pParent, ResId const & rResId,
-    ResId const & rImagesHighContrastId):
-    ToolBox(pParent, rResId),
-    m_aImagesNormal(GetImageList()),
-    m_aImagesHighContrast(rImagesHighContrastId),
-    m_bHighContrast(false)
+    Window * pParent, ResId const & rResId)
+    : ToolBox(pParent, rResId)
+    , m_aImagesNormal(GetImageList())
 {
     setImages();
 }
@@ -292,12 +289,7 @@ void ObjectCatalogToolBox_Impl::DataChanged(DataChangedEvent const & rDCEvt)
 
 void ObjectCatalogToolBox_Impl::setImages()
 {
-    bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-    if (bHC != m_bHighContrast)
-    {
-        SetImageList(bHC ? m_aImagesHighContrast : m_aImagesNormal);
-        m_bHighContrast = bHC;
-    }
+    SetImageList(m_aImagesNormal);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/objdlg.hrc b/basctl/source/basicide/objdlg.hrc
index 930ab31a4ae8..0a3d59ae7176 100644
--- a/basctl/source/basicide/objdlg.hrc
+++ b/basctl/source/basicide/objdlg.hrc
@@ -31,7 +31,6 @@
 
 #define RID_BASICIDE_OBJCAT     ( RID_BASICIDE_START + 70 )
 #define RID_FT_MACRODESCR   8
-#define RID_IMGLST_TB_HC 9
 #define RID_TLB_MACROS     10
 #define RID_TB_TOOLBOX     11
 
diff --git a/basctl/source/basicide/objdlg.hxx b/basctl/source/basicide/objdlg.hxx
index cd48a135a882..e6e5c20e77da 100644
--- a/basctl/source/basicide/objdlg.hxx
+++ b/basctl/source/basicide/objdlg.hxx
@@ -54,8 +54,7 @@ public:
 class ObjectCatalogToolBox_Impl: public ToolBox
 {
 public:
-    ObjectCatalogToolBox_Impl(Window * pParent, ResId const & rResId,
-                              ResId const & rImagesHighContrastId);
+    ObjectCatalogToolBox_Impl(Window * pParent, ResId const & rResId);
 
 private:
     virtual void DataChanged(DataChangedEvent const & rDCEvt);
@@ -63,8 +62,6 @@ private:
     void setImages();
 
     ImageList m_aImagesNormal;
-    ImageList m_aImagesHighContrast;
-    bool m_bHighContrast;
 };
 
 class ObjectCatalog : public FloatingWindow
diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src
index c8de023dec53..8d07733b9319 100644
--- a/basctl/source/basicide/objdlg.src
+++ b/basctl/source/basicide/objdlg.src
@@ -75,15 +75,6 @@ FloatingWindow RID_BASICIDE_OBJCAT
             };
         };
     };
-    ImageList RID_IMGLST_TB_HC
-    {
-        Prefix = "imh";
-        MASKCOLOR
-        IdList =
-        {
-            TBITEM_SHOW ;
-        };
-    };
     FixedText RID_FT_MACRODESCR
     {
         WordBreak = TRUE ;