Removing the last of the HC ions from libs-core

1 files changed, 12 insertions, 55 deletions

diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index ea12345abe51..e7bc6010d280 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -286,12 +286,6 @@ SdrHdlBitmapSet& getModernSet()
     return *aModernSet.get();
 }
 
-SdrHdlBitmapSet& getHighContrastSet()
-{
-    static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aHighContrastSet(new SdrHdlBitmapSet(SIP_SA_ACCESSIBILITY_MARKERS));
-    return *aHighContrastSet.get();
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 SdrHdl::SdrHdl():
@@ -625,24 +619,16 @@ BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) const
         case Rect_7x7:          eRetval = Rect_9x9;         break;
         case Rect_9x9:          eRetval = Rect_11x11;       break;
         case Rect_11x11:        eRetval = Rect_13x13;       break;
-        //case Rect_13x13:      eRetval = ; break;
 
         case Circ_7x7:          eRetval = Circ_9x9;         break;
         case Circ_9x9:          eRetval = Circ_11x11;       break;
-        //case Circ_11x11:      eRetval = ; break;
 
         case Elli_7x9:          eRetval = Elli_9x11;        break;
-        //case Elli_9x11:           eRetval = ; break;
 
         case Elli_9x7:          eRetval = Elli_11x9;        break;
-        //case Elli_11x9:           eRetval = ; break;
 
         case RectPlus_7x7:      eRetval = RectPlus_9x9;     break;
         case RectPlus_9x9:      eRetval = RectPlus_11x11;   break;
-        //case RectPlus_11x11:  eRetval = ; break;
-
-        //case Crosshair:           eRetval = ; break;
-        //case Glue:                eRetval = ; break;
 
         // #98388# let anchor blink with it's pressed state
         case Anchor:            eRetval = AnchorPressed;    break;
@@ -657,22 +643,15 @@ BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) const
 }
 
 // #101928#
-BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine, sal_Bool bIsHighContrast)
+BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine )
 {
-    if(bIsHighContrast)
+    if(bFine)
     {
-        return getHighContrastSet().GetBitmapEx(eKindOfMarker, nInd);
+        return getModernSet().GetBitmapEx(eKindOfMarker, nInd);
     }
     else
     {
-        if(bFine)
-        {
-            return getModernSet().GetBitmapEx(eKindOfMarker, nInd);
-        }
-        else
-        {
-            return getSimpleSet().GetBitmapEx(eKindOfMarker, nInd);
-        }
+        return getSimpleSet().GetBitmapEx(eKindOfMarker, nInd);
     }
 }
 
@@ -682,8 +661,6 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd,
 {
     ::sdr::overlay::OverlayObject* pRetval = 0L;
     sal_Bool bIsFineHdl(pHdlList->IsFineHdl());
-    const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-    sal_Bool bIsHighContrast(rStyleSettings.GetHighContrastMode());
 
     // support bigger sizes
     sal_Bool bForceBiggerSize(sal_False);
@@ -693,17 +670,6 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd,
         bForceBiggerSize = sal_True;
     }
 
-    // #101928# ...for high contrast, too.
-    if(!bForceBiggerSize && bIsHighContrast)
-    {
-        // #107925#
-        // ...but not for anchors, else they will not blink when activated
-        if(Anchor != eKindOfMarker && AnchorTR != eKindOfMarker)
-        {
-            bForceBiggerSize = sal_True;
-        }
-    }
-
     if(bForceBiggerSize)
     {
         eKindOfMarker = GetNextBigger(eKindOfMarker);
@@ -741,11 +707,12 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd,
 
         // create animated hdl
         // #101928# use ImpGetBitmapEx(...) now
-        BitmapEx aBmpEx1 = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl, bIsHighContrast);
-        BitmapEx aBmpEx2 = ImpGetBitmapEx(eNextBigger, (sal_uInt16)eColIndex, bIsFineHdl, bIsHighContrast);
+        BitmapEx aBmpEx1 = ImpGetBitmapEx( eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl );
+        BitmapEx aBmpEx2 = ImpGetBitmapEx( eNextBigger,   (sal_uInt16)eColIndex, bIsFineHdl );
 
         // #i53216# Use system cursor blink time. Use the unsigned value.
-        const sal_uInt32 nBlinkTime((sal_uInt32)Application::GetSettings().GetStyleSettings().GetCursorBlinkTime());
+        const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
+        const sal_uInt32 nBlinkTime((sal_uInt32)rStyleSettings.GetCursorBlinkTime());
 
         if(eKindOfMarker == Anchor || eKindOfMarker == AnchorPressed)
         {
@@ -773,7 +740,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd,
     {
         // create normal handle
         // #101928# use ImpGetBitmapEx(...) now
-        BitmapEx aBmpEx = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl, bIsHighContrast);
+        BitmapEx aBmpEx = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl );
 
         if(eKindOfMarker == Anchor || eKindOfMarker == AnchorPressed)
         {
@@ -2277,16 +2244,9 @@ SdrCropHdl::SdrCropHdl(const Point& rPnt, SdrHdlKind eNewKind)
 
 // --------------------------------------------------------------------
 
-BitmapEx SdrCropHdl::GetHandlesBitmap( bool bIsFineHdl, bool bIsHighContrast )
+BitmapEx SdrCropHdl::GetHandlesBitmap( bool bIsFineHdl )
 {
-    if( bIsHighContrast )
-    {
-        static BitmapEx* pHighContrastBitmap = 0;
-        if( pHighContrastBitmap == 0 )
-            pHighContrastBitmap = new BitmapEx(ResId(SIP_SA_ACCESSIBILITY_CROP_MARKERS, *ImpGetResMgr()));
-        return *pHighContrastBitmap;
-    }
-    else if( bIsFineHdl )
+    if( bIsFineHdl )
     {
         static BitmapEx* pModernBitmap = 0;
         if( pModernBitmap == 0 )
@@ -2358,12 +2318,9 @@ void SdrCropHdl::CreateB2dIAObject()
     {
         sal_Bool bIsFineHdl(pHdlList->IsFineHdl());
         const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-        sal_Bool bIsHighContrast(rStyleSettings.GetHighContrastMode());
         int nHdlSize = pHdlList->GetHdlSize();
-        if( bIsHighContrast )
-            nHdlSize = 4;
 
-        const BitmapEx aHandlesBitmap( GetHandlesBitmap( bIsFineHdl, bIsHighContrast ) );
+        const BitmapEx aHandlesBitmap( GetHandlesBitmap( bIsFineHdl ) );
         BitmapEx aBmpEx1( GetBitmapForHandle( aHandlesBitmap, nHdlSize ) );
 
         for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)