removed Simple Handles option

Removed the unnecessary option "Simple Handles" with all related
functions and icons.

7 files changed, 14 insertions, 72 deletions

diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 0026f8eeb9d0..cadd4a4f593e 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -150,7 +150,7 @@ class SVX_DLLPUBLIC SdrHdl
     friend class                SdrHdlList;
 
     // #101928#
-    BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine );
+    BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd);
 
 protected:
     SdrObject*                  pObj;      // Gehoert das Handle zu einem Objekt?
@@ -524,7 +524,7 @@ protected:
 
     BitmapEx GetBitmapForHandle( const BitmapEx& rBitmap, int nSize );
 
-    static BitmapEx GetHandlesBitmap( bool bIsFineHdl );
+    static BitmapEx GetHandlesBitmap();
 };
 
 #endif //_SVDHDL_HXX
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index da08586e68d4..d292e3caa9ef 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -338,15 +338,6 @@ public:
     sal_uInt16 GetMarkHdlSizePixel() const;
     void SetMarkHdlSizePixel(sal_uInt16 nSiz);
 
-    // Die Groesse der Markierungs-Handles wird ueber die jeweilige Aufloesung
-    // und die Groesse des Bereichs der markierten Objekte so angepasst, dass
-    // sie sich bei einer Frame-Selektion moeglichst nicht ueberschneiden.
-    // Dazu muessen die Handles ggf. verkleinert dargestellt werden. Mit der
-    // MinMarkHdlSize kann man hierfuer eine Mindestgroesse angeben.
-    // Defaultwert ist 3, Mindestwert 3 Pixel.
-    sal_Bool IsSolidMarkHdl() const { return aHdl.IsFineHdl(); }
-    void SetSolidMarkHdl(sal_Bool bOn);
-
     virtual sal_Bool HasMarkablePoints() const;
     virtual sal_uIntPtr GetMarkablePointCount() const;
     virtual sal_Bool HasMarkedPoints() const;
diff --git a/svx/inc/svx/svdstr.hrc b/svx/inc/svx/svdstr.hrc
index e298b755d29c..3e456387c51e 100755
--- a/svx/inc/svx/svdstr.hrc
+++ b/svx/inc/svx/svdstr.hrc
@@ -702,7 +702,6 @@
 
 #define SIP_SA_MARKERS                      (SIP_Begin + 258)
 #define SIP_SA_PAGESHADOW35X35              (SIP_Begin + 259)
-#define SIP_SA_FINE_MARKERS                 (SIP_Begin + 260)
 
 #define BMP_SVXOLEOBJ                       (SIP_Begin + 261)
 
@@ -720,7 +719,6 @@
 #define STR_TABLE_STYLE                     (SIP_Begin + 274)
 #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_End                             (SIP_SA_CROP_FINE_MARKERS)
 
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index abf2b1177c21..98cd7a85e458 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -263,15 +263,9 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrHdlBitmapSet& getSimpleSet()
-{
-    static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aSimpleSet(new SdrHdlBitmapSet(SIP_SA_MARKERS));
-    return *aSimpleSet.get();
-}
-
 SdrHdlBitmapSet& getModernSet()
 {
-    static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aModernSet(new SdrHdlBitmapSet(SIP_SA_FINE_MARKERS));
+    static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aModernSet(new SdrHdlBitmapSet(SIP_SA_MARKERS));
     return *aModernSet.get();
 }
 
@@ -632,16 +626,9 @@ BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) const
 }
 
 // #101928#
-BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine )
+BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd)
 {
-    if(bFine)
-    {
-        return getModernSet().GetBitmapEx(eKindOfMarker, nInd);
-    }
-    else
-    {
-        return getSimpleSet().GetBitmapEx(eKindOfMarker, nInd);
-    }
+    return getModernSet().GetBitmapEx(eKindOfMarker, nInd);
 }
 
 ::sdr::overlay::OverlayObject* SdrHdl::CreateOverlayObject(
@@ -649,7 +636,6 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
     BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker, Point aMoveOutsideOffset)
 {
     ::sdr::overlay::OverlayObject* pRetval = 0L;
-    sal_Bool bIsFineHdl(pHdlList->IsFineHdl());
 
     // support bigger sizes
     sal_Bool bForceBiggerSize(sal_False);
@@ -695,9 +681,8 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
         }
 
         // create animated hdl
