Removing the last of the HC ions from libs-core

14 files changed, 259 insertions, 419 deletions

diff --git a/svx/inc/svdstr.hrc b/svx/inc/svdstr.hrc
index 56744d86ad..841f987a1a 100644
--- a/svx/inc/svdstr.hrc
+++ b/svx/inc/svdstr.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -701,8 +701,6 @@
 
 #define BMP_SVXOLEOBJ						(SIP_Begin + 261)
 
-#define SIP_SA_ACCESSIBILITY_MARKERS		(SIP_Begin + 262)
-
 #define STR_TABLE_ATTR						(SIP_Begin + 263)
 #define STR_TABLE_AUTOFMT					(SIP_Begin + 264)
 #define STR_TABLE_INSCOL					(SIP_Begin + 265)
@@ -718,8 +716,7 @@
 #define STR_TABLE_STYLE_SETTINGS			(SIP_Begin + 275)
 #define SIP_SA_CROP_MARKERS					(SIP_Begin + 276)
 #define SIP_SA_CROP_FINE_MARKERS			(SIP_Begin + 277)
-#define SIP_SA_ACCESSIBILITY_CROP_MARKERS	(SIP_Begin + 278)
 
-#define	SIP_End								(SIP_SA_ACCESSIBILITY_CROP_MARKERS)
+#define	SIP_End								(SIP_SA_CROP_FINE_MARKERS)
 
 #define SDR_ResourceEnd						(SIP_End)
diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx
index af674b6f75..e731deb650 100644
--- a/svx/inc/svx/itemwin.hxx
+++ b/svx/inc/svx/itemwin.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,6 @@ class SfxObjectShell;
 
 class SvxLineBox : public LineLB
 {
-    BmpColorMode	meBmpMode;
     USHORT			nCurPos;
     Timer			aDelayTimer;
     Size            aLogicalSize;
@@ -57,7 +56,7 @@ class SvxLineBox : public LineLB
     void			ReleaseFocus_Impl();
 #endif
 public:
-    SvxLineBox( Window* pParent, 
+    SvxLineBox( Window* pParent,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                 WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
     ~SvxLineBox();
@@ -93,7 +92,7 @@ class SvxColorBox : public ColorLB
 #endif
 
 public:
-    SvxColorBox( Window* pParent, 
+    SvxColorBox( Window* pParent,
                  const rtl::OUString& rCommand,
                  const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                  WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
@@ -135,7 +134,7 @@ protected:
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 
 public:
-    SvxMetricField( Window* pParent, 
+    SvxMetricField( Window* pParent,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
                     WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT );
     ~SvxMetricField();
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
index f7eb26b084..c67fae1e91 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,7 +65,7 @@ namespace sdr
             // scaling (e.g. for EmptyPresObj's), the correct graphic and other stuff. It is used from
             // createViewIndependentPrimitive2DSequence with false, and with evtl. HighContrast true
             // from the VOC which knows that
-            drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceWithParameters(bool bHighContrast) const;
+            drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceWithParameters() const;
 
         protected:
             // This method is responsible for creating the graphical visualisation data
diff --git a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index 23baf9515f..66015d4a97 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
+#ifndef INCLUDED_SDR_PRIMITIVE2D_SdrOleContentPrimitive2D_HXX
 #define INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
@@ -55,9 +55,6 @@ namespace drawinglayer
             // be expensive, e.g. triggering chart creation)
             sal_uInt32                                  mnGraphicVersion;
 
-            // bitfield
-            unsigned                                    mbHighContrast : 1;
-
         protected:
             // local decomposition.
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
@@ -65,9 +62,9 @@ namespace drawinglayer
         public:
             SdrOleContentPrimitive2D(
                 const SdrOle2Obj& rSdrOle2Obj,
-                const basegfx::B2DHomMatrix& rObjectTransform, 
-                sal_uInt32 nGraphicVersion,
-                bool bHighContrast);
+                const basegfx::B2DHomMatrix& rObjectTransform,
+                sal_uInt32 nGraphicVersion
+            );
 
             // compare operator
             virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
@@ -78,7 +75,6 @@ namespace drawinglayer
             // data access
             const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; }
             sal_uInt32 getGraphicVersion() const { return mnGraphicVersion; }
-            bool getHighContrast() const { return mbHighContrast; }
 
             // provide unique ID
             DeclPrimitrive2DIDBlock()
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index a98c8fde30..4d40eac061 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -66,7 +66,7 @@ class MouseEvent;
 // Modus selektiert wird.
 // HDL_MOVE...HDL_LWRGT muessen im enum immer zusammen stehen bleiben!
 
-enum SdrHdlKind 
+enum SdrHdlKind
 {
     HDL_MOVE,		// Handle zum Verschieben des Objekts
     HDL_UPLFT,		// Oben links
@@ -150,7 +150,7 @@ class SVX_DLLPUBLIC SdrHdl
     friend class				SdrHdlList;
 
     // #101928#
-    BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine, sal_Bool bIsHighContrast);
+    BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine );
 
 protected:
     SdrObject*					pObj;      // Gehoert das Handle zu einem Objekt?
@@ -173,9 +173,9 @@ protected:
     unsigned					bSelect : 1;   // Ein selektierter Polygonpunkt?
     unsigned					b1PixMore : 1; // True=Handle wird 1 Pixel groesser dargestellt
     unsigned					bPlusHdl : 1;  // u.a. fuer Hld-Paint Optimierung bei MarkPoint/UnmarkPoint, ...
-    
+
     bool						mbMoveOutside; // forces this handle to be moved outside of the selection rectangle
-    
+
     // create marker for this kind
     virtual void CreateB2dIAObject();
 
@@ -187,7 +187,7 @@ private:
 
 protected:
     ::sdr::overlay::OverlayObject* CreateOverlayObject(
-        const basegfx::B2DPoint& rPos, 
+        const basegfx::B2DPoint& rPos,
         BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker, Point aMoveOutsideOffset = Point());
     BitmapMarkerKind GetNextBigger(BitmapMarkerKind eKnd) const;
 
@@ -524,7 +524,7 @@ protected:
 
     BitmapEx GetBitmapForHandle( const BitmapEx& rBitmap, int nSize );
 
-    static BitmapEx GetHandlesBitmap( bool bIsFineHdl, bool bIsHighContrast );
+    static BitmapEx GetHandlesBitmap( bool bIsFineHdl );
 };
 
 #endif //_SVDHDL_HXX
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
index 0b7e8fb3cb..8fc0b57aed 100644
--- a/svx/source/dialog/hyprlink.cxx
+++ b/svx/source/dialog/hyprlink.cxx
@@ -795,13 +795,11 @@ void SvxHyperlinkDlg::DataChanged( const DataChangedEvent& rDCEvt )
 
 void SvxHyperlinkDlg::SetImages()
 {
-    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-    SetItemImage( BTN_LINK, mpManager->GetImage( BTN_LINK, bHighContrast ) );
-    SetItemImage( BTN_INSERT_BOOKMARK, mpManager->GetImage( BTN_INSERT_BOOKMARK, bHighContrast ) );
-    SetItemImage( BTN_INET_SEARCH, mpManager->GetImage( BTN_INET_SEARCH, bHighContrast ) );
-    SetItemImage( BTN_TARGET, mpManager->GetImage( BTN_TARGET, bHighContrast ) );
-    SetItemImage( BTN_OPENDIALOG, mpManager->GetImage( BTN_OPENDIALOG, bHighContrast ) );
+    SetItemImage( BTN_LINK,             mpManager->GetImage( BTN_LINK            ) );
+    SetItemImage( BTN_INSERT_BOOKMARK,  mpManager->GetImage( BTN_INSERT_BOOKMARK ) );
+    SetItemImage( BTN_INET_SEARCH,      mpManager->GetImage( BTN_INET_SEARCH     ) );
+    SetItemImage( BTN_TARGET,           mpManager->GetImage( BTN_TARGET          ) );
+    SetItemImage( BTN_OPENDIALOG,       mpManager->GetImage( BTN_OPENDIALOG      ) );
 }
 
 /*--------------------------------------------------------------------
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index f804560a21..0f602eabec 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
index dfa3214c0b..1ad45c22c3 100644
--- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -69,8 +69,7 @@ namespace sdr
         {
         }
 
-        drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createPrimitive2DSequenceWithParameters(
-            bool bHighContrast) const
+        drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createPrimitive2DSequenceWithParameters() const
         {
             // take unrotated snap rect (direct model data) for position and size
             const Rectangle& rRectangle = GetOle2Obj().GetGeoRect();
@@ -88,7 +87,7 @@ namespace sdr
             const SfxItemSet& rItemSet = GetOle2Obj().GetMergedItemSet();
             const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
                 drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
-                    rItemSet, 
+                    rItemSet,
                     GetOle2Obj().getText(0)));
 
             // #i102063# embed OLE content in an own primitive; this will be able to decompose accessing
@@ -102,18 +101,17 @@ namespace sdr
 
                     // #i104867# add GraphicVersion number to be able to check for
                     // content change in the primitive later
-                    GetOle2Obj().getEmbeddedObjectRef().getGraphicVersion(),
+                    GetOle2Obj().getEmbeddedObjectRef().getGraphicVersion()
+                ));
 
-                    bHighContrast));
-            
-            // create primitive. Use Ole2 primitive here. Prepare attribute settings, will 
-            // be used soon anyways. Always create primitives to allow the decomposition of 
+            // create primitive. Use Ole2 primitive here. Prepare attribute settings, will
+            // be used soon anyways. Always create primitives to allow the decomposition of
             // SdrOle2Primitive2D to create needed invisible elements for HitTest and/or BoundRect
             const drawinglayer::primitive2d::Primitive2DSequence xOLEContent(&xOleContent, 1);
             const drawinglayer::primitive2d::Primitive2DReference xReference(
                 new drawinglayer::primitive2d::SdrOle2Primitive2D(
                     xOLEContent,
-                    aObjectMatrix, 
+                    aObjectMatrix,
                     aAttribute));
 
             return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
@@ -121,8 +119,7 @@ namespace sdr
 
         drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createViewIndependentPrimitive2DSequence() const
         {
-            // do as if no HC and call standard creator
-            return createPrimitive2DSequenceWithParameters(false);
+            return createPrimitive2DSequenceWithParameters();
         }
     } // end of namespace contact
 } // end of namespace sdr
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
index 318f20633e..7a5da52ee3 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -77,7 +77,7 @@ namespace sdr
             const bool bIsInplaceActive((nState == embed::EmbedStates::INPLACE_ACTIVE) || (nState == embed::EmbedStates::UI_ACTIVE));
             const bool bIsChart(rSdrOle2.IsChart());
             bool bDone(false);
- 
+
             if(!bDone && bIsInplaceActive)
             {
                 if( !GetObjectContact().isOutputToPrinter() && !GetObjectContact().isOutputToRecordingMetaFile() )
@@ -119,7 +119,7 @@ namespace sdr
                     // determine if embedding and PrettyPrinting shall be done at all
                     uno::Reference< frame::XModel > xChartModel;
                     bool bDoChartPrettyPrinting(true);
-                    
+
                     // the original ChartPrettyPainter does not do it for Window
                     if(bDoChartPrettyPrinting && GetObjectContact().isOutputToWindow())
                     {
@@ -195,7 +195,7 @@ namespace sdr
 
                     // create OLE primitive stuff directly at VC with HC as parameter
                     const ViewContactOfSdrOle2Obj& rVC = static_cast< const ViewContactOfSdrOle2Obj& >(GetViewContact());
-                    xRetval = rVC.createPrimitive2DSequenceWithParameters(GetObjectContact().isDrawModeHighContrast());
+                    xRetval = rVC.createPrimitive2DSequenceWithParameters();
                 }
 
                 if(bIsOutplaceActive)
@@ -216,8 +216,8 @@ namespace sdr
                             false); // no filling
 
                         const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::PolyPolygonHatchPrimitive2D(
-                            basegfx::B2DPolyPolygon(aObjectOutline), 
-                            Color(COL_BLACK).getBColor(), 
+                            basegfx::B2DPolyPolygon(aObjectOutline),
+                            Color(COL_BLACK).getBColor(),
                             aFillHatch));
 
                         drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xReference);
@@ -225,7 +225,7 @@ namespace sdr
                 }
 
             }
-            
+
             return xRetval;
         }
 
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index 0b38a9679a..f71148c72d 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,9 +53,7 @@ namespace drawinglayer
 
             if(pSource)
             {
-                Graphic* pOLEGraphic = (getHighContrast()) 
-                    ? pSource->getEmbeddedObjectRef().GetHCGraphic()
-                    : pSource->GetGraphic();
+                Graphic* pOLEGraphic = pSource->GetGraphic();
 
                 if(pOLEGraphic)
                 {
@@ -77,7 +75,7 @@ namespace drawinglayer
                 const GraphicObject aGraphicObject(aGraphic);
                 const GraphicAttr aGraphicAttr;
                 drawinglayer::primitive2d::Primitive2DSequence xOLEContent;
-                
+
                 if(bScaleContent)
                 {
                     // get transformation atoms
@@ -110,8 +108,8 @@ namespace drawinglayer
 
                         const drawinglayer::primitive2d::Primitive2DReference aGraphicPrimitive(
                             new drawinglayer::primitive2d::GraphicPrimitive2D(
-                                aInnerObjectMatrix, 
-                                aGraphicObject, 
+                                aInnerObjectMatrix,
+                                aGraphicObject,
                                 aGraphicAttr));
                         drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aGraphicPrimitive);
                     }
@@ -121,8 +119,8 @@ namespace drawinglayer
                     // create graphic primitive for content
                     const drawinglayer::primitive2d::Primitive2DReference aGraphicPrimitive(
                         new drawinglayer::primitive2d::GraphicPrimitive2D(
-                            getObjectTransform(), 
-                            aGraphicObject, 
+                            getObjectTransform(),
+                            aGraphicObject,
                             aGraphicAttr));
                     drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aGraphicPrimitive);
                 }
@@ -151,34 +149,32 @@ namespace drawinglayer
 
         SdrOleContentPrimitive2D::SdrOleContentPrimitive2D(
             const SdrOle2Obj& rSdrOle2Obj,
-            const basegfx::B2DHomMatrix& rObjectTransform, 
-            sal_uInt32 nGraphicVersion,
-            bool bHighContrast)
+            const basegfx::B2DHomMatrix& rObjectTransform,
+            sal_uInt32 nGraphicVersion
+        )
         :	BufferedDecompositionPrimitive2D(),
             mpSdrOle2Obj(const_cast< SdrOle2Obj* >(&rSdrOle2Obj)),
             maObjectTransform(rObjectTransform),
-            mnGraphicVersion(nGraphicVersion),
-            mbHighContrast(bHighContrast)
+            mnGraphicVersion(nGraphicVersion)
         {
         }
 
         bool SdrOleContentPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
         {
-            if(BufferedDecompositionPrimitive2D::operator==(rPrimitive))
+            if( BufferedDecompositionPrimitive2D::operator==(rPrimitive) )
             {
                 const SdrOleContentPrimitive2D& rCompare = (SdrOleContentPrimitive2D&)rPrimitive;
                 const bool bBothNot(!mpSdrOle2Obj.is() && !rCompare.mpSdrOle2Obj.is());
-                const bool bBothAndEqual(mpSdrOle2Obj.is() && rCompare.mpSdrOle2Obj.is() 
+                const bool bBothAndEqual(mpSdrOle2Obj.is() && rCompare.mpSdrOle2Obj.is()
                     && mpSdrOle2Obj.get() == rCompare.mpSdrOle2Obj.get());
-                
+
                 return ((bBothNot || bBothAndEqual)
                     && getObjectTransform() == rCompare.getObjectTransform()
 
                     // #i104867# to find out if the Graphic content of the
                     // OLE has changed, use GraphicVersion number
                     && getGraphicVersion() == rCompare.getGraphicVersion()
-
-                    && getHighContrast() == rCompare.getHighContrast());
+                );
             }
 
             return false;
@@ -188,7 +184,7 @@ namespace drawinglayer
         {
             basegfx::B2DRange aRange(0.0, 0.0, 1.0, 1.0);
             aRange.transform(getObjectTransform());
-            
+
             return aRange;
         }
 
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 6165d5ba2c..fc5b07ccfc 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -140,129 +140,129 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, UIN
 
     switch(eKindOfMarker)
     {
-        default: 
+        default:
         {
-            DBG_ERROR( "unknown kind of marker" );	
+            DBG_ERROR( "unknown kind of marker" );
             // no break here, return Rect_7x7 as default
         }
-        case Rect_7x7: 
+        case Rect_7x7:
         {
             return impGetOrCreateTargetBitmap((0 * INDEX_COUNT) + nInd, Rectangle(Point(0, nYPos), Size(7, 7)));
         }
 
-        case Rect_9x9: 
+        case Rect_9x9:
         {
             return impGetOrCreateTargetBitmap((1 * INDEX_COUNT) + nInd, Rectangle(Point(7, nYPos), Size(9, 9)));
         }
 
-        case Rect_11x11: 
+        case Rect_11x11:
         {
             return impGetOrCreateTargetBitmap((2 * INDEX_COUNT) + nInd, Rectangle(Point(16, nYPos), Size(11, 11)));
         }
 
-        case Rect_13x13: 
+        case Rect_13x13:
         {
             const sal_uInt16 nIndex((3 * INDEX_COUNT) + nInd);
 
             switch(nInd)
             {
-                case 0: 
+                case 0:
                 {
-                    return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(72, 66), Size(13, 13))); 
+                    return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(72, 66), Size(13, 13)));
                 }
-                case 1: 
+                case 1:
                 {
-                    return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(85, 66), Size(13, 13))); 
+                    return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(85, 66), Size(13, 13)));
                 }
-                case 2: 
+                case 2:
                 {
-                    return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(72, 78), Size(13, 13))); 
+                    return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(72, 78), Size(13, 13)));
                 }
-                case 3: 
+                case 3:
                 {
-                    return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(85, 78), Size(13, 13))); 
+                    return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(85, 78), Size(13, 13)));
                 }
-                case 4: 
+                case 4:
                 {
-                    return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(98, 78), Size(13, 13))); 
+                    return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(98, 78), Size(13, 13)));
                 }
-                default: // case 5: 
+                default: // case 5:
                 {
-                    return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(98, 66), Size(13, 13))); 
+                    return impGetOrCreateTargetBitmap(nIndex, Rectangle(Point(98, 66), Size(13, 13)));
                 }
             }
         }
 
-        case Circ_7x7: 
+        case Circ_7x7:
         {
             return impGetOrCreateTargetBitmap((4 * INDEX_COUNT) + nInd, Rectangle(Point(27, nYPos), Size(7, 7)));
         }
 
-        case Circ_9x9: 
+        case Circ_9x9:
         case Customshape1:
         {
             return impGetOrCreateTargetBitmap((5 * INDEX_COUNT) + nInd, Rectangle(Point(34, nYPos), Size(9, 9)));
         }
 
-        case Circ_11x11: 
+        case Circ_11x11:
         {
             return impGetOrCreateTargetBitmap((6 * INDEX_COUNT) + nInd, Rectangle(Point(43, nYPos), Size(11, 11)));
         }
 
-        case Elli_7x9: 
+        case Elli_7x9:
         {
             return impGetOrCreateTargetBitmap((7 * INDEX_COUNT) + nInd, Rectangle(Point(54, nYPos), Size(7, 9)));
         }
 
-        case Elli_9x11: 
+        case Elli_9x11:
         {
             return impGetOrCreateTargetBitmap((8 * INDEX_COUNT) + nInd, Rectangle(Point(61, nYPos), Size(9, 11)));
         }
 
-        case Elli_9x7: 
+        case Elli_9x7:
         {
             return impGetOrCreateTargetBitmap((9 * INDEX_COUNT) + nInd, Rectangle(Point(70, nYPos), Size(9, 7)));
         }
 
-        case Elli_11x9: 
+        case Elli_11x9:
         {
             return impGetOrCreateTargetBitmap((10 * INDEX_COUNT) + nInd, Rectangle(Point(79, nYPos), Size(11, 9)));
         }
 
-        case RectPlus_7x7: 
+        case RectPlus_7x7:
         {
             return impGetOrCreateTargetBitmap((11 * INDEX_COUNT) + nInd, Rectangle(Point(90, nYPos), Size(7, 7)));
         }
 
-        case RectPlus_9x9: 
+        case RectPlus_9x9:
         {
             return impGetOrCreateTargetBitmap((12 * INDEX_COUNT) + nInd, Rectangle(Point(97, nYPos), Size(9, 9)));
         }
 
-        case RectPlus_11x11: 
+        case RectPlus_11x11:
         {
             return impGetOrCreateTargetBitmap((13 * INDEX_COUNT) + nInd, Rectangle(Point(106, nYPos), Size(11, 11)));
         }
 
-        case Crosshair: 
+        case Crosshair:
         {
             return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 0, Rectangle(Point(0, 68), Size(15, 15)));
         }
 
-        case Glue: 
+        case Glue:
         {
             return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 1, Rectangle(Point(15, 74), Size(9, 9)));
         }
 
         case Anchor: // #101688# AnchorTR for SW
-        case AnchorTR: 
+        case AnchorTR:
         {
             return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 2, Rectangle(Point(24, 68), Size(24, 23)));
         }
 
         // #98388# add AnchorPressed to be able to aninate anchor control
-        case AnchorPressed: 
-        case AnchorPressedTR: 
+        case AnchorPressed:
+        case AnchorPressedTR:
         {
             return impGetOrCreateTargetBitmap((KIND_COUNT * INDEX_COUNT) + 3, Rectangle(Point(48, 68), Size(24, 23)));
         }
@@ -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():
@@ -336,33 +330,33 @@ SdrHdl::~SdrHdl()
     GetRidOfIAObject();
 }
 
-void SdrHdl::Set1PixMore(BOOL bJa) 
-{ 
+void SdrHdl::Set1PixMore(BOOL bJa)
+{
     if(b1PixMore != bJa)
     {
-        b1PixMore = bJa; 
+        b1PixMore = bJa;
 
         // create new display
         Touch();
     }
 }
 
-void SdrHdl::SetMoveOutside( bool bMoveOutside ) 
-{ 
+void SdrHdl::SetMoveOutside( bool bMoveOutside )
+{
     if(mbMoveOutside != bMoveOutside)
     {
-        mbMoveOutside = bMoveOutside; 
+        mbMoveOutside = bMoveOutside;
 
         // create new display
         Touch();
     }
 }
 
-void SdrHdl::SetDrehWink(long n) 
-{ 
+void SdrHdl::SetDrehWink(long n)
+{
     if(nDrehWink != n)
     {
-        nDrehWink = n; 
+        nDrehWink = n;
 
         // create new display
         Touch();
@@ -381,37 +375,37 @@ void SdrHdl::SetPos(const Point& rPnt)
     }
 }
 
-void SdrHdl::SetSelected(BOOL bJa) 
-{ 
+void SdrHdl::SetSelected(BOOL bJa)
+{
     if(bSelect != bJa)
     {
         // remember new value
-        bSelect = bJa; 
+        bSelect = bJa;
 
         // create new display
         Touch();
     }
 }
 
-void SdrHdl::SetHdlList(SdrHdlList* pList)  
+void SdrHdl::SetHdlList(SdrHdlList* pList)
 {
     if(pHdlList != pList)
     {
         // rememver list
         pHdlList = pList;
-    
+
         // now its possible to create graphic representation
         Touch();
     }
 }
 
-void SdrHdl::SetObj(SdrObject* pNewObj)     
-{ 
+void SdrHdl::SetObj(SdrObject* pNewObj)
+{
     if(pObj != pNewObj)
     {
         // remember new object
-        pObj = pNewObj; 
-    
+        pObj = pNewObj;
+
         // graphic representation may have changed
         Touch();
     }
@@ -442,12 +436,12 @@ void SdrHdl::CreateB2dIAObject()
         BitmapMarkerKind eKindOfMarker = Rect_7x7;
 
         BOOL bRot = pHdlList->IsRotateShear();
-        if(pObj) 
+        if(pObj)
             eColIndex = (bSelect) ? Cyan : LightCyan;
-        if(bRot) 
-        { 
+        if(bRot)
+        {
             // Drehhandles in Rot
-            if(pObj && bSelect) 
+            if(pObj && bSelect)
                 eColIndex = Red;
             else
                 eColIndex = LightRed;
@@ -577,20 +571,20 @@ void SdrHdl::CreateB2dIAObject()
                 if(rPageWindow.GetPaintWindow().OutputToWindow())
                 {
                     Point aMoveOutsideOffset(0, 0);
-                    
+
                     // add offset if necessary
                     if(pHdlList->IsMoveOutside() || mbMoveOutside)
                     {
                         OutputDevice& rOutDev = rPageWindow.GetPaintWindow().GetOutputDevice();
                         Size aOffset = rOutDev.PixelToLogic(Size(4, 4));
 
-                        if(eKind == HDL_UPLFT || eKind == HDL_UPPER || eKind == HDL_UPRGT) 
+                        if(eKind == HDL_UPLFT || eKind == HDL_UPPER || eKind == HDL_UPRGT)
                             aMoveOutsideOffset.Y() -= aOffset.Width();
-                        if(eKind == HDL_LWLFT || eKind == HDL_LOWER || eKind == HDL_LWRGT) 
+                        if(eKind == HDL_LWLFT || eKind == HDL_LOWER || eKind == HDL_LWRGT)
                             aMoveOutsideOffset.Y() += aOffset.Height();
-                        if(eKind == HDL_UPLFT || eKind == HDL_LEFT  || eKind == HDL_LWLFT) 
+                        if(eKind == HDL_UPLFT || eKind == HDL_LEFT  || eKind == HDL_LWLFT)
                             aMoveOutsideOffset.X() -= aOffset.Width();
-                        if(eKind == HDL_UPRGT || eKind == HDL_RIGHT || eKind == HDL_LWRGT) 
+                        if(eKind == HDL_UPRGT || eKind == HDL_RIGHT || eKind == HDL_LWRGT)
                             aMoveOutsideOffset.X() += aOffset.Height();
                     }
 
@@ -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,33 +643,24 @@ 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);
     }
 }
 
 ::sdr::overlay::OverlayObject* SdrHdl::CreateOverlayObject(
-    const basegfx::B2DPoint& rPos, 
+    const basegfx::B2DPoint& rPos,
     BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker, Point aMoveOutsideOffset)
 {
     ::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);
@@ -692,17 +669,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)
     {
@@ -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)
         {
@@ -763,9 +730,9 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd,
         {
             // create centered handle as default
             pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime,
-                (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, 
+                (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
                 (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
-                (UINT16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1, 
+                (UINT16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1,
                 (UINT16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1);
         }
     }
@@ -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)
         {
@@ -783,7 +750,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd,
         else if(eKindOfMarker == AnchorTR || eKindOfMarker == AnchorPressedTR)
         {
             // #101688# AnchorTR for SW, take top right as (0,0)
-            pRetval = new ::sdr::overlay::OverlayBitmapEx(rPos, aBmpEx, 
+            pRetval = new ::sdr::overlay::OverlayBitmapEx(rPos, aBmpEx,
                 (UINT16)(aBmpEx.GetSizePixel().Width() - 1), 0);
         }
         else
@@ -929,7 +896,7 @@ BOOL SdrHdl::IsFocusHdl() const
         //case HDL_ANCHOR:		// anchor symbol (SD, SW)
         // #101688# same for AnchorTR
         //case HDL_ANCHOR_TR:	// anchor symbol (SD, SW)
-        
+
         //case HDL_TRNS:		// interactive transparence
         //case HDL_GRAD:		// interactive gradient
         //case HDL_COLR:		// interactive color
@@ -985,7 +952,7 @@ void SdrHdlColor::CreateB2dIAObject()
 {
     // first throw away old one
     GetRidOfIAObject();
-    
+
     if(pHdlList)
     {
         SdrMarkView* pView = pHdlList->GetView();
@@ -1007,11 +974,11 @@ void SdrHdlColor::CreateB2dIAObject()
                         {
                             Bitmap aBmpCol(CreateColorDropper(aMarkerColor));
                             basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
-                            ::sdr::overlay::OverlayObject* pNewOverlayObject = new 
+                            ::sdr::overlay::OverlayObject* pNewOverlayObject = new
                                 ::sdr::overlay::OverlayBitmapEx(
-                                    aPosition, 
-                                    BitmapEx(aBmpCol), 
-                                    (UINT16)(aBmpCol.GetSizePixel().Width() - 1) >> 1, 
+                                    aPosition,
+                                    BitmapEx(aBmpCol),
+                                    (UINT16)(aBmpCol.GetSizePixel().Width() - 1) >> 1,
                                     (UINT16)(aBmpCol.GetSizePixel().Height() - 1) >> 1
                                 );
                             DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
@@ -1153,7 +1120,7 @@ void SdrHdlGradient::CreateB2dIAObject()
 {
     // first throw away old one
     GetRidOfIAObject();
-    
+
     if(pHdlList)
     {
         SdrMarkView* pView = pHdlList->GetView();
@@ -1182,34 +1149,34 @@ void SdrHdlGradient::CreateB2dIAObject()
                             INT32 nMidX = (INT32)(aPos.X() + aVec.getX() * fLongPercentArrow);
                             INT32 nMidY = (INT32)(aPos.Y() + aVec.getY() * fLongPercentArrow);
                             Point aMidPoint(nMidX, nMidY);
-                            
+
                             basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
                             basegfx::B2DPoint aMidPos(aMidPoint.X(), aMidPoint.Y());
 
-                            ::sdr::overlay::OverlayObject* pNewOverlayObject = new 
+                            ::sdr::overlay::OverlayObject* pNewOverlayObject = new
                                 ::sdr::overlay::OverlayLineStriped(
                                     aPosition, aMidPos
                                 );
                             DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
-                            
+
                             pNewOverlayObject->setBaseColor(IsGradient() ? Color(COL_BLACK) : Color(COL_BLUE));
                             rPageWindow.GetOverlayManager()->add(*pNewOverlayObject);
                             maOverlayGroup.append(*pNewOverlayObject);
 
                             // arrowhead
-                            Point aLeft(aMidPoint.X() + (INT32)(aPerpend.getX() * fHalfArrowWidth), 
+                            Point aLeft(aMidPoint.X() + (INT32)(aPerpend.getX() * fHalfArrowWidth),
                                         aMidPoint.Y() + (INT32)(aPerpend.getY() * fHalfArrowWidth));
-                            Point aRight(aMidPoint.X() - (INT32)(aPerpend.getX() * fHalfArrowWidth), 
+                            Point aRight(aMidPoint.X() - (INT32)(aPerpend.getX() * fHalfArrowWidth),
                                         aMidPoint.Y() - (INT32)(aPerpend.getY() * fHalfArrowWidth));
 
                             basegfx::B2DPoint aPositionLeft(aLeft.X(), aLeft.Y());
                             basegfx::B2DPoint aPositionRight(aRight.X(), aRight.Y());
                             basegfx::B2DPoint aPosition2(a2ndPos.X(), a2ndPos.Y());
 
-                            pNewOverlayObject = new 
+                            pNewOverlayObject = new
                                 ::sdr::overlay::OverlayTriangle(
-                                    aPositionLeft, 
-                                    aPosition2, 
+                                    aPositionLeft,
+                                    aPosition2,
                                     aPositionRight,
                                     IsGradient() ? Color(COL_BLACK) : Color(COL_BLUE)
                                 );
@@ -1250,7 +1217,7 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, BOOL bSetItemOnObject, BOOL
         aGradTransVector.aCol1 = pColHdl1->GetColor();
     if(pColHdl2)
         aGradTransVector.aCol2 = pColHdl2->GetColor();
-    
+
     if(IsGradient())
         aOldGradTransGradient.aGradient = ((XFillGradientItem&)rSet.Get(XATTR_FILLGRADIENT)).GetGradientValue();
     else
@@ -1276,7 +1243,7 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, BOOL bSetItemOnObject, BOOL
             XFillFloatTransparenceItem aNewTransItem(aString, aGradTransGradient.aGradient);
             aNewSet.Put(aNewTransItem);
         }
-    
+
         if(bUndo && pModel->IsUndoEnabled())
         {
             pModel->BegUndo(SVX_RESSTR(IsGradient() ? SIP_XA_FILLGRADIENT : SIP_XA_FILLTRANSPARENCE));
@@ -1334,9 +1301,9 @@ void SdrHdlLine::CreateB2dIAObject()
                             basegfx::B2DPoint aPosition1(pHdl1->GetPos().X(), pHdl1->GetPos().Y());
                             basegfx::B2DPoint aPosition2(pHdl2->GetPos().X(), pHdl2->GetPos().Y());
 
-                            ::sdr::overlay::OverlayObject* pNewOverlayObject = new 
+                            ::sdr::overlay::OverlayObject* pNewOverlayObject = new
                                 ::sdr::overlay::OverlayLineStriped(
-                                    aPosition1, 
+                                    aPosition1,
                                     aPosition2
                                 );
                             DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
@@ -1396,9 +1363,9 @@ void SdrHdlBezWgt::CreateB2dIAObject()
 
                             if(!aPosition1.equal(aPosition2))
                             {
-                                ::sdr::overlay::OverlayObject* pNewOverlayObject = new 
+                                ::sdr::overlay::OverlayObject* pNewOverlayObject = new
                                     ::sdr::overlay::OverlayLineStriped(
-                                        aPosition1, 
+                                        aPosition1,
                                         aPosition2
                                     );
                                 DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
@@ -1452,7 +1419,7 @@ void E3dVolumeMarker::CreateB2dIAObject()
                     {
                         if(rPageWindow.GetOverlayManager() && aWireframePoly.count())
                             {
-                                ::sdr::overlay::OverlayObject* pNewOverlayObject = new 
+                                ::sdr::overlay::OverlayObject* pNewOverlayObject = new
                                 ::sdr::overlay::OverlayPolyPolygonStriped(aWireframePoly);
                                 DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
 
@@ -1460,7 +1427,7 @@ void E3dVolumeMarker::CreateB2dIAObject()
                                 if(pNewOverlayObject)
                                 {
                                     pNewOverlayObject->setBaseColor(Color(COL_BLACK));
-                                    
+
                                     rPageWindow.GetOverlayManager()->add(*pNewOverlayObject);
                                     maOverlayGroup.append(*pNewOverlayObject);
                                 }
@@ -1480,7 +1447,7 @@ ImpEdgeHdl::~ImpEdgeHdl()
 
 void ImpEdgeHdl::CreateB2dIAObject()
 {
-    if(nObjHdlNum <= 1 && pObj) 
+    if(nObjHdlNum <= 1 && pObj)
     {
         // first throw away old one
         GetRidOfIAObject();
@@ -1496,10 +1463,10 @@ void ImpEdgeHdl::CreateB2dIAObject()
             {
                 const SdrEdgeObj* pEdge = (SdrEdgeObj*)pObj;
 
-                if(pEdge->GetConnectedNode(nObjHdlNum == 0) != NULL) 
+                if(pEdge->GetConnectedNode(nObjHdlNum == 0) != NULL)
                     eColIndex = LightRed;
 
-                if(nPPntNum < 2) 
+                if(nPPntNum < 2)
                 {
                     // Handle with plus sign inside
                     eKindOfMarker = Circ_7x7;
@@ -1520,7 +1487,7 @@ void ImpEdgeHdl::CreateB2dIAObject()
                                 basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
 
                                 ::sdr::overlay::OverlayObject* pNewOverlayObject = CreateOverlayObject(
-                                    aPosition, 
+                                    aPosition,
                                     eColIndex,
                                     eKindOfMarker);
 
@@ -1545,11 +1512,11 @@ void ImpEdgeHdl::CreateB2dIAObject()
 }
 
 void ImpEdgeHdl::SetLineCode(SdrEdgeLineCode eCode)
-{ 
+{
     if(eLineCode != eCode)
     {
         // remember new value
-        eLineCode = eCode; 
+        eLineCode = eCode;
 
         // create new display
         Touch();
@@ -1559,35 +1526,35 @@ void ImpEdgeHdl::SetLineCode(SdrEdgeLineCode eCode)
 Pointer ImpEdgeHdl::GetPointer() const
 {
     SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj);
-    if (pEdge==NULL) 
+    if (pEdge==NULL)
         return SdrHdl::GetPointer();
-    if (nObjHdlNum<=1) 
+    if (nObjHdlNum<=1)
         return Pointer(POINTER_MOVEPOINT); //Pointer(POINTER_DRAW_CONNECT);
-    if (IsHorzDrag()) 
+    if (IsHorzDrag())
         return Pointer(POINTER_ESIZE);
-    else 
+    else
         return Pointer(POINTER_SSIZE);
 }
 
 BOOL ImpEdgeHdl::IsHorzDrag() const
 {
     SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj);
-    if (pEdge==NULL) 
+    if (pEdge==NULL)
         return FALSE;
-    if (nObjHdlNum<=1) 
+    if (nObjHdlNum<=1)
         return FALSE;
-    
+
     SdrEdgeKind eEdgeKind = ((SdrEdgeKindItem&)(pEdge->GetObjectItem(SDRATTR_EDGEKIND))).GetValue();
-    
+
     const SdrEdgeInfoRec& rInfo=pEdge->aEdgeInfo;
-    if (eEdgeKind==SDREDGE_ORTHOLINES || eEdgeKind==SDREDGE_BEZIER) 
+    if (eEdgeKind==SDREDGE_ORTHOLINES || eEdgeKind==SDREDGE_BEZIER)
     {
         return !rInfo.ImpIsHorzLine(eLineCode,*pEdge->pEdgeTrack);
-    } 
-    else if (eEdgeKind==SDREDGE_THREELINES) 
+    }
+    else if (eEdgeKind==SDREDGE_THREELINES)
     {
         long nWink=nObjHdlNum==2 ? rInfo.nAngle1 : rInfo.nAngle2;
-        if (nWink==0 || nWink==18000) 
+        if (nWink==0 || nWink==18000)
             return TRUE;
         else
             return FALSE;
@@ -1620,7 +1587,7 @@ void ImpMeasureHdl::CreateB2dIAObject()
                 eKindOfMarker = Rect_7x7;
             }
 
-            if(bSelect) 
+            if(bSelect)
             {
                 eColIndex = Cyan;
             }
@@ -1640,7 +1607,7 @@ void ImpMeasureHdl::CreateB2dIAObject()
                             basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
 
                             ::sdr::overlay::OverlayObject* pNewOverlayObject = CreateOverlayObject(
-                                aPosition, 
+                                aPosition,
                                 eColIndex,
                                 eKindOfMarker);
 
@@ -1660,7 +1627,7 @@ void ImpMeasureHdl::CreateB2dIAObject()
 
 Pointer ImpMeasureHdl::GetPointer() const
 {
-    switch (nObjHdlNum) 
+    switch (nObjHdlNum)
     {
         case 0: case 1: return Pointer(POINTER_HAND);
         case 2: case 3: return Pointer(POINTER_MOVEPOINT);
@@ -1671,7 +1638,7 @@ Pointer ImpMeasureHdl::GetPointer() const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-ImpTextframeHdl::ImpTextframeHdl(const Rectangle& rRect) : 
+ImpTextframeHdl::ImpTextframeHdl(const Rectangle& rRect) :
     SdrHdl(rRect.TopLeft(),HDL_MOVE),
     maRect(rRect)
 {
@@ -1744,7 +1711,7 @@ int ImpSdrHdlListSorter::Compare(const void* pElem1, const void* pElem2) const
     // Level 1: Erst normale Handles, dann Glue, dann User, dann Plushandles, dann Retpunkt-Handles
     unsigned n1=1;
     unsigned n2=1;
-    if (eKind1!=eKind2) 
+    if (eKind1!=eKind2)
     {
         if (eKind1==HDL_REF1 || eKind1==HDL_REF2 || eKind1==HDL_MIRX) n1=5;
         else if (eKind1==HDL_GLUE) n1=2;
@@ -1757,47 +1724,47 @@ int ImpSdrHdlListSorter::Compare(const void* pElem1, const void* pElem2) const
     }
     if (((SdrHdl*)pElem1)->IsPlusHdl()) n1=4;
     if (((SdrHdl*)pElem2)->IsPlusHdl()) n2=4;
-    if (n1==n2) 
+    if (n1==n2)
     {
         // Level 2: PageView (Pointer)
         SdrPageView* pPV1=((SdrHdl*)pElem1)->GetPageView();
         SdrPageView* pPV2=((SdrHdl*)pElem2)->GetPageView();
-        if (pPV1==pPV2) 
+        if (pPV1==pPV2)
         {
             // Level 3: Position (x+y)
             SdrObject* pObj1=((SdrHdl*)pElem1)->GetObj();
             SdrObject* pObj2=((SdrHdl*)pElem2)->GetObj();
-            if (pObj1==pObj2) 
+            if (pObj1==pObj2)
             {
                 sal_uInt32 nNum1=((SdrHdl*)pElem1)->GetObjHdlNum();
                 sal_uInt32 nNum2=((SdrHdl*)pElem2)->GetObjHdlNum();
-                if (nNum1==nNum2) 
+                if (nNum1==nNum2)
                 { // #48763#
                     if (eKind1==eKind2)
                         return (long)pElem1<(long)pElem2 ? -1 : 1; // Notloesung, um immer die gleiche Sortierung zu haben
                     return (USHORT)eKind1<(USHORT)eKind2 ? -1 : 1;
-                } 
-                else 
+                }
+                else
                     return nNum1<nNum2 ? -1 : 1;
-            } 
-            else 
+            }
+            else
             {
                 return (long)pObj1<(long)pObj2 ? -1 : 1;
             }
-        } 
-        else 
+        }
+        else
         {
             return (long)pPV1<(long)pPV2 ? -1 : 1;
         }
-    } 
-    else 
+    }
+    else
     {
         return n1<n2 ? -1 : 1;
     }
 }
 
-SdrMarkView* SdrHdlList::GetView() const 
-{ 
+SdrMarkView* SdrHdlList::GetView() const
+{
     return pView;
 }
 
@@ -1899,7 +1866,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward)
         const ULONG nOldHdlNum(mnFocusIndex);
         SdrHdl* pOld = GetHdl(nOldHdlNum);
         //SDOsal_Bool bRefresh(sal_False);
-    
+
         if(pOld)
         {
             // switch off old handle
@@ -2081,31 +2048,31 @@ void SdrHdlList::ResetFocusHdl()
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 SdrHdlList::SdrHdlList(SdrMarkView* pV)
-:	mnFocusIndex(CONTAINER_ENTRY_NOTFOUND), 
+:	mnFocusIndex(CONTAINER_ENTRY_NOTFOUND),
     pView(pV),
     aList(1024,32,32)
-{ 
-    nHdlSize = 3; 
-    bRotateShear = FALSE; 
-    bMoveOutside = FALSE; 
-    bDistortShear = FALSE; 
+{
+    nHdlSize = 3;
+    bRotateShear = FALSE;
+    bMoveOutside = FALSE;
+    bDistortShear = FALSE;
     bFineHandles = FALSE;
 }
 
-SdrHdlList::~SdrHdlList() 
-{ 
-    Clear(); 
+SdrHdlList::~SdrHdlList()
+{
+    Clear();
 }
 
 void SdrHdlList::SetHdlSize(USHORT nSiz)
-{ 
+{
     if(nHdlSize != nSiz)
     {
         // remember new value
-        nHdlSize = nSiz; 
+        nHdlSize = nSiz;
 
         // propagate change to IAOs
-        for(UINT32 i=0; i<GetHdlCount(); i++) 
+        for(UINT32 i=0; i<GetHdlCount(); i++)
         {
             SdrHdl* pHdl = GetHdl(i);
             pHdl->Touch();
@@ -2113,15 +2080,15 @@ void SdrHdlList::SetHdlSize(USHORT nSiz)
     }
 }
 
-void SdrHdlList::SetMoveOutside(BOOL bOn)              
-{ 
+void SdrHdlList::SetMoveOutside(BOOL bOn)
+{
     if(bMoveOutside != bOn)
     {
         // remember new value
-        bMoveOutside = bOn; 
+        bMoveOutside = bOn;
 
         // propagate change to IAOs
-        for(UINT32 i=0; i<GetHdlCount(); i++) 
+        for(UINT32 i=0; i<GetHdlCount(); i++)
         {
             SdrHdl* pHdl = GetHdl(i);
             pHdl->Touch();
@@ -2129,25 +2096,25 @@ void SdrHdlList::SetMoveOutside(BOOL bOn)
     }
 }
 
-void SdrHdlList::SetRotateShear(BOOL bOn)              
-{ 
-    bRotateShear = bOn; 
+void SdrHdlList::SetRotateShear(BOOL bOn)
+{
+    bRotateShear = bOn;
 }
 
-void SdrHdlList::SetDistortShear(BOOL bOn)             
-{ 
-    bDistortShear = bOn; 
+void SdrHdlList::SetDistortShear(BOOL bOn)
+{
+    bDistortShear = bOn;
 }
 
-void SdrHdlList::SetFineHdl(BOOL bOn)                 
-{ 
+void SdrHdlList::SetFineHdl(BOOL bOn)
+{
     if(bFineHandles != bOn)
     {
         // remember new state
-        bFineHandles = bOn; 
+        bFineHandles = bOn;
 
         // propagate change to IAOs
-        for(UINT32 i=0; i<GetHdlCount(); i++) 
+        for(UINT32 i=0; i<GetHdlCount(); i++)
         {
             SdrHdl* pHdl = GetHdl(i);
             pHdl->Touch();
@@ -2155,8 +2122,8 @@ void SdrHdlList::SetFineHdl(BOOL bOn)
     }
 }
 
-SdrHdl* SdrHdlList::RemoveHdl(ULONG nNum) 
-{ 
+SdrHdl* SdrHdlList::RemoveHdl(ULONG nNum)
+{
     SdrHdl* pRetval = (SdrHdl*)aList.Remove(nNum);
 
     return pRetval;
@@ -2164,7 +2131,7 @@ SdrHdl* SdrHdlList::RemoveHdl(ULONG nNum)
 
 void SdrHdlList::Clear()
 {
-    for (ULONG i=0; i<GetHdlCount(); i++) 
+    for (ULONG i=0; i<GetHdlCount(); i++)
     {
         SdrHdl* pHdl=GetHdl(i);
         delete pHdl;
@@ -2206,7 +2173,7 @@ void SdrHdlList::Sort()
 
 ULONG SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const
 {
-    if (pHdl==NULL) 
+    if (pHdl==NULL)
         return CONTAINER_ENTRY_NOTFOUND;
     ULONG nPos=aList.GetPos(pHdl);
     return nPos;
@@ -2214,13 +2181,13 @@ ULONG SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const
 
 void SdrHdlList::AddHdl(SdrHdl* pHdl, BOOL bAtBegin)
 {
-    if (pHdl!=NULL) 
+    if (pHdl!=NULL)
     {
-        if (bAtBegin) 
+        if (bAtBegin)
         {
             aList.Insert(pHdl,ULONG(0));
-        } 
-        else 
+        }
+        else
         {
             aList.Insert(pHdl,CONTAINER_APPEND);
         }
@@ -2233,22 +2200,22 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrH
    SdrHdl* pRet=NULL;
    ULONG nAnz=GetHdlCount();
    ULONG nNum=bBack ? 0 : nAnz;
-   while ((bBack ? nNum<nAnz : nNum>0) && pRet==NULL) 
+   while ((bBack ? nNum<nAnz : nNum>0) && pRet==NULL)
    {
-       if (!bBack) 
+       if (!bBack)
            nNum--;
        SdrHdl* pHdl=GetHdl(nNum);
-       if (bNext) 
+       if (bNext)
        {
-           if (pHdl==pHdl0) 
+           if (pHdl==pHdl0)
                bNext=FALSE;
-       } 
-       else 
+       }
+       else
        {
-           if (pHdl->IsHdlHit(rPnt)) 
+           if (pHdl->IsHdlHit(rPnt))
                pRet=pHdl;
        }
-       if (bBack) 
+       if (bBack)
            nNum++;
    }
    return pRet;
@@ -2257,10 +2224,10 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrH
 SdrHdl* SdrHdlList::GetHdl(SdrHdlKind eKind1) const
 {
    SdrHdl* pRet=NULL;
-   for (ULONG i=0; i<GetHdlCount() && pRet==NULL; i++) 
+   for (ULONG i=0; i<GetHdlCount() && pRet==NULL; i++)
    {
        SdrHdl* pHdl=GetHdl(i);
-       if (pHdl->GetKind()==eKind1) 
+       if (pHdl->GetKind()==eKind1)
            pRet=pHdl;
    }
    return pRet;
@@ -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 )
@@ -2341,7 +2301,7 @@ BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize )
 
     BitmapEx aRetval(rBitmap);
     aRetval.Crop(aSourceRect);
-    return aRetval; 
+    return aRetval;
 }
 
 // --------------------------------------------------------------------
@@ -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++)
@@ -2390,9 +2347,9 @@ void SdrCropHdl::CreateB2dIAObject()
                         const sal_uInt32 nBlinkTime = sal::static_int_cast<sal_uInt32>(rStyleSettings.GetCursorBlinkTime());
 
                         pOverlayObject = new ::sdr::overlay::OverlayAnimatedBitmapEx(aPosition, aBmpEx1, aBmpEx2, nBlinkTime,
-                            (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, 
+                            (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
                             (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
-                            (UINT16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1, 
+                            (UINT16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1,
                             (UINT16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1);
                     }
                     else
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 7e77f9f07c..a8fa0ee759 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -1491,16 +1491,11 @@ SdrObject* SdrOle2Obj::getFullDragClone() const
     // create a graphic object with it
     Graphic* pOLEGraphic = GetGraphic();
     SdrObject* pClone = 0;
-    
-    if(Application::GetSettings().GetStyleSettings().GetHighContrastMode())
-    {
-        pOLEGraphic = getEmbeddedObjectRef().GetHCGraphic();
-    }
 
     if(pOLEGraphic)
     {
         pClone = new SdrGrafObj(*pOLEGraphic, GetSnapRect());
-        
+
         // this would be the place where to copy all attributes
         // when OLE will support fill and line style
         // pClone->SetMergedItem(pOleObject->GetMergedItemSet());
@@ -2217,7 +2212,7 @@ sal_Bool SdrOle2Obj::AddOwnLightClient()
         }
 
         return sal_False;
-    }   
+    }
 
        return sal_True;
 }
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 92ee98521d..05f00c9f3f 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -1599,8 +1599,8 @@ String STR_ItemNam_SHEARANGLE
  // Ende der gecachten Strings
 
  // und hier noch Bitmaps
-Bitmap BMAP_GrafikEi { File = "grafikei.bmp" ; };
-Bitmap BMAP_GrafikDe { File = "grafikde.bmp" ; };
+Bitmap BMAP_GrafikEi { File = "grafikei.png" ; };
+Bitmap BMAP_GrafikDe { File = "grafikde.png" ; };
 
 // Strings fuer den Vorlagen-Dialog
 String SIP_UNKNOWN_ATTR
@@ -2146,7 +2146,7 @@ String SIP_SA_XMLATTRIBUTES
 
 String SIP_SA_TEXT_USEFIXEDCELLHEIGHT
 {
-    Text [ en-US ] = "Use font-independent line spacing";	
+    Text [ en-US ] = "Use font-independent line spacing";
 };
 
 String SIP_SA_WORDWRAP
@@ -2747,24 +2747,18 @@ String SIP_SA_GRAFRESERVE6 { Text = "" ; };
 
 Bitmap SIP_SA_MARKERS
 {
-    File = "markers.bmp";
+    File = "markers.png";
 };
 
 Bitmap SIP_SA_FINE_MARKERS
 {
-    File = "markers2.bmp";
+    File = "markers2.png";
 };
 
 // #100499#
 Bitmap BMP_SVXOLEOBJ
 {
-    File = "oleobj.bmp" ;
-};
-
-// #101928#
-Bitmap SIP_SA_ACCESSIBILITY_MARKERS
-{
-    File = "markersACC.bmp";
+    File = "oleobj.png" ;
 };
 
 String STR_ObjNameSingulMEDIA
@@ -2846,89 +2840,12 @@ String STR_ObjNamePluralTable
 
 Bitmap SIP_SA_CROP_MARKERS
 {
-    File = "cropmarkers.bmp";
+    File = "cropmarkers.png";
 };
 
 Bitmap SIP_SA_CROP_FINE_MARKERS
 {
-    File = "cropmarkers2.bmp";
-};
-
-Bitmap SIP_SA_ACCESSIBILITY_CROP_MARKERS
-{
-    File = "cropmarkersACC.bmp";
+    File = "cropmarkers2.png";
 };
 
 // ******************************************************************* EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 02a781c3fc..addec7eb18 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -72,7 +72,6 @@ using namespace ::com::sun::star::beans;
 
 SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) :
     LineLB( pParent, nBits ),
-    meBmpMode	( GetSettings().GetStyleSettings().GetHighContrastMode() ? BMP_COLOR_HIGHCONTRAST : BMP_COLOR_NORMAL ),
     nCurPos		( 0 ),
     aLogicalSize(40,140),
     bRelease    ( TRUE ),
@@ -253,20 +252,9 @@ void SvxLineBox::DataChanged( const DataChangedEvent& rDCEvt )
         SetSizePixel(LogicToPixel(aLogicalSize, MAP_APPFONT));
         Size aDropSize( aLogicalSize.Width(), LOGICAL_EDIT_HEIGHT);
         SetDropDownSizePixel(LogicToPixel(aDropSize, MAP_APPFONT));
-   }
+    }
 
     LineLB::DataChanged( rDCEvt );
-
-    if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
-         (rDCEvt.GetFlags() & SETTINGS_STYLE) )
-    {
-        BmpColorMode eMode = GetSettings().GetStyleSettings().GetHighContrastMode() ? BMP_COLOR_HIGHCONTRAST : BMP_COLOR_NORMAL;
-        if( eMode != meBmpMode )
-        {
-            meBmpMode = eMode;
-            FillControl();
-        }
-     }
 }
 
 void SvxLineBox::FillControl()