Remove more _HC references

10 files changed, 4 insertions, 72 deletions

diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index e93cc6b23..c80706aeb 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -811,27 +811,3 @@ Image RID_SVXBMP_HLDOCNTP
     ImageBitmap = Bitmap { File = "hldocntp.bmp" ; };
     MASKCOLOR
 };
-
-Image RID_SVXBMP_HLINETTP_H
-{
-    ImageBitmap = Bitmap { File = "hlinettp_h.bmp" ; };
-    MASKCOLOR
-};
-
-Image RID_SVXBMP_HLMAILTP_H
-{
-    ImageBitmap = Bitmap { File = "hlmailtp_h.bmp" ; };
-    MASKCOLOR
-};
-
-Image RID_SVXBMP_HLDOCTP_H
-{
-    ImageBitmap = Bitmap { File = "hldoctp_h.bmp" ; };
-    MASKCOLOR
-};
-
-Image RID_SVXBMP_HLDOCNTP_H
-{
-    ImageBitmap = Bitmap { File = "hldocntp_h.bmp" ; };
-    MASKCOLOR
-};
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index b1d1a3d1c..0143dd25b 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -227,9 +227,7 @@ SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
     pImpl               ( new SvxSaveTabPage_Impl )
 
 {
-    sal_Bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-    aODFWarningFI.SetImage(
-        Image( CUI_RES( bHighContrast ? IMG_ODF_WARNING_HC : IMG_ODF_WARNING ) ) );
+    aODFWarningFI.SetImage( Image( CUI_RES( IMG_ODF_WARNING )));
 
     FreeResource();
 
diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc
index 6ded85c61..06388569e 100644
--- a/cui/source/options/optsave.hrc
+++ b/cui/source/options/optsave.hrc
@@ -59,7 +59,6 @@
 #define FI_ODF_WARNING          50
 
 #define IMG_ODF_WARNING         1
-#define IMG_ODF_WARNING_HC      2
 
 #define APP_WRITER              0
 #define APP_WRITER_WEB          1
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 1a44118d6..7c804c3cc 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -228,14 +228,6 @@ TabPage RID_SFXPAGE_SAVE
         };
         MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
     };
-    Image IMG_ODF_WARNING_HC
-    {
-        ImageBitmap = Bitmap
-        {
-            File = "odfwarning_h.png";
-        };
-        MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
-    };
 };
 
 ModalDialog RID_SVXDLG_FILTER_WARNING
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 6e7511dbf..fe4c00d00 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -322,7 +322,7 @@ void AlignmentTabPage::InitVsRefEgde()
     // remember selection - is deleted in call to ValueSet::Clear()
     USHORT nSel = maVsRefEdge.GetSelectItemId();
 
-    ResId aResId( GetSettings().GetStyleSettings().GetHighContrastMode() ? IL_LOCK_BMPS_HC : IL_LOCK_BMPS, CUI_MGR() );
+    ResId aResId( IL_LOCK_BMPS, CUI_MGR() );
     ImageList aImageList( aResId );
     Size aItemSize( aImageList.GetImage( IID_BOTTOMLOCK ).GetSizePixel() );
 
diff --git a/cui/source/tabpages/align.hrc b/cui/source/tabpages/align.hrc
index 1a38c86bd..baae1be9d 100644
--- a/cui/source/tabpages/align.hrc
+++ b/cui/source/tabpages/align.hrc
@@ -74,7 +74,6 @@
 
 // image list for ValueSets:
 #define IL_LOCK_BMPS                1100
-#define IL_LOCK_BMPS_HC				1101
 #define IID_BOTTOMLOCK              1
 #define IID_TOPLOCK                 2
 #define IID_CELLLOCK                3
diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src
index efe363149..87f6593b5 100644
--- a/cui/source/tabpages/align.src
+++ b/cui/source/tabpages/align.src
@@ -222,18 +222,6 @@ TabPage RID_SVXPAGE_ALIGNMENT
         };
         IdCount = { 3 ; };
     };
