Remove Large Handles option

This patch removes the option Large Handles everywhere and makes LibO use the larger 9px handles always.

15 files changed, 43 insertions, 127 deletions

diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index b34d4033c4a0..00880e69d7fa 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -232,7 +232,6 @@
 #define SID_CONVERT_TO_8BIT_GRAYS           (SID_SD_START+165)
 #define SID_CONVERT_TO_8BIT_COLORS          (SID_SD_START+166)
 #define SID_CONVERT_TO_24BIT                (SID_SD_START+167)
-#define SID_BIG_HANDLES                     (SID_SD_START+168)
 #define SID_DOUBLECLICK_TEXTEDIT            (SID_SD_START+169)
 #define SID_CLICK_CHANGE_ROTATION           (SID_SD_START+170)
 
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index cad54f82be13..c9aff5db5d5c 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -40,7 +40,6 @@
 #define CMD_SID_MOREBACK                            ".uno:Backward"
 #define CMD_SID_BEFORE_OBJ                          ".uno:BeforeObject"
 #define CMD_SID_BEHIND_OBJ                          ".uno:BehindObject"
-#define CMD_SID_BIG_HANDLES                         ".uno:BigHandles"
 #define CMD_SID_BREAK                               ".uno:Break"
 #define CMD_SID_CAPTUREPOINT                        ".uno:CapturePoint"
 #define CMD_SID_CHANGEBEZIER                        ".uno:ChangeBezier"
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index f668a66ed57b..018e7d01f7bc 100755
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1989,11 +1989,6 @@ interface DrawView
         ExecMethod = ExecOptionsBar ;
         StateMethod = GetOptionsBarState ;
     ]
-    SID_BIG_HANDLES // ole : ?, status : ?
-    [
-        ExecMethod = ExecOptionsBar ;
-        StateMethod = GetOptionsBarState ;
-    ]
     SID_DOUBLECLICK_TEXTEDIT // ole : ?, status : ?
     [
         ExecMethod = ExecOptionsBar ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 425915bcbd00..4b6ddae0d53b 100755
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -288,33 +288,6 @@ SfxVoidItem BehindObject SID_BEHIND_OBJ
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem BigHandles SID_BIG_HANDLES
-
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = FALSE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_OPTIONS;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem Break SID_BREAK
 ()
 [
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index f4f0ffc9ce4c..b3b8cd7b60fc 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -494,7 +494,6 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
     bMasterPageCache( sal_True ),
     bDragWithCopy( sal_False ),
     bPickThrough( sal_True ),
-    bBigHandles( sal_False ),
     bDoubleClickTextEdit( sal_True ),
     bClickChangeRotation( sal_False ),
     bStartWithActualPage( sal_False ),
@@ -529,7 +528,6 @@ sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const
             IsMasterPagePaintCaching() == rOpt.IsMasterPagePaintCaching() &&
             IsDragWithCopy() == rOpt.IsDragWithCopy() &&
             IsPickThrough() == rOpt.IsPickThrough() &&
-            IsBigHandles() == rOpt.IsBigHandles() &&
             IsDoubleClickTextEdit() == rOpt.IsDoubleClickTextEdit() &&
             IsClickChangeRotation() == rOpt.IsClickChangeRotation() &&
             IsStartWithActualPage() == rOpt.IsStartWithActualPage() &&
@@ -563,7 +561,6 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
         "BackgroundCache",
         "CopyWhileMoving",
         "TextObject/Selectable",
-        "BigHandles",
         "DclickTextedit",
         "RotateClick",
         "Preview",
@@ -592,7 +589,7 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
         "PenWidth"
     };
 
-    rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 26 : 15 );
+    rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 25 : 14 );
     ppNames = aPropNames;
 }
 
