diff options
author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-11-16 17:13:06 +0100 |
---|---|---|
committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-11-16 17:13:06 +0100 |
commit | f8beeada5726f64516405b7ffb966487da4cc519 (patch) | |
tree | d4d695ccff5b49ff0f7c8a4e2d6cda5887f4ce6f /cui/source/tabpages | |
parent | 426c475067b95b6427c1945b4024008f18554dd0 (diff) |
Remove more _HC references
Diffstat (limited to 'cui/source/tabpages')
-rw-r--r-- | cui/source/tabpages/align.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/align.hrc | 1 | ||||
-rw-r--r-- | cui/source/tabpages/align.src | 12 | ||||
-rw-r--r-- | cui/source/tabpages/border.cxx | 10 | ||||
-rw-r--r-- | cui/source/tabpages/border.hrc | 2 | ||||
-rw-r--r-- | cui/source/tabpages/border.src | 12 |
6 files changed, 3 insertions, 36 deletions
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 91dd75b57d83..772ee2a27fbb 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 f58e9ac221bc..133064889e9e 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 d7d267991073..d0e8f16b591e 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 ffe2fae38679..d4abee233e50 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 3f7699df951b..faf4837eebb7 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 811f5429aeb7..583302898e15 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 |