Remove the last of HC icons

6 files changed, 43 insertions, 57 deletions

diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 8a86510efce7..ba50426e04aa 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -116,7 +116,6 @@ SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) :
     aWrapOutsideCB      (this, SW_RES(CB_ONLYOUTSIDE)),
 
     aWrapIL             (SW_RES(IL_WRAP)),
-    aWrapILH            (SW_RES(ILH_WRAP)),
 
     nAnchorId(FLY_AT_PARA),
     nHtmlMode(0),
@@ -703,26 +702,25 @@ void SwWrapTabPage::DataChanged( const DataChangedEvent& rDCEvt )
 
 void SwWrapTabPage::ApplyImageList()
 {
-    ImageList& rImgLst = GetSettings().GetStyleSettings().GetHighContrastMode() ?
-        aWrapILH : aWrapIL;
+    ImageList& rImgLst = aWrapIL;
 
     aWrapThroughRB.SetModeRadioImage(rImgLst.GetImage(IMG_THROUGH));
     BOOL bWrapOutline =  !aWrapOutlineCB.IsChecked();
     if(bWrapOutline)
     {
-        aNoWrapRB.SetModeRadioImage(rImgLst.GetImage(IMG_NONE));
-        aWrapLeftRB.SetModeRadioImage(rImgLst.GetImage(IMG_LEFT));
-        aWrapRightRB.SetModeRadioImage(rImgLst.GetImage(IMG_RIGHT));
-        aWrapParallelRB.SetModeRadioImage(rImgLst.GetImage(IMG_PARALLEL));
-        aIdealWrapRB.SetModeRadioImage(rImgLst.GetImage(IMG_IDEAL));
+        aNoWrapRB.SetModeRadioImage(       rImgLst.GetImage( IMG_NONE     ));
+        aWrapLeftRB.SetModeRadioImage(     rImgLst.GetImage( IMG_LEFT     ));
+        aWrapRightRB.SetModeRadioImage(    rImgLst.GetImage( IMG_RIGHT    ));
+        aWrapParallelRB.SetModeRadioImage( rImgLst.GetImage( IMG_PARALLEL ));
+        aIdealWrapRB.SetModeRadioImage(    rImgLst.GetImage( IMG_IDEAL    ));
     }
     else
     {
-        aNoWrapRB.SetModeRadioImage(rImgLst.GetImage( IMG_KON_NONE ));
-        aWrapLeftRB.SetModeRadioImage(rImgLst.GetImage( IMG_KON_LEFT ));
-        aWrapRightRB.SetModeRadioImage(rImgLst.GetImage( IMG_KON_RIGHT ));
-        aWrapParallelRB.SetModeRadioImage(rImgLst.GetImage(IMG_KON_PARALLEL ));
-        aIdealWrapRB.SetModeRadioImage(rImgLst.GetImage( IMG_KON_IDEAL ));
+        aNoWrapRB.SetModeRadioImage(       rImgLst.GetImage( IMG_KON_NONE     ));
+        aWrapLeftRB.SetModeRadioImage(     rImgLst.GetImage( IMG_KON_LEFT     ));
+        aWrapRightRB.SetModeRadioImage(    rImgLst.GetImage( IMG_KON_RIGHT    ));
+        aWrapParallelRB.SetModeRadioImage( rImgLst.GetImage( IMG_KON_PARALLEL ));
+        aIdealWrapRB.SetModeRadioImage(    rImgLst.GetImage( IMG_KON_IDEAL    ));
     }
 }
 
diff --git a/sw/source/ui/frmdlg/wrap.hrc b/sw/source/ui/frmdlg/wrap.hrc
index be19dbe702c2..5874b161e012 100644
--- a/sw/source/ui/frmdlg/wrap.hrc
+++ b/sw/source/ui/frmdlg/wrap.hrc
@@ -24,13 +24,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#define RB_NO_WRAP          2
-#define RB_WRAP_LEFT        3
-#define RB_WRAP_RIGHT       4
-#define RB_WRAP_PARALLEL    5
-#define RB_WRAP_THROUGH     6
-#define RB_WRAP_IDEAL       7
-#define CB_ANCHOR_ONLY      8
+#define RB_NO_WRAP           2
+#define RB_WRAP_LEFT         3
+#define RB_WRAP_RIGHT        4
+#define RB_WRAP_PARALLEL     5
+#define RB_WRAP_THROUGH      6
+#define RB_WRAP_IDEAL        7
+#define CB_ANCHOR_ONLY       8
 #define FT_LEFT_MARGIN      13
 #define ED_LEFT_MARGIN      14
 #define FT_RIGHT_MARGIN     15