@@ -606,49 +603,48 @@ sal_Bool SdOptionsMisc::ReadData( const Any* pValues )
     if( pValues[3].hasValue() ) SetMasterPagePaintCaching( *(sal_Bool*) pValues[ 3 ].getValue() );
     if( pValues[4].hasValue() ) SetDragWithCopy( *(sal_Bool*) pValues[ 4 ].getValue() );
     if( pValues[5].hasValue() ) SetPickThrough( *(sal_Bool*) pValues[ 5 ].getValue() );
-    if( pValues[6].hasValue() ) SetBigHandles( *(sal_Bool*) pValues[ 6 ].getValue() );
-    if( pValues[7].hasValue() ) SetDoubleClickTextEdit( *(sal_Bool*) pValues[ 7 ].getValue() );
-    if( pValues[8].hasValue() ) SetClickChangeRotation( *(sal_Bool*) pValues[ 8 ].getValue() );
-    if( pValues[10].hasValue() ) SetSolidDragging( *(sal_Bool*) pValues[ 10 ].getValue() );
-    if( pValues[11].hasValue() ) SetDefaultObjectSizeWidth( *(sal_uInt32*) pValues[ 11 ].getValue() );
-    if( pValues[12].hasValue() ) SetDefaultObjectSizeHeight( *(sal_uInt32*) pValues[ 12 ].getValue() );
-    if( pValues[13].hasValue() ) SetPrinterIndependentLayout( *(sal_uInt16*) pValues[ 13 ].getValue() );
+    if( pValues[6].hasValue() ) SetDoubleClickTextEdit( *(sal_Bool*) pValues[ 6 ].getValue() );
+    if( pValues[7].hasValue() ) SetClickChangeRotation( *(sal_Bool*) pValues[ 7 ].getValue() );
+    if( pValues[9].hasValue() ) SetSolidDragging( *(sal_Bool*) pValues[ 9 ].getValue() );
+    if( pValues[10].hasValue() ) SetDefaultObjectSizeWidth( *(sal_uInt32*) pValues[ 10 ].getValue() );
+    if( pValues[11].hasValue() ) SetDefaultObjectSizeHeight( *(sal_uInt32*) pValues[ 11 ].getValue() );
+    if( pValues[12].hasValue() ) SetPrinterIndependentLayout( *(sal_uInt16*) pValues[ 12 ].getValue() );
 
-    if( pValues[14].hasValue() )
-        SetShowComments(  *(sal_Bool*) pValues[ 14 ].getValue() );
+    if( pValues[13].hasValue() )
+        SetShowComments(  *(sal_Bool*) pValues[ 13 ].getValue() );
 
     // just for Impress
     if( GetConfigId() == SDCFG_IMPRESS )
     {
+        if( pValues[14].hasValue() )
+            SetStartWithTemplate( *(sal_Bool*) pValues[ 14 ].getValue() );
         if( pValues[15].hasValue() )
-            SetStartWithTemplate( *(sal_Bool*) pValues[ 15 ].getValue() );
+            SetStartWithActualPage( *(sal_Bool*) pValues[ 15 ].getValue() );
         if( pValues[16].hasValue() )
-            SetStartWithActualPage( *(sal_Bool*) pValues[ 16 ].getValue() );
+            SetSummationOfParagraphs( *(sal_Bool*) pValues[ 16 ].getValue() );
         if( pValues[17].hasValue() )
-            SetSummationOfParagraphs( *(sal_Bool*) pValues[ 17 ].getValue() );
+            SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 17 ].getValue() );
+
         if( pValues[18].hasValue() )
-            SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 18 ].getValue() );
+            SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 18 ].getValue());
 
         if( pValues[19].hasValue() )
-            SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 19 ].getValue());
+            SetPreviewNewEffects(*(sal_Bool*) pValues[ 19 ].getValue());
 
         if( pValues[20].hasValue() )
-            SetPreviewNewEffects(*(sal_Bool*) pValues[ 20 ].getValue());
+            SetPreviewChangedEffects(*(sal_Bool*) pValues[ 20 ].getValue());
 
         if( pValues[21].hasValue() )
