High-Contrast Cleanup Phase #1

3 files changed, 6 insertions, 61 deletions

diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index d63384a76f16..cd129d18576b 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -260,30 +260,6 @@ Image RID_SVXBMP_SIGNET_NOTVALIDATED
     };
     MaskColor = STD_MASKCOLOR;
 };
-Image RID_SVXBMP_SIGNET_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "signet_11x16_h.png" ;
-    };
-    MaskColor = STD_MASKCOLOR;
-};
-Image RID_SVXBMP_SIGNET_BROKEN_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "caution_11x16_h.png" ;
-    };
-    MaskColor = STD_MASKCOLOR;
-};
-Image RID_SVXBMP_SIGNET_NOTVALIDATED_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "notcertificate_16_h.png" ;
-    };
-    MaskColor = STD_MASKCOLOR;
-};
 
 
 Image RID_SVXBMP_SLIDERBUTTON
@@ -310,31 +286,6 @@ Image RID_SVXBMP_SLIDERINCREASE
     };
     MaskColor = STD_MASKCOLOR;
 };
-Image RID_SVXBMP_SLIDERBUTTON_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "navigationball_10_h.png" ;
-    };
-    MaskColor = STD_MASKCOLOR;
-};
-Image RID_SVXBMP_SLIDERDECREASE_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "slidezoomout_11_h.png" ;
-    };
-    MaskColor = STD_MASKCOLOR;
-};
-Image RID_SVXBMP_SLIDERINCREASE_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "slidezoomin_11_h.png" ;
-    };
-    MaskColor = STD_MASKCOLOR;
-};
-
 Image RID_SVXBMP_DOC_MODIFIED_YES
 {
     ImageBitmap = Bitmap
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 16f1e56be1fd..eda2ddda5eec 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -67,17 +67,13 @@ struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl
 
 XmlSecStatusBarControl::XmlSecStatusBarControl( USHORT _nSlotId,  USHORT _nId, StatusBar& _rStb )
     :SfxStatusBarControl( _nSlotId, _nId, _rStb )
-
     ,mpImpl( new XmlSecStatusBarControl_Impl )
 {
     mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
 
-    sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
-    mpImpl->maImage = Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_H : RID_SVXBMP_SIGNET ) );
-    mpImpl->maImageBroken =
-        Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_BROKEN_H : RID_SVXBMP_SIGNET_BROKEN ) );
-    mpImpl->maImageNotValidated =
-        Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_NOTVALIDATED_H : RID_SVXBMP_SIGNET_NOTVALIDATED ) );
+    mpImpl->maImage             = Image( SVX_RES( RID_SVXBMP_SIGNET              ) );
+    mpImpl->maImageBroken       = Image( SVX_RES( RID_SVXBMP_SIGNET_BROKEN       ) );
+    mpImpl->maImageNotValidated = Image( SVX_RES( RID_SVXBMP_SIGNET_NOTVALIDATED ) );
 }
 
 XmlSecStatusBarControl::~XmlSecStatusBarControl()
@@ -97,7 +93,6 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con
     }
     else if( pState->ISA( SfxUInt16Item ) )
     {
-//      mpImpl->mbSigned = ( ( SfxUInt16Item* ) pState )->GetValue() == 1 /* SIGNED*/ ;
         mpImpl->mnState = ( ( SfxUInt16Item* ) pState )->GetValue();
     }
     else
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 25f74964441c..5b9298a0b1eb 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -182,10 +182,9 @@ SvxZoomSliderControl::SvxZoomSliderControl( USHORT _nSlotId,  USHORT _nId, Statu
     SfxStatusBarControl( _nSlotId, _nId, _rStb ),
     mpImpl( new SvxZoomSliderControl_Impl )
 {
-    const sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
-    mpImpl->maSliderButton   = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERBUTTON_HC : RID_SVXBMP_SLIDERBUTTON ) );
-    mpImpl->maIncreaseButton = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERINCREASE_HC : RID_SVXBMP_SLIDERINCREASE ) );
-    mpImpl->maDecreaseButton = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERDECREASE_HC : RID_SVXBMP_SLIDERDECREASE ) );
+    mpImpl->maSliderButton   = Image( SVX_RES( RID_SVXBMP_SLIDERBUTTON   ) );
+    mpImpl->maIncreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERINCREASE ) );
+    mpImpl->maDecreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERDECREASE ) );
 }
 
 // -----------------------------------------------------------------------