High-Contrast Cleanup Phase #1

16 files changed, 120 insertions, 253 deletions

diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index f9f8c69e6c1a..99c967143f82 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -144,7 +144,6 @@ friend class SfxOrganizeListBox_Impl;
 
     class SfxOrganizeDlg_Impl *pImp;
 
-//  virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 public:
     SfxTemplateOrganizeDlg(Window * pParent, SfxDocumentTemplates* = 0);
     ~SfxTemplateOrganizeDlg();
diff --git a/sfx2/inc/fwkhelper.hxx b/sfx2/inc/fwkhelper.hxx
index 34dd81bc3480..1b23e4c2bae6 100644
--- a/sfx2/inc/fwkhelper.hxx
+++ b/sfx2/inc/fwkhelper.hxx
@@ -33,6 +33,8 @@
 
 #include <rtl/ustring.hxx>
 
-SFX2_DLLPUBLIC void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+SFX2_DLLPUBLIC void SAL_CALL RefreshToolbars(
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame
+);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/imagemgr.hxx b/sfx2/inc/imagemgr.hxx
index 699786f6f5a7..5e27120e8f76 100644
--- a/sfx2/inc/imagemgr.hxx
+++ b/sfx2/inc/imagemgr.hxx
@@ -34,6 +34,10 @@
 #include <rtl/ustring.hxx>
 #include <vcl/image.hxx>
 
-SFX2_DLLPUBLIC Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+SFX2_DLLPUBLIC Image SAL_CALL GetImage(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& aURL,
+    BOOL bBig, BOOL bHiContrast
+);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 8b81029593eb..6787724675d6 100755
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -183,9 +183,7 @@
 #define RID_DEFAULTIMAGELIST_LC             (RID_SFX_START+17)
 #define RID_DEFAULTIMAGELIST_LM             (RID_SFX_START+18)
 #define RID_STYLEDLG                        (RID_SFX_START+28)
-#define RID_DEFAULTIMAGELIST_SCH            (RID_SFX_START+35)
 #define RID_DEFAULTIMAGELIST_SMH            (RID_SFX_START+36)
-#define RID_DEFAULTIMAGELIST_LCH            (RID_SFX_START+37)
 #define RID_DEFAULTIMAGELIST_LMH            (RID_SFX_START+38)
 #define RID_IMAGELIST_SCH                   (RID_SFX_START+39)
 #define RID_IMAGELIST_SMH                   (RID_SFX_START+40)
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index dca172269443..2f40809cfdb3 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -39,9 +39,6 @@
 #define MSG_ERR_VERSION_CFG                     (RID_SFX_APP_START+6)
 #define MSG_ERR_NO_WEBBROWSER_FOUND                 (RID_SFX_APP_START+7)
 
-// Note: no longer in use
-// #define MSG_ERR_EXTERNAL_APP_NOT_FOUND           (RID_SFX_APP_START+8)
-
 #define MSG_ISPRINTING_QUERYABORT               (RID_SFX_APP_START+9)
 #define MSG_CANT_QUIT                           (RID_SFX_APP_START+10)
 #define STR_ISMODIFIED                          (RID_SFX_APP_START+11)
@@ -161,13 +158,9 @@
 #define IMG_HELP_TOOLBOX_COPY                   (RID_SFX_APP_START+118)
 
 #define IMG_HELP_CONTENT_BOOK_OPEN              (RID_SFX_APP_START+120)
-#define IMG_HELP_CONTENT_BOOK_OPEN_HC           (RID_SFX_APP_START+121)
 #define IMG_HELP_CONTENT_BOOK_CLOSED            (RID_SFX_APP_START+122)
-#define IMG_HELP_CONTENT_BOOK_CLOSED_HC         (RID_SFX_APP_START+123)
 #define IMG_HELP_CONTENT_DOC                    (RID_SFX_APP_START+124)
 
-#define IMG_HELP_CONTENT_DOC_HC                 (RID_SFX_APP_START+125) // image
-
 #define IMG_MISSING_1                           (RID_SFX_APP_START+126) // image
 #define IMG_MISSING_2                           (RID_SFX_APP_START+127) // image
 #define IMG_MISSING_3                           (RID_SFX_APP_START+128) // image
@@ -203,16 +196,6 @@
 #define RID_HELP_ONSTARTUP_BOX                  (RID_SFX_APP_START+144)
 #define RID_HELP_ONSTARTUP_TEXT                 (RID_SFX_APP_START+145)
 
-#define IMG_HELP_TOOLBOX_HC_INDEX_ON            (RID_SFX_APP_START+150)
-#define IMG_HELP_TOOLBOX_HC_INDEX_OFF           (RID_SFX_APP_START+151)
-#define IMG_HELP_TOOLBOX_HC_START               (RID_SFX_APP_START+152)
-#define IMG_HELP_TOOLBOX_HC_PREV                (RID_SFX_APP_START+153)
-#define IMG_HELP_TOOLBOX_HC_NEXT                (RID_SFX_APP_START+154)
-#define IMG_HELP_TOOLBOX_HC_PRINT               (RID_SFX_APP_START+155)
-#define IMG_HELP_TOOLBOX_HC_BOOKMARKS           (RID_SFX_APP_START+156)
-#define IMG_HELP_TOOLBOX_HC_SEARCHDIALOG        (RID_SFX_APP_START+157)
-#define IMG_HELP_TOOLBOX_HC_COPY                (RID_SFX_APP_START+158)
-
 #define IMG_HELP_TOOLBOX_L_INDEX_ON             (RID_SFX_APP_START+160)
 #define IMG_HELP_TOOLBOX_L_INDEX_OFF            (RID_SFX_APP_START+161)
 #define IMG_HELP_TOOLBOX_L_START                (RID_SFX_APP_START+162)
@@ -223,16 +206,6 @@
 #define IMG_HELP_TOOLBOX_L_SEARCHDIALOG         (RID_SFX_APP_START+167)
 #define IMG_HELP_TOOLBOX_L_COPY                 (RID_SFX_APP_START+168)
 
-#define IMG_HELP_TOOLBOX_HCL_INDEX_ON           (RID_SFX_APP_START+170)
-#define IMG_HELP_TOOLBOX_HCL_INDEX_OFF          (RID_SFX_APP_START+171)
-#define IMG_HELP_TOOLBOX_HCL_START              (RID_SFX_APP_START+172)
-#define IMG_HELP_TOOLBOX_HCL_PREV               (RID_SFX_APP_START+173)
-#define IMG_HELP_TOOLBOX_HCL_NEXT               (RID_SFX_APP_START+174)
-#define IMG_HELP_TOOLBOX_HCL_PRINT              (RID_SFX_APP_START+175)
-#define IMG_HELP_TOOLBOX_HCL_BOOKMARKS          (RID_SFX_APP_START+176)
-#define IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG       (RID_SFX_APP_START+177)
-#define IMG_HELP_TOOLBOX_HCL_COPY               (RID_SFX_APP_START+178)
-
 #define RID_SECURITY_WARNING_HYPERLINK          (RID_SFX_APP_START + 180)
 #define RID_SECURITY_WARNING_TITLE              (RID_SFX_APP_START + 181)
 
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 22c4214c464c..cf8bf4bbcfd3 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -94,12 +94,12 @@ SfxModule_Impl::~SfxModule_Impl()
 
 ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, BOOL bBig, BOOL bHiContrast )
 {
-    ImageList*& rpList = bBig ? ( bHiContrast ? pImgListHiBig: pImgListBig ) :
+    ImageList*& rpList = bBig ? ( bHiContrast ? pImgListHiBig   : pImgListBig   ) :
                                 ( bHiContrast ? pImgListHiSmall : pImgListSmall );
     if ( !rpList )
     {
-        ResId aResId( bBig ? ( bHiContrast ? RID_DEFAULTIMAGELIST_LCH : RID_DEFAULTIMAGELIST_LC ) :
-                             ( bHiContrast ? RID_DEFAULTIMAGELIST_SCH : RID_DEFAULTIMAGELIST_SC ), *pResMgr );
+        ResId aResId( bBig ? ( RID_DEFAULTIMAGELIST_LC ) : ( RID_DEFAULTIMAGELIST_SC ), *pResMgr );
+
         aResId.SetRT( RSC_IMAGELIST );
 
         DBG_ASSERT( pResMgr->IsAvailable(aResId), "No default ImageList!" );
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index fd5b7193db0d..ec13aabeb353 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -292,13 +292,6 @@ ContentListBox_Impl::ContentListBox_Impl( Window* pParent, const ResId& rResId )
     aDocumentImage      ( SfxResId( IMG_HELP_CONTENT_DOC ) )
 
 {
-    if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        aOpenBookImage = Image( SfxResId( IMG_HELP_CONTENT_BOOK_OPEN_HC ) );
-        aClosedBookImage = Image( SfxResId( IMG_HELP_CONTENT_BOOK_CLOSED_HC ) );
-        aDocumentImage = Image( SfxResId( IMG_HELP_CONTENT_DOC_HC ) );
-    }
-
     SetWindowBits( WB_HIDESELECTION | WB_HSCROLL );
 
     SetEntryHeight( 16 );
@@ -2174,34 +2167,35 @@ sal_Bool SfxHelpTextWindow_Impl::HasSelection() const
 void SfxHelpTextWindow_Impl::InitToolBoxImages()
 {
     sal_Bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
-    sal_Bool bHiContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-    aIndexOnImage = Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_INDEX_ON : IMG_HELP_TOOLBOX_L_INDEX_ON
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) );
-    aIndexOffImage = Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_INDEX_OFF : IMG_HELP_TOOLBOX_L_INDEX_OFF
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) );
+
+    aIndexOnImage  = Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_INDEX_ON  : IMG_HELP_TOOLBOX_INDEX_ON  ) );
+    aIndexOffImage = Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) );
+
     aToolBox.SetItemImage( TBI_INDEX, bIsIndexOn ? aIndexOffImage : aIndexOnImage );
 
-    aToolBox.SetItemImage( TBI_BACKWARD, Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_PREV : IMG_HELP_TOOLBOX_L_PREV
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) );
-    aToolBox.SetItemImage( TBI_FORWARD, Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_NEXT : IMG_HELP_TOOLBOX_L_NEXT
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) );
-    aToolBox.SetItemImage( TBI_START, Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_START : IMG_HELP_TOOLBOX_L_START
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) );
-    aToolBox.SetItemImage( TBI_PRINT, Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_PRINT : IMG_HELP_TOOLBOX_L_PRINT
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) );
-    aToolBox.SetItemImage( TBI_BOOKMARKS, Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_BOOKMARKS : IMG_HELP_TOOLBOX_L_BOOKMARKS
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) );
-    aToolBox.SetItemImage( TBI_SEARCHDIALOG, Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG : IMG_HELP_TOOLBOX_L_SEARCHDIALOG
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) );
+    aToolBox.SetItemImage( TBI_BACKWARD,
+                           Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_PREV : IMG_HELP_TOOLBOX_PREV ) )
+    );
+
+    aToolBox.SetItemImage( TBI_FORWARD,
+                           Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_NEXT : IMG_HELP_TOOLBOX_NEXT ) )
+    );
+
+    aToolBox.SetItemImage( TBI_START,
+                           Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_START : IMG_HELP_TOOLBOX_START ) )
+    );
+
+    aToolBox.SetItemImage( TBI_PRINT,
+                           Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_PRINT : IMG_HELP_TOOLBOX_PRINT ) )
+    );
+
+    aToolBox.SetItemImage( TBI_BOOKMARKS,
+                           Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) )
+    );
+
+    aToolBox.SetItemImage( TBI_SEARCHDIALOG,
+                           Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) )
+    );
 
     Size aSize = aToolBox.CalcWindowSizePixel();
     aSize.Height() += TOOLBOX_OFFSET;
@@ -2580,7 +2574,6 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 
         if ( pCmdEvt->GetCommand() == COMMAND_CONTEXTMENU && pCmdWin != this && pCmdWin != &aToolBox )
         {
-            sal_Bool bHiContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
             Point aPos;
             if ( pCmdEvt->IsMouseEvent() )
                 aPos = pCmdEvt->GetMousePosPixel();
@@ -2589,33 +2582,44 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
             aPos.Y() += pTextWin->GetPosPixel().Y();
             PopupMenu aMenu;
             if ( bIsIndexOn )
-                aMenu.InsertItem( TBI_INDEX, aIndexOffText, Image( SfxResId(
-                    bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) ) );
+                aMenu.InsertItem( TBI_INDEX, aIndexOffText, Image( SfxResId( IMG_HELP_TOOLBOX_INDEX_OFF ) ) );
             else
-                aMenu.InsertItem( TBI_INDEX, aIndexOnText, Image( SfxResId(
-                    bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) ) );
+                aMenu.InsertItem( TBI_INDEX, aIndexOnText,  Image( SfxResId( IMG_HELP_TOOLBOX_INDEX_ON  ) ) );
+
             aMenu.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX );
             aMenu.InsertSeparator();
-            aMenu.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ),
-                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) );
+            aMenu.InsertItem( TBI_BACKWARD,
+                              String( SfxResId( STR_HELP_BUTTON_PREV  ) ),
+                              Image(  SfxResId( IMG_HELP_TOOLBOX_PREV ) )
+            );
             aMenu.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD );
             aMenu.EnableItem( TBI_BACKWARD, pHelpWin->HasHistoryPredecessor() );
-            aMenu.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ),
-                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) );
+            aMenu.InsertItem( TBI_FORWARD,
+                              String( SfxResId( STR_HELP_BUTTON_NEXT  ) ),
+                              Image(  SfxResId( IMG_HELP_TOOLBOX_NEXT ) )
+            );
             aMenu.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD );
             aMenu.EnableItem( TBI_FORWARD, pHelpWin->HasHistorySuccessor() );
-            aMenu.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ),
-                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) );
+            aMenu.InsertItem( TBI_START,
+                              String( SfxResId( STR_HELP_BUTTON_START  ) ),
+                              Image(  SfxResId( IMG_HELP_TOOLBOX_START ) )
+            );
             aMenu.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START );
             aMenu.InsertSeparator();
-            aMenu.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ),
-                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) );
+            aMenu.InsertItem( TBI_PRINT,
+                              String( SfxResId( STR_HELP_BUTTON_PRINT  ) ),
+                              Image(  SfxResId( IMG_HELP_TOOLBOX_PRINT ) )
+            );
             aMenu.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT );
-            aMenu.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ),
-                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) );
+            aMenu.InsertItem( TBI_BOOKMARKS,
+                              String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ),
+                              Image(  SfxResId( IMG_HELP_TOOLBOX_BOOKMARKS  ) )
+             );
             aMenu.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS );
-            aMenu.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ),
-                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) );
+            aMenu.InsertItem( TBI_SEARCHDIALOG,
+                              String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG  ) ),
+                              Image(  SfxResId( IMG_HELP_TOOLBOX_SEARCHDIALOG ) )
+            );
             aMenu.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG );
             aMenu.InsertSeparator();
             aMenu.InsertItem( TBI_SELECTIONMODE, String( SfxResId( STR_HELP_MENU_TEXT_SELECTION_MODE ) ) );
@@ -2637,8 +2641,10 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                 aMenu.CheckItem(TBI_SELECTIONMODE, bCheck);
             }
             aMenu.InsertSeparator();
-            aMenu.InsertItem( TBI_COPY, String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ),
-                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_COPY : IMG_HELP_TOOLBOX_COPY ) ) );
+            aMenu.InsertItem( TBI_COPY,
+                              String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ),
+                              Image(  SfxResId( IMG_HELP_TOOLBOX_COPY   ) )
+            );
             aMenu.SetHelpId( TBI_COPY, SID_COPY );
             aMenu.EnableItem( TBI_COPY, HasSelection() );
 
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index 8a2b4f760f7e..c59eb50b193b 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -207,113 +207,118 @@ Image IMG_HELP_TOOLBOX_INDEX_ON
     ImageBitmap = Bitmap { File = "indexon_small.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_INDEX_OFF
 {
     ImageBitmap = Bitmap { File = "indexoff_small.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_START
 {
     ImageBitmap = Bitmap { File = "sc06303.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_PREV
 {
     ImageBitmap = Bitmap { File = "sc06301.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_NEXT
 {
     ImageBitmap = Bitmap { File = "sc06300.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_PRINT
 {
     ImageBitmap = Bitmap { File = "sc05504.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_BOOKMARKS
 {
     ImageBitmap = Bitmap { File = "favourite.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_SEARCHDIALOG
 {
     ImageBitmap = Bitmap { File = "sc05961.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_COPY
 {
     ImageBitmap = Bitmap { File = "sc05711.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_CONTENT_BOOK_OPEN
 {
     ImageBitmap = Bitmap { File = "hlpbookopen.bmp" ; };
     MASKCOLOR_MAGENTA
 };
-Image IMG_HELP_CONTENT_BOOK_OPEN_HC
-{
-    ImageBitmap = Bitmap { File = "hlpbookopen_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
+
 Image IMG_HELP_CONTENT_BOOK_CLOSED
 {
     ImageBitmap = Bitmap { File = "hlpbookclosed.bmp" ; };
     MASKCOLOR_MAGENTA
 };
-Image IMG_HELP_CONTENT_BOOK_CLOSED_HC
-{
-    ImageBitmap = Bitmap { File = "hlpbookclosed_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
+
 Image IMG_HELP_CONTENT_DOC
 {
     ImageBitmap = Bitmap { File = "hlpdoc.bmp" ; };
     MASKCOLOR_MAGENTA
 };
-Image IMG_HELP_CONTENT_DOC_HC
-{
-    ImageBitmap = Bitmap { File = "hlpdoc_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
 
 String STR_HELP_WINDOW_TITLE
 {
     Text [ en-US ] = "%PRODUCTNAME Help";
 };
+
 String STR_HELP_BUTTON_INDEX_ON
 {
     Text [ en-US ] = "Show Navigation Pane";
 };
+
 String STR_HELP_BUTTON_INDEX_OFF
 {
     Text [ en-US ] = "Hide Navigation Pane";
 };
+
 String STR_HELP_BUTTON_START
 {
     Text [ en-US ] = "First Page";
 };
+
 String STR_HELP_BUTTON_PREV
 {
     Text [ en-US ] = "Previous Page";
 };
+
 String STR_HELP_BUTTON_NEXT
 {
     Text [ en-US ] = "Next Page";
 };
+
 String STR_HELP_BUTTON_PRINT
 {
     Text [ en-US ] = "Print...";
 };
+
 String STR_HELP_BUTTON_ADDBOOKMARK
 {
     Text [ en-US ] = "Add to Bookmarks...";
 };
+
 String STR_HELP_BUTTON_SEARCHDIALOG
 {
     Text [ en-US ] = "Find on this Page...";
 };
+
 String STR_HELP_BUTTON_SOURCEVIEW
 {
     Text [ en-US ] = "HTML Source";
@@ -323,18 +328,22 @@ String STR_HELP_FIRST_MESSAGE
 {
     Text [ en-US ] = "The Help is being started...";
 };
+
 String STR_HELP_FIRST_HTML
 {
     Text = "<html></head><body><center><br></br><br></br><p><tt>%1</tt></center></body></html>";
 };
+
 String STR_HELP_MENU_TEXT_SELECTION_MODE
 {
     Text [ en-US ] = "Select Text";
 };
+
 String STR_HELP_MENU_TEXT_COPY
 {
     Text [ en-US ] = "~Copy" ;
 };
+
 ModalDialog DLG_HELP_ADDBOOKMARK
 {
     Size = MAP_APPFONT ( 208 , 43 ) ;
@@ -428,144 +437,60 @@ InfoBox RID_INFO_NOSEARCHTEXTFOUND
     Message [ en-US ] = "The text you entered was not found.";
 };
 
-Image IMG_HELP_TOOLBOX_HC_INDEX_ON
-{
-    ImageBitmap = Bitmap { File = "indexon_small_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_INDEX_OFF
-{
-    ImageBitmap = Bitmap { File = "indexoff_small_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_START
-{
-    ImageBitmap = Bitmap { File = "sch06303.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_PREV
-{
-    ImageBitmap = Bitmap { File = "sch06301.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_NEXT
-{
-    ImageBitmap = Bitmap { File = "sch06300.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_PRINT
-{
-    ImageBitmap = Bitmap { File = "sch05504.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_BOOKMARKS
-{
-    ImageBitmap = Bitmap { File = "favourite_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_SEARCHDIALOG
-{
-    ImageBitmap = Bitmap { File = "sch05961.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_COPY
-{
-    ImageBitmap = Bitmap { File = "sch05711.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-
 Image IMG_HELP_TOOLBOX_L_INDEX_ON
 {
     ImageBitmap = Bitmap { File = "indexon_big.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_INDEX_OFF
 {
     ImageBitmap = Bitmap { File = "indexoff_big.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_START
 {
     ImageBitmap = Bitmap { File = "lc06303.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_PREV
 {
     ImageBitmap = Bitmap { File = "lc06301.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_NEXT
 {
     ImageBitmap = Bitmap { File = "lc06300.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_PRINT
 {
     ImageBitmap = Bitmap { File = "lc05504.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_BOOKMARKS
 {
     ImageBitmap = Bitmap { File = "favourite_big.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_SEARCHDIALOG
 {
     ImageBitmap = Bitmap { File = "lc05961.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_COPY
 {
     ImageBitmap = Bitmap { File = "lc05711.bmp" ; };
     MASKCOLOR_MAGENTA
 };
 
-Image IMG_HELP_TOOLBOX_HCL_INDEX_ON
-{
-    ImageBitmap = Bitmap { File = "indexon_big_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_INDEX_OFF
-{
-    ImageBitmap = Bitmap { File = "indexoff_big_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_START
-{
-    ImageBitmap = Bitmap { File = "lch06303.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_PREV
-{
-    ImageBitmap = Bitmap { File = "lch06301.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_NEXT
-{
-    ImageBitmap = Bitmap { File = "lch06300.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_PRINT
-{
-    ImageBitmap = Bitmap { File = "lch05504.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_BOOKMARKS
-{
-    ImageBitmap = Bitmap { File = "favourite_big_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG
-{
-    ImageBitmap = Bitmap { File = "lch05961.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_COPY
-{
-    ImageBitmap = Bitmap { File = "lch05711.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-
 CheckBox RID_HELP_ONSTARTUP_BOX
 {
     HelpId = HID_HELP_ONSTARTUP_BOX;
@@ -573,8 +498,8 @@ CheckBox RID_HELP_ONSTARTUP_BOX
     TabStop = TRUE;
     Size = MAP_APPFONT ( 200 , 10 ) ;
 };
+
 String RID_HELP_ONSTARTUP_TEXT
 {
     Text [ en-US ] = "~Display %PRODUCTNAME %MODULENAME Help at Startup";
 };
-
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 7f03bf416431..08940391ac87 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -65,8 +65,6 @@
 
 #define RID_ERRBOX_MAIL_CONFIG          ( RC_DIALOG_BEGIN + 92 )
 
-#define IMG_LST_STYLE_DESIGNER_HC       ( RC_DIALOG_BEGIN + 99 )
-
 // 100-106 in tbxcust.hrc
 #define STR_MACRO_LOSS                  ( RC_DIALOG_BEGIN + 107 )
 #define STR_CANCEL_RECORDING            ( RC_DIALOG_BEGIN + 108 )
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index aa3fd67dbbec..f6c3c046deae 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2417,9 +2417,7 @@ void SfxTemplateDialog_Impl::updateFamilyImages()
 // ------------------------------------------------------------------------
 void SfxTemplateDialog_Impl::updateNonFamilyImages()
 {
-    m_aActionTbR.SetImageList( ImageList( SfxResId(
-        m_pFloat->GetSettings().GetStyleSettings().GetHighContrastMode() ? IMG_LST_STYLE_DESIGNER_HC
-                                                             : DLG_STYLE_DESIGNER ) ) );
+    m_aActionTbR.SetImageList( ImageList( SfxResId( DLG_STYLE_DESIGNER ) ) );
 }
 
 // ------------------------------------------------------------------------
diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src
index a4adcd77b6d3..fcd6d33e55c6 100644
--- a/sfx2/source/dialog/templdlg.src
+++ b/sfx2/source/dialog/templdlg.src
@@ -42,18 +42,7 @@ ImageList DLG_STYLE_DESIGNER
     };
     IdCount = { 3 ; };
 };
-ImageList IMG_LST_STYLE_DESIGNER_HC
-{
-    Prefix = "sch";
-    MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-    IdList =
-    {
-        SID_STYLE_WATERCAN ;
-        SID_STYLE_NEW_BY_EXAMPLE ;
-        SID_STYLE_UPDATE_BY_EXAMPLE ;
-    };
-    IdCount = { 3 ; };
-};
+
  // RID_STYLECATALOG ------------------------------------------------------
 ModalDialog RID_STYLECATALOG
 {
@@ -136,11 +125,13 @@ ModalDialog RID_STYLECATALOG
         DropDown = TRUE ;
     };
 };
+
  // Strings ---------------------------------------------------------------
 String STR_STYLE_FILTER_HIERARCHICAL
 {
     Text [ en-US ] = "Hierarchical" ;
 };
+
  // DLG_STYLE_DESIGNER ----------------------------------------------------
 DockingWindow DLG_STYLE_DESIGNER
 {
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index 642aabbb0d68..ed5940cace31 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -251,12 +251,7 @@ namespace sfx2
 
         // Get the closer bitmap and set it as right most button.
         Image aImage( SfxResId( SFX_IMG_CLOSE_DOC ) );
-        Image aImageHC( SfxResId( SFX_IMG_CLOSE_DOC_HC ) );
-        m_aToolbox.InsertItem( 1,
-                GetSettings().GetStyleSettings().GetHighContrastMode()
-            ?   aImageHC
-            :   aImage
-        );
+        m_aToolbox.InsertItem( 1, aImage );
         m_aToolbox.ShowItem( 1 );
     }
 
diff --git a/sfx2/source/dialog/titledockwin.src b/sfx2/source/dialog/titledockwin.src
index 3f52e84ab75d..ede6c4b8c4d1 100644
--- a/sfx2/source/dialog/titledockwin.src
+++ b/sfx2/source/dialog/titledockwin.src
@@ -31,9 +31,3 @@ Image SFX_IMG_CLOSE_DOC
 {
     ImageBitmap = Bitmap { File = "closedoc.png" ; };
 };
-
-Image SFX_IMG_CLOSE_DOC_HC
-{
-    ImageBitmap = Bitmap { File = "closedochc.png" ; };
-};
-
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 975362305756..b03efa255725 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -157,9 +157,6 @@ void SfxPreviewWin_Impl::ImpPaint(
         pWindow->SetLineColor( aBlackCol );
         pWindow->SetFillColor( aWhiteCol );
         pWindow->DrawRect( Rectangle( aPoint + Point( FRAME, FRAME ), bPoint + Point( FRAME, FRAME ) ) );
-//!     pFile->Move( Point( FRAME, FRAME ) );
-//!     pFile->Scale( Fraction( aTmpSize.Width(), aSize.Width() ),
-//!                   Fraction( aTmpSize.Height(), aSize.Height() ) );
         pFile->WindStart();
         pFile->Play( pWindow, aPoint + Point( FRAME, FRAME ), aSize  );
     }
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index 202ed6f6f00f..7096d71fabdc 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -69,7 +69,6 @@
 #define SFX_IMG_PROPERTY_REMOVE             (RID_SFX_SFXLOCAL_START +  0)
 #define SFX_IMG_PROPERTY_REMOVE_HC          (RID_SFX_SFXLOCAL_START +  1)
 #define SFX_IMG_CLOSE_DOC                   (RID_SFX_SFXLOCAL_START +  2)
-#define SFX_IMG_CLOSE_DOC_HC                (RID_SFX_SFXLOCAL_START +  3)
 
 #endif
 
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 7dc74d5b0fc8..6fbae6a6b99e 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -84,10 +84,6 @@ typedef std::hash_map< sal_Int64, sal_Int64 > SfxImageManagerMap;
 static SfxImageManager_Impl* pGlobalImageManager = 0;
 static SfxImageManagerMap    m_ImageManager_ImplMap;
 static SfxImageManagerMap    m_ImageManagerMap;
-static ImageList*            pImageListSmall=0;
-static ImageList*            pImageListBig=0;
-static ImageList*            pImageListHiSmall=0;
-static ImageList*            pImageListHiBig=0;
 
 static SfxImageManager_Impl* GetImageManager( SfxModule* pModule )
 {
@@ -118,40 +114,32 @@ static SfxImageManager_Impl* GetImageManager( SfxModule* pModule )
 }
 
 // Global image list
-static ImageList* GetImageList( BOOL bBig, BOOL bHiContrast )
+static ImageList* GetImageList( BOOL bBig )
 {
     SolarMutexGuard aGuard;
+    ImageList* rpList = NULL;
 
-    // Has to be changed if we know how the IDs are named!!!
-    ImageList*& rpList = bBig ? ( bHiContrast ? pImageListHiBig : pImageListBig ) :
-                                ( bHiContrast ? pImageListHiSmall : pImageListSmall );
-    if ( !rpList )
-    {
-        ResMgr *pResMgr = SfxApplication::GetOrCreate()->GetOffResManager_Impl();
+    ResMgr *pResMgr = SfxApplication::GetOrCreate()->GetOffResManager_Impl();
 
-        ResId aResId( bBig ? ( bHiContrast ? RID_DEFAULTIMAGELIST_LCH : RID_DEFAULTIMAGELIST_LC ) :
-                             ( bHiContrast ? RID_DEFAULTIMAGELIST_SCH : RID_DEFAULTIMAGELIST_SC ), *pResMgr);
+    ResId aResId( bBig ? ( RID_DEFAULTIMAGELIST_LC ) : ( RID_DEFAULTIMAGELIST_SC ), *pResMgr);
 
-        aResId.SetRT( RSC_IMAGELIST );
+    aResId.SetRT( RSC_IMAGELIST );
 
-        DBG_ASSERT( pResMgr->IsAvailable(aResId), "No default ImageList!" );
+    DBG_ASSERT( pResMgr->IsAvailable(aResId), "No default ImageList!" );
 
-        if ( pResMgr->IsAvailable(aResId) )
-            rpList = new ImageList( aResId );
-        else
-            rpList = new ImageList();
-    }
+    if ( pResMgr->IsAvailable(aResId) )
+        rpList = new ImageList( aResId );
+    else
+        rpList = new ImageList();
 
     return rpList;
 }
 
-static sal_Int16 impl_convertBools( sal_Bool bLarge, sal_Bool bHiContrast )
+static sal_Int16 impl_convertBools( sal_Bool bLarge )
 {
     sal_Int16 nIndex( 0 );
     if ( bLarge  )
         nIndex += 1;
-    if ( bHiContrast )
-        nIndex += 2;
     return nIndex;
 }
 
@@ -183,11 +171,11 @@ SfxImageManager_Impl::~SfxImageManager_Impl()
 
 ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig, BOOL bHiContrast )
 {
-    sal_Int32 nIndex = impl_convertBools( bBig, bHiContrast );
+    sal_Int32 nIndex = impl_convertBools( bBig );
     if ( !m_pImageList[nIndex] )
     {
         if ( !m_pModule )
-            m_pImageList[nIndex] = ::GetImageList( bBig, bHiContrast );
+            m_pImageList[nIndex] = ::GetImageList( bBig );
         else
             m_pImageList[nIndex] = m_pModule->GetImageList_Impl( bBig, bHiContrast );
     }