-    ImageList IL_LOCK_BMPS_HC
-    {
-        Prefix = "loh";
-        MaskColor = IL_LOCK_MCOL ;
-        IdList =
-        {
-            IID_BOTTOMLOCK ;
-            IID_TOPLOCK ;
-            IID_CELLLOCK ;
-        };
-        IdCount = { 3 ; };
-    };
     String STR_BOTTOMLOCK
     {
         Text [ en-US ] = "Text Extension From Lower Cell Border" ;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index e080287ac..22c8468bb 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -215,9 +215,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
         aPropertiesFL   ( this, CUI_RES( FL_PROPERTIES ) ),
         aMergeWithNextCB( this, CUI_RES( CB_MERGEWITHNEXT ) ),
         aMergeAdjacentBordersCB( this, CUI_RES( CB_MERGEADJACENTBORDERS ) ),
-        aShadowImgLstH( CUI_RES(ILH_SDW_BITMAPS)),
         aShadowImgLst( CUI_RES(IL_SDW_BITMAPS)),
-        aBorderImgLstH( CUI_RES(ILH_PRE_BITMAPS)),
         aBorderImgLst( CUI_RES(IL_PRE_BITMAPS)),
         nMinValue(0),
         nSWMode(0),
@@ -1044,9 +1042,7 @@ USHORT SvxBorderTabPage::GetPresetStringId( USHORT nValueSetIdx ) const
 
 void SvxBorderTabPage::FillPresetVS()
 {
-    // find correct image list
-    bool bHC = aWndPresets.GetSettings().GetStyleSettings().GetHighContrastMode();
-    ImageList& rImgList = bHC ? aBorderImgLstH : aBorderImgLst;
+    ImageList& rImgList = aBorderImgLst;
     Size aImgSize( rImgList.GetImage( IID_PRE_CELL_NONE ).GetSizePixel() );
 
     // basic initialization of the ValueSet
@@ -1071,9 +1067,7 @@ void SvxBorderTabPage::FillPresetVS()
 
 void SvxBorderTabPage::FillShadowVS()
 {
-    // find correct image list
-    bool bHC = aWndPresets.GetSettings().GetStyleSettings().GetHighContrastMode();
-    ImageList& rImgList = bHC ? aShadowImgLstH : aShadowImgLst;
+    ImageList& rImgList = aShadowImgLst;
     Size aImgSize( rImgList.GetImage( IID_SHADOWNONE ).GetSizePixel() );
 
     // basic initialization of the ValueSet
diff --git a/cui/source/tabpages/border.hrc b/cui/source/tabpages/border.hrc
index 2d7359ef1..c346ef248 100644
--- a/cui/source/tabpages/border.hrc
+++ b/cui/source/tabpages/border.hrc
@@ -70,7 +70,6 @@
 
 // ImageListe fuer ValueSets:
 #define IL_PRE_BITMAPS			1400
-#define ILH_PRE_BITMAPS         1401
 #define IID_PRE_CELL_NONE       1
 #define IID_PRE_CELL_ALL        2
 #define IID_PRE_CELL_LR         3
@@ -94,7 +93,6 @@
 #define IID_PRE_TABLE_OUTER2    21
 
 #define IL_SDW_BITMAPS			1500
-#define ILH_SDW_BITMAPS         1501
 #define IID_SHADOWNONE			1
 #define IID_SHADOW_BOT_RIGHT	2
 #define IID_SHADOW_BOT_LEFT		3
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
index a2ad4d617..cfd1069fb 100644
--- a/cui/source/tabpages/border.src
+++ b/cui/source/tabpages/border.src
@@ -324,12 +324,6 @@ TabPage RID_SVXPAGE_BORDER
         MaskColor = STD_MASKCOLOR ;
         _PREVIEW_IDLIST_
     };
-    ImageList ILH_PRE_BITMAPS
-    {
-        Prefix = "prh";
-        MaskColor = STD_MASKCOLOR ;
-        _PREVIEW_IDLIST_
-    };
 
 #define _SHADOW_IDLIST_             \
         IdList =                    \
@@ -348,12 +342,6 @@ TabPage RID_SVXPAGE_BORDER
         MaskColor = STD_MASKCOLOR ;
         _SHADOW_IDLIST_
     };
-    ImageList ILH_SDW_BITMAPS
-    {
-        Prefix = "shh";
-        MaskColor = STD_MASKCOLOR ;
-        _SHADOW_IDLIST_
-    };
 };
 
 String RID_SVXSTR_TABLE_PRESET_NONE