-            SetPreviewChangedEffects(*(sal_Bool*) pValues[ 21 ].getValue());
+            SetPreviewTransitions(*(sal_Bool*) pValues[ 21 ].getValue());
 
         if( pValues[22].hasValue() )
-            SetPreviewTransitions(*(sal_Bool*) pValues[ 22 ].getValue());
+            SetDisplay(*(sal_Int32*) pValues[ 22 ].getValue());
 
         if( pValues[23].hasValue() )
-            SetDisplay(*(sal_Int32*) pValues[ 23 ].getValue());
+            SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 23 ] ) );
 
         if( pValues[24].hasValue() )
-            SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 24 ] ) );
-
-        if( pValues[25].hasValue() )
-            SetPresentationPenWidth( getSafeValue< double >( pValues[ 25 ] ) );
+            SetPresentationPenWidth( getSafeValue< double >( pValues[ 24 ] ) );
     }
 
     return sal_True;
@@ -664,34 +660,33 @@ sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const
     pValues[ 3 ] <<= IsMasterPagePaintCaching();
     pValues[ 4 ] <<= IsDragWithCopy();
     pValues[ 5 ] <<= IsPickThrough();
-    pValues[ 6 ] <<= IsBigHandles();
-    pValues[ 7 ] <<= IsDoubleClickTextEdit();
-    pValues[ 8 ] <<= IsClickChangeRotation();
+    pValues[ 6 ] <<= IsDoubleClickTextEdit();
+    pValues[ 7 ] <<= IsClickChangeRotation();
     // The preview is not supported anymore.  Use a dummy value.
-    pValues[ 9 ] <<= (double)0;// GetPreviewQuality();
-    pValues[ 10 ] <<= IsSolidDragging();
-    pValues[ 11 ] <<= GetDefaultObjectSizeWidth();
-    pValues[ 12 ] <<= GetDefaultObjectSizeHeight();
-    pValues[ 13 ] <<= GetPrinterIndependentLayout();
-    pValues[ 14 ] <<= (sal_Bool)IsShowComments();
+    pValues[ 8 ] <<= (double)0;// GetPreviewQuality();
+    pValues[ 9 ] <<= IsSolidDragging();
+    pValues[ 10 ] <<= GetDefaultObjectSizeWidth();
+    pValues[ 11 ] <<= GetDefaultObjectSizeHeight();
+    pValues[ 12 ] <<= GetPrinterIndependentLayout();
+    pValues[ 13 ] <<= (sal_Bool)IsShowComments();
 
     // just for Impress
     if( GetConfigId() == SDCFG_IMPRESS )
     {
-        pValues[ 15 ] <<= IsStartWithTemplate();
-        pValues[ 16 ] <<= IsStartWithActualPage();
-        pValues[ 17 ] <<= IsSummationOfParagraphs();
-        pValues[ 18 ] <<= IsShowUndoDeleteWarning();
-        pValues[ 19 ] <<= IsSlideshowRespectZOrder();
+        pValues[ 14 ] <<= IsStartWithTemplate();
+        pValues[ 15 ] <<= IsStartWithActualPage();
+        pValues[ 16 ] <<= IsSummationOfParagraphs();
+        pValues[ 17 ] <<= IsShowUndoDeleteWarning();
+        pValues[ 18 ] <<= IsSlideshowRespectZOrder();
 
-        pValues[ 20 ] <<= IsPreviewNewEffects();
-        pValues[ 21 ] <<= IsPreviewChangedEffects();
-        pValues[ 22 ] <<= IsPreviewTransitions();
+        pValues[ 19 ] <<= IsPreviewNewEffects();
+        pValues[ 20 ] <<= IsPreviewChangedEffects();
+        pValues[ 21 ] <<= IsPreviewTransitions();
 
-        pValues[ 23 ] <<= GetDisplay();
+        pValues[ 22 ] <<= GetDisplay();
 
-        pValues[ 24 ] <<= GetPresentationPenColor();
-        pValues[ 25 ] <<= GetPresentationPenWidth();
+        pValues[ 23 ] <<= GetPresentationPenColor();
+        pValues[ 24 ] <<= GetPresentationPenWidth();
     }
 
     return sal_True;