-        // #101928# use ImpGetBitmapEx(...) now
-        BitmapEx aBmpEx1 = ImpGetBitmapEx( eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl );
-        BitmapEx aBmpEx2 = ImpGetBitmapEx( eNextBigger,   (sal_uInt16)eColIndex, bIsFineHdl );
+        BitmapEx aBmpEx1 = ImpGetBitmapEx( eKindOfMarker, (sal_uInt16)eColIndex );
+        BitmapEx aBmpEx2 = ImpGetBitmapEx( eNextBigger,   (sal_uInt16)eColIndex );
 
         // #i53216# Use system cursor blink time. Use the unsigned value.
         const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
@@ -728,7 +713,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
     else
     {
         // create normal handle: use ImpGetBitmapEx(...) now
-        BitmapEx aBmpEx = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl );
+        BitmapEx aBmpEx = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex);
 
         if(eKindOfMarker == Anchor || eKindOfMarker == AnchorPressed)
         {
@@ -2232,22 +2217,12 @@ SdrCropHdl::SdrCropHdl(const Point& rPnt, SdrHdlKind eNewKind)
 
 // --------------------------------------------------------------------
 
-BitmapEx SdrCropHdl::GetHandlesBitmap( bool bIsFineHdl )
+BitmapEx SdrCropHdl::GetHandlesBitmap()
 {
-    if( bIsFineHdl )
-    {
-        static BitmapEx* pModernBitmap = 0;
-        if( pModernBitmap == 0 )
-            pModernBitmap = new BitmapEx(ResId(SIP_SA_CROP_FINE_MARKERS, *ImpGetResMgr()));
-        return *pModernBitmap;
-    }
-    else
-    {
-        static BitmapEx* pSimpleBitmap = 0;
-        if( pSimpleBitmap == 0 )
-            pSimpleBitmap = new BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr()));
-        return *pSimpleBitmap;
-    }
+    static BitmapEx* pModernBitmap = 0;
+    if( pModernBitmap == 0 )
+        pModernBitmap = new BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr()));
+    return *pModernBitmap;
 }
 
 // --------------------------------------------------------------------
@@ -2304,11 +2279,10 @@ void SdrCropHdl::CreateB2dIAObject()
 
     if( pPageView && !pView->areMarkHandlesHidden() )
     {
-        sal_Bool bIsFineHdl(pHdlList->IsFineHdl());
         const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
         int nHdlSize = pHdlList->GetHdlSize();
 
-        const BitmapEx aHandlesBitmap( GetHandlesBitmap( bIsFineHdl ) );
+        const BitmapEx aHandlesBitmap( GetHandlesBitmap() );
         BitmapEx aBmpEx1( GetBitmapForHandle( aHandlesBitmap, nHdlSize ) );
 
         for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 9dd2e62444b5..d8573d1bffc3 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1547,16 +1547,6 @@ sal_uInt16 SdrMarkView::GetMarkHdlSizePixel() const
     return aHdl.GetHdlSize()*2+1;
 }
 
-void SdrMarkView::SetSolidMarkHdl(sal_Bool bOn)
-{
-    if (bOn!=aHdl.IsFineHdl()) {
-        //HMHBOOL bMerk=IsMarkHdlShown();
-        //HMHif (bMerk) HideMarkHdl();
-        aHdl.SetFineHdl(bOn);
-        //HMHif (bMerk) ShowMarkHdl();
-    }
-}
-
 void SdrMarkView::SetMarkHdlSizePixel(sal_uInt16 nSiz)
 {
     if (nSiz<3) nSiz=3;
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index c9835b4950b9..f650754fcd51 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -241,7 +241,6 @@ sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark)
     const SdrPageView* pPV0=NULL;
     SdrMark* pM=NULL;
     aHdl.Sort();
-    //HMHBOOL bHideHdl=IsMarkHdlShown() && IsSolidMarkHdl() && !bPlusHdlAlways;
     sal_uIntPtr nHdlAnz=aHdl.GetHdlCount();
     for (sal_uIntPtr nHdlNum=nHdlAnz; nHdlNum>0;) {
         nHdlNum--;
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index e68f68100b9d..1846cacd2bd9 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -2725,11 +2725,6 @@ Bitmap SIP_SA_MARKERS
     File = "markers.png";
 };
 
-Bitmap SIP_SA_FINE_MARKERS
-{
-    File = "markers2.png";
-};
-
 Bitmap BMP_SVXOLEOBJ
 {
     File = "oleobj.png" ;
@@ -2817,11 +2812,6 @@ Bitmap SIP_SA_CROP_MARKERS
     File = "cropmarkers.png";
 };
 
-Bitmap SIP_SA_CROP_FINE_MARKERS
-{
-    File = "cropmarkers2.png";
-};
-
 String STR_ObjNameSingulFONTWORK
 {
     Text [ en-US ] = "font work" ;