@@ -39,28 +39,25 @@
 #define ED_TOP_MARGIN       18
 #define ED_BOTTOM_MARGIN    19
 #define FT_BOTTOM_MARGIN    20
-#define FL_MARGIN                       21
+#define FL_MARGIN           21
 #define CB_TRANSPARENT      22
 #define CB_OUTLINE          23
-#define FL_OPTION                       24
+#define FL_OPTION           24
 #define CB_ONLYOUTSIDE      25
-#define FL_OPTION_SEP                       26
-#define C_WRAP_FL                      31
+#define FL_OPTION_SEP       26
+#define C_WRAP_FL           31
 
 #define IL_WRAP             32
-#define ILH_WRAP            33
 // nur fuer die ImageList
-#define IMG_BEGIN       1
-#define IMG_NONE        (IMG_BEGIN)
-#define IMG_LEFT        (IMG_BEGIN + 1)
-#define IMG_RIGHT               (IMG_BEGIN + 2)
-#define IMG_PARALLEL            (IMG_BEGIN + 3)
-#define IMG_THROUGH             (IMG_BEGIN + 4)
-#define IMG_IDEAL       (IMG_BEGIN + 5)
-#define IMG_KON_NONE        (IMG_BEGIN + 6)
-#define IMG_KON_LEFT            (IMG_BEGIN + 7)
-#define IMG_KON_RIGHT           (IMG_BEGIN + 8)
-#define IMG_KON_PARALLEL        (IMG_BEGIN + 9)
-#define IMG_KON_IDEAL           (IMG_BEGIN + 10)
-
-
+#define IMG_BEGIN           1
+#define IMG_NONE            (IMG_BEGIN)
+#define IMG_LEFT            (IMG_BEGIN +  1)
+#define IMG_RIGHT           (IMG_BEGIN +  2)
+#define IMG_PARALLEL        (IMG_BEGIN +  3)
+#define IMG_THROUGH         (IMG_BEGIN +  4)
+#define IMG_IDEAL           (IMG_BEGIN +  5)
+#define IMG_KON_NONE        (IMG_BEGIN +  6)
+#define IMG_KON_LEFT        (IMG_BEGIN +  7)
+#define IMG_KON_RIGHT       (IMG_BEGIN +  8)
+#define IMG_KON_PARALLEL    (IMG_BEGIN +  9)
+#define IMG_KON_IDEAL       (IMG_BEGIN + 10)
diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx
index 21a3ecd4dcf4..91e16972596b 100644
--- a/sw/source/ui/inc/navipi.hxx
+++ b/sw/source/ui/inc/navipi.hxx
@@ -70,7 +70,6 @@ class SwNavigationPI : public Window,
     SwNavHelpToolBox    aContentToolBox;
     SwHelpToolBox       aGlobalToolBox;
     ImageList           aContentImageList;
-    ImageList           aContentImageListH;
     SwContentTree       aContentTree;
     SwGlobalTree        aGlobalTree;
     ListBox             aDocListBox;
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index fd4fc8befa04..fd8c88f25dfe 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -93,10 +93,9 @@ SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind )
     InsertWindow( ED_FORMULA, &aEdit);
     SetHelpId(ED_FORMULA, HID_EDIT_FORMULA);
 