@@ -748,7 +743,6 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
 
         maOptionsMisc.SetDragWithCopy( pView->IsDragWithCopy() );
         maOptionsMisc.SetPickThrough( (sal_Bool)pView->GetModel()->IsPickThroughTransparentTextFrames() );
-        maOptionsMisc.SetBigHandles( (sal_Bool)pView->IsBigHandles() );
         maOptionsMisc.SetDoubleClickTextEdit( pView->IsDoubleClickTextEdit() );
         maOptionsMisc.SetClickChangeRotation( pView->IsClickChangeRotation() );
         maOptionsMisc.SetSolidDragging( pView->IsSolidDragging() );
@@ -762,7 +756,6 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
         maOptionsMisc.SetMasterPagePaintCaching( pOpts->IsMasterPagePaintCaching() );
         maOptionsMisc.SetDragWithCopy( pOpts->IsDragWithCopy() );
         maOptionsMisc.SetPickThrough( pOpts->IsPickThrough() );
-        maOptionsMisc.SetBigHandles( pOpts->IsBigHandles() );
         maOptionsMisc.SetDoubleClickTextEdit( pOpts->IsDoubleClickTextEdit() );
         maOptionsMisc.SetClickChangeRotation( pOpts->IsClickChangeRotation() );
         maOptionsMisc.SetSolidDragging( pOpts->IsSolidDragging() );
@@ -800,7 +793,6 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const
         pOpts->SetMasterPagePaintCaching( maOptionsMisc.IsMasterPagePaintCaching() );
         pOpts->SetDragWithCopy( maOptionsMisc.IsDragWithCopy() );
         pOpts->SetPickThrough( maOptionsMisc.IsPickThrough() );
-        pOpts->SetBigHandles( maOptionsMisc.IsBigHandles() );
         pOpts->SetDoubleClickTextEdit( maOptionsMisc.IsDoubleClickTextEdit() );
         pOpts->SetClickChangeRotation( maOptionsMisc.IsClickChangeRotation() );
         pOpts->SetStartWithActualPage( maOptionsMisc.IsStartWithActualPage() );
diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src
index 5ec5d2305231..87e461ad2138 100644
--- a/sd/source/ui/app/tbxids_tmpl.src
+++ b/sd/source/ui/app/tbxids_tmpl.src
@@ -501,14 +501,6 @@
         AutoCheck = TRUE ; \
     };
 
-#define TBI_BIG_HANDLES \
-    ToolBoxItem\
-    {\
-        Identifier = SID_BIG_HANDLES ; \
-        HelpID = SID_BIG_HANDLES ; \
-        AutoCheck = TRUE ; \
-    };
-
 #define TBI_SOLID_CREATE \
     ToolBoxItem\
     {\
diff --git a/sd/source/ui/app/toolbox2_tmpl.src b/sd/source/ui/app/toolbox2_tmpl.src
index b9bdaf4800de..f8539c2daa1e 100644
--- a/sd/source/ui/app/toolbox2_tmpl.src
+++ b/sd/source/ui/app/toolbox2_tmpl.src
@@ -224,7 +224,6 @@ ToolBox RID_GRAPHIC_OPTIONS_TOOLBOX
         TBI_PICK_THROUGH
         TBI_DOUBLECLICK_TEXTEDIT
         SEPARATOR
-        TBI_BIG_HANDLES
 #if SD_TOOLBOX != RID_DRAW_TOOLBOX
         TBI_SOLID_CREATE
 #endif
diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx
index 838e0d05ea73..c6ffd22a9afa 100644
--- a/sd/source/ui/inc/FrameView.hxx
+++ b/sd/source/ui/inc/FrameView.hxx
@@ -135,9 +135,6 @@ public:
                  { mbQuickEdit = bQEdit; }
     sal_Bool IsQuickEdit() const { return mbQuickEdit; }
 
-    void        SetBigHandles( sal_Bool bOn = sal_True ) { mbBigHandles = bOn; }
-    sal_Bool    IsBigHandles() const { return mbBigHandles; }
-
     void        SetDoubleClickTextEdit( sal_Bool bOn = sal_True ) { mbDoubleClickTextEdit = bOn; }
     sal_Bool    IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; }
 
@@ -209,7 +206,6 @@ private:
     EditMode        meEditModeOnLoad;
     sal_Bool            mbLayerMode;       // Layer an/aus
     sal_Bool            mbQuickEdit;       // QuickEdit an/aus
-    sal_Bool            mbBigHandles;      // Grosse Handles
     sal_Bool            mbDoubleClickTextEdit; // Textmodus nach Doppelklick
     sal_Bool            mbClickChangeRotation; // Einfachklick wechselt Selektions-/Rotationsmodus
     sal_uInt16          mnPresViewShellId;  // ViewShell aus der die Pres. gestartet wurde
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 36c9aac36c07..8eb5ae6d620d 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -260,7 +260,6 @@ private:
     sal_Bool    bMasterPageCache        : 1;    // Misc/BackgroundCache
     sal_Bool    bDragWithCopy           : 1;    // Misc/CopyWhileMoving
     sal_Bool    bPickThrough            : 1;    // Misc/TextObject/Selectable
-    sal_Bool    bBigHandles             : 1;    // Misc/BigHandles
     sal_Bool    bDoubleClickTextEdit    : 1;    // Misc/DclickTextedit
     sal_Bool    bClickChangeRotation    : 1;    // Misc/RotateClick
     sal_Bool    bStartWithActualPage    : 1;    // Misc/Start/CurrentPage
@@ -309,7 +308,6 @@ public:
     sal_Bool    IsMasterPagePaintCaching() const { Init(); return (sal_Bool) bMasterPageCache; }
     sal_Bool    IsDragWithCopy() const { Init(); return (sal_Bool) bDragWithCopy; }
     sal_Bool    IsPickThrough() const { Init(); return (sal_Bool) bPickThrough; }
-    sal_Bool    IsBigHandles() const { Init(); return (sal_Bool) bBigHandles; }
     sal_Bool    IsDoubleClickTextEdit() const { Init(); return (sal_Bool) bDoubleClickTextEdit; }
     sal_Bool    IsClickChangeRotation() const { Init(); return (sal_Bool) bClickChangeRotation; }
     sal_Bool    IsStartWithActualPage() const { Init(); return (sal_Bool) bStartWithActualPage; }
@@ -348,7 +346,6 @@ public:
     void    SetMasterPagePaintCaching( sal_Bool bOn = sal_True ) { if( bMasterPageCache != bOn ) { OptionsChanged(); bMasterPageCache = bOn; } }
     void    SetDragWithCopy( sal_Bool bOn = sal_True ) { if( bDragWithCopy != bOn ) { OptionsChanged(); bDragWithCopy = bOn; } }
     void    SetPickThrough( sal_Bool bOn = sal_True ) { if( bPickThrough != bOn ) { OptionsChanged(); bPickThrough = bOn; } }
-    void    SetBigHandles( sal_Bool bOn = sal_True ) { if( bBigHandles != bOn ) { OptionsChanged(); bBigHandles = bOn; } }
     void    SetDoubleClickTextEdit( sal_Bool bOn = sal_True ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } }
     void    SetClickChangeRotation( sal_Bool bOn = sal_True ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } }
     void    SetStartWithActualPage( sal_Bool bOn = sal_True ) { if( bStartWithActualPage != bOn ) { OptionsChanged(); bStartWithActualPage = bOn; } }
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 298dff72754e..56f3f936fa16 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -156,7 +156,6 @@ SD_CONSTASCII_ACTION( sUNO_View_PageKind,                       "PageKind" );
 SD_CONSTASCII_ACTION( sUNO_View_SelectedPage,                   "SelectedPage" );
 SD_CONSTASCII_ACTION( sUNO_View_IsLayerMode,                    "IsLayerMode" );
 SD_CONSTASCII_ACTION( sUNO_View_IsQuickEdit,                    "IsQuickEdit" );
-SD_CONSTASCII_ACTION( sUNO_View_IsBigHandles,                   "IsBigHandles" );
 SD_CONSTASCII_ACTION( sUNO_View_IsDoubleClickTextEdit,          "IsDoubleClickTextEdit" );
 SD_CONSTASCII_ACTION( sUNO_View_IsClickChangeRotation,          "IsClickChangeRotation" );
 SD_CONSTASCII_ACTION( sUNO_View_IsDragWithCopy,                 "IsDragWithCopy" );
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 8e6fa0c9c159..9f1c3b7ebbc5 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -263,14 +263,9 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView)
     if (mpDrawView->IsMasterPagePaintCaching() != pView->IsMasterPagePaintCaching())
         mpDrawView->SetMasterPagePaintCaching( pView->IsMasterPagePaintCaching() );
 
-    // Definition:
-    //  grosse Handles: 9
-    //  kleine Handles: 7
+    // handle size: 9 pixels
     sal_uInt16 nTmp = mpDrawView->GetMarkHdlSizePixel();
-    //DBG_ASSERT(nTmp != 7, "HandleSize != 7 oder 9");
-    if( nTmp == 9 && !pView->IsBigHandles() )
-        mpDrawView->SetMarkHdlSizePixel( 7 );
-    else if( nTmp == 7 && pView->IsBigHandles() )
+    if( nTmp != 9 )
         mpDrawView->SetMarkHdlSizePixel( 9 );
 
 
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index a20e3aee7fe8..9a9ad2a5d1bb 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -201,12 +201,6 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
         }
         break;
 
-        case SID_BIG_HANDLES:
-        {
-            pOptions->SetBigHandles( !mpFrameView->IsBigHandles() );
-        }
-        break;
-
         case SID_DOUBLECLICK_TEXTEDIT:
         {
             pOptions->SetDoubleClickTextEdit( !mpFrameView->IsDoubleClickTextEdit() );
@@ -265,7 +259,6 @@ void DrawViewShell::GetOptionsBarState( SfxItemSet& rSet )
     rSet.Put( SfxBoolItem( SID_PICK_THROUGH, (sal_Bool)
                 mpDrawView->GetModel()->IsPickThroughTransparentTextFrames() ) );
 
-    rSet.Put( SfxBoolItem( SID_BIG_HANDLES, mpFrameView->IsBigHandles() ) );
     rSet.Put( SfxBoolItem( SID_DOUBLECLICK_TEXTEDIT, mpFrameView->IsDoubleClickTextEdit() ) );
     rSet.Put( SfxBoolItem( SID_CLICK_CHANGE_ROTATION, mpFrameView->IsClickChangeRotation() ) );
 }
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 864b04cd7d35..9cf26a6c0187 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -208,7 +208,6 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
         SetMasterPagePaintCaching( pFrameView->IsMasterPagePaintCaching() );
 
         SetDragWithCopy( pFrameView->IsDragWithCopy() );
-        mbBigHandles         = pFrameView->IsBigHandles();
         mbDoubleClickTextEdit = pFrameView->IsDoubleClickTextEdit();
         mbClickChangeRotation = pFrameView->IsClickChangeRotation();
         mnSlidesPerRow = pFrameView->GetSlidesPerRow();
@@ -241,7 +240,6 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
         SetViewShEditModeOnLoad(EM_PAGE);
         mbLayerMode = sal_False;
         SetEliminatePolyPoints(sal_False);
-        mbBigHandles = sal_False;
         mbDoubleClickTextEdit = sal_False;
         mbClickChangeRotation = sal_False;
         mnSlidesPerRow = 4;
@@ -360,7 +358,6 @@ void FrameView::Update(SdOptions* pOptions)
         SetMasterPagePaintCaching( pOptions->IsMasterPagePaintCaching() );
 
         SetDragWithCopy(pOptions->IsDragWithCopy());
-        SetBigHandles( pOptions->IsBigHandles() );
         SetDoubleClickTextEdit( pOptions->IsDoubleClickTextEdit() );
         SetClickChangeRotation( pOptions->IsClickChangeRotation() );
     }
@@ -515,7 +512,6 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com:
     aUserData.addValue( sUNO_View_SelectedPage, makeAny( (sal_Int16)GetSelectedPage() ) );
     aUserData.addValue( sUNO_View_IsLayerMode, makeAny( (sal_Bool)IsLayerMode() ) );
 
-    aUserData.addValue( sUNO_View_IsBigHandles, makeAny( (sal_Bool)IsBigHandles() ) );
     aUserData.addValue( sUNO_View_IsDoubleClickTextEdit,  makeAny( (sal_Bool)IsDoubleClickTextEdit() ) );
     aUserData.addValue( sUNO_View_IsClickChangeRotation, makeAny( (sal_Bool)IsClickChangeRotation() ) );
 
@@ -708,13 +704,6 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
                     SetLayerMode( bBool );
                 }
             }
-            else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsBigHandles ) ) )
-            {
-                if( pValue->Value >>= bBool )
-                {
-                    SetBigHandles( bBool );
-                }
-            }
             else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsDoubleClickTextEdit ) ) )
             {
                 if( pValue->Value >>= bBool )
diff --git a/sd/uiconfig/sdraw/toolbar/optionsbar.xml b/sd/uiconfig/sdraw/toolbar/optionsbar.xml
index 13a954851073..dac856b7669c 100644
--- a/sd/uiconfig/sdraw/toolbar/optionsbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/optionsbar.xml
@@ -17,7 +17,6 @@
  <toolbar:toolbaritem xlink:href=".uno:PickThrough" toolbar:helpid="helpid:27159"  toolbar:style="auto" />
  <toolbar:toolbaritem xlink:href=".uno:DoubleClickTextEdit" toolbar:helpid="helpid:27169"  toolbar:style="auto" />
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BigHandles" toolbar:helpid="helpid:27168"  toolbar:style="auto" />
  <toolbar:toolbaritem xlink:href=".uno:SolidCreate" toolbar:helpid="helpid:27151"  toolbar:style="auto" />
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:LeaveAllGroups" toolbar:helpid="helpid:27345"  toolbar:style="auto" />
diff --git a/sd/uiconfig/simpress/toolbar/optionsbar.xml b/sd/uiconfig/simpress/toolbar/optionsbar.xml
index 9fe4141b8207..e9f8b5199a5c 100644
--- a/sd/uiconfig/simpress/toolbar/optionsbar.xml
+++ b/sd/uiconfig/simpress/toolbar/optionsbar.xml
@@ -17,7 +17,6 @@
  <toolbar:toolbaritem xlink:href=".uno:PickThrough" toolbar:helpid="27159"/>
  <toolbar:toolbaritem xlink:href=".uno:DoubleClickTextEdit" toolbar:helpid="27169"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:BigHandles" toolbar:helpid="27168"/>
  <toolbar:toolbaritem xlink:href=".uno:SolidCreate" toolbar:helpid="helpid:27151"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:LeaveAllGroups" toolbar:helpid="27345"/>