-    BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-    SetItemImage( FN_FORMULA_CALC, pManager->GetImage(FN_FORMULA_CALC, bHC ));
-    SetItemImage( FN_FORMULA_CANCEL, pManager->GetImage(FN_FORMULA_CANCEL, bHC  ));
-    SetItemImage( FN_FORMULA_APPLY, pManager->GetImage(FN_FORMULA_APPLY, bHC  ));
+    SetItemImage( FN_FORMULA_CALC,   pManager->GetImage(FN_FORMULA_CALC   ));
+    SetItemImage( FN_FORMULA_CANCEL, pManager->GetImage(FN_FORMULA_CANCEL ));
+    SetItemImage( FN_FORMULA_APPLY,  pManager->GetImage(FN_FORMULA_APPLY  ));
 
     SetItemBits( FN_FORMULA_CALC, GetItemBits( FN_FORMULA_CALC ) | TIB_DROPDOWNONLY );
     SetDropdownClickHdl( LINK( this, SwInputWindow, DropdownClickHdl ));
@@ -154,11 +153,9 @@ void SwInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
         //      update item images
         SwModule *pMod  = SW_MOD();
         SfxImageManager *pImgMgr = SfxImageManager::GetImageManager( pMod );
-        BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-        //
-        SetItemImage( FN_FORMULA_CALC,   pImgMgr->GetImage(FN_FORMULA_CALC,   bHC ));
-        SetItemImage( FN_FORMULA_CANCEL, pImgMgr->GetImage(FN_FORMULA_CANCEL, bHC ));
-        SetItemImage( FN_FORMULA_APPLY,  pImgMgr->GetImage(FN_FORMULA_APPLY,  bHC ));
+        SetItemImage( FN_FORMULA_CALC,   pImgMgr->GetImage(FN_FORMULA_CALC   ));
+        SetItemImage( FN_FORMULA_CANCEL, pImgMgr->GetImage(FN_FORMULA_CANCEL ));
+        SetItemImage( FN_FORMULA_APPLY,  pImgMgr->GetImage(FN_FORMULA_APPLY  ));
     }
 
     ToolBox::DataChanged( rDCEvt );
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index f345ff574100..3bf6dbf8cda5 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -707,7 +707,6 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
     aContentToolBox(this, SW_RES(TB_CONTENT)),
     aGlobalToolBox(this, SW_RES(TB_GLOBAL)),
     aContentImageList(SW_RES(IL_CONTENT)),
-    aContentImageListH(SW_RES(ILH_CONTENT)),
     aContentTree(this, SW_RES(TL_CONTENT)),
     aGlobalTree(this, SW_RES(TL_GLOBAL)),
     aDocListBox(this, SW_RES(LB_DOCS)),
@@ -1266,11 +1265,9 @@ void SwNavigationPI::SetRegionDropMode(USHORT nNewMode)
     else if(nRegionMode == REGION_MODE_EMBEDDED)
         nDropId = FN_DROP_REGION_COPY;
 
-    ImageList& rImgLst = aContentToolBox.GetSettings().GetStyleSettings().GetHighContrastMode()
-                ? aContentImageListH : aContentImageList;
+    ImageList& rImgLst = aContentImageList;
 
-    aContentToolBox.SetItemImage( FN_DROP_REGION,
-                                    rImgLst.GetImage(nDropId));
+    aContentToolBox.SetItemImage( FN_DROP_REGION, rImgLst.GetImage(nDropId));
 }
 
 
@@ -1399,8 +1396,7 @@ void SwNavigationPI::InitImageList()
 {
     USHORT k;
 
-    ImageList& rImgLst = aContentToolBox.GetSettings().GetStyleSettings().GetHighContrastMode() ?
-                aContentImageListH : aContentImageList;
+    ImageList& rImgLst = aContentImageList;
     for( k = 0; k < aContentToolBox.GetItemCount(); k++)
             aContentToolBox.SetItemImage(aContentToolBox.GetItemId(k),
                     rImgLst.GetImage(aContentToolBox.GetItemId(k)));
diff --git a/sw/source/ui/utlui/navipi.hrc b/sw/source/ui/utlui/navipi.hrc
index 8254e2dc92a9..f669387d8161 100644
--- a/sw/source/ui/utlui/navipi.hrc
+++ b/sw/source/ui/utlui/navipi.hrc
@@ -31,7 +31,6 @@
 #define BT_UP               5
 #define BT_DOWN             6
 #define IL_CONTENT          7
-#define ILH_CONTENT         8
 #define FT_PAGE             10
 #define ED_PAGE             11
 #define LB_SELECT           22