removed Simple Handles option

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

13 files changed, 35 insertions, 102 deletions

diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 707a62fd791d..b34d4033c4a0 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -215,7 +215,6 @@
 #define SID_CONNECTOR_LINES_CIRCLES         (SID_SD_START+145)
 
 // Options-Leisten Slot-IDs
-#define SID_HANDLES_DRAFT                   (SID_SD_START+150)
 #define SID_SOLID_CREATE                    (SID_SD_START+151)
 #define SID_HELPLINES_USE                   (SID_SD_START+152)
 #define SID_HELPLINES_MOVE                  (SID_SD_START+153)
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index 9e1efebf8e6a..cad54f82be13 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -145,7 +145,6 @@
 #define CMD_SID_GRAPHIC_EXPORT                      ".uno:GraphicExport"
 #define CMD_SID_GRID_FRONT                          ".uno:GridFront"
 #define CMD_SID_3D_HALF_SPHERE                      ".uno:HalfSphere"
-#define CMD_SID_HANDLES_DRAFT                       ".uno:HandlesDraft"
 #define CMD_SID_HANDOUT_MASTERPAGE                  ".uno:HandoutMasterPage"
 #define CMD_SID_HANDOUTMODE                         ".uno:HandoutMode"
 #define CMD_SID_HATCH                               ".uno:Hatch"
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index cd3648b84c06..f668a66ed57b 100755
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1944,11 +1944,6 @@ interface DrawView
          //ExecMethod = FuTemporary ;
          //StateMethod = GetMenuState ;
     ]
-    SID_HANDLES_DRAFT // ole : ?, status : ?
-    [
-        ExecMethod = ExecOptionsBar ;
-        StateMethod = GetOptionsBarState ;
-    ]
     SID_SOLID_CREATE // ole : ?, status : ?
     [
         ExecMethod = ExecOptionsBar ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 5e13f85ccdc8..425915bcbd00 100755
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -3041,33 +3041,6 @@ SfxBoolItem HalfSphere SID_3D_HALF_SPHERE
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem HandlesDraft SID_HANDLES_DRAFT
-
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem HandoutMasterPage SID_HANDOUT_MASTERPAGE
 (SfxBoolItem Isactive ID_VAL_ISACTIVE)
 [
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 3f215daf96fa..d5eec0ab49aa 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -501,7 +501,6 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
     bClickChangeRotation( sal_False ),
     bStartWithActualPage( sal_False ),
     bSolidDragging( sal_True ),
-    bSolidMarkHdl( sal_True ),
     bSummationOfParagraphs( sal_False ),
     bShowUndoDeleteWarning( sal_True ),
     bSlideshowRespectZOrder( sal_True ),
@@ -538,7 +537,6 @@ sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const
             IsStartWithActualPage() == rOpt.IsStartWithActualPage() &&
             IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() &&
             IsSolidDragging() == rOpt.IsSolidDragging() &&
-            IsSolidMarkHdl() == rOpt.IsSolidMarkHdl() &&
             IsShowUndoDeleteWarning() == rOpt.IsShowUndoDeleteWarning() &&
             IsSlideshowRespectZOrder() == rOpt.IsSlideshowRespectZOrder() &&
             GetPrinterIndependentLayout() == rOpt.GetPrinterIndependentLayout() &&
@@ -572,7 +570,6 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
         "RotateClick",
         "Preview",
         "ModifyWithAttributes",
-        "SimpleHandles",
         "DefaultObjectSize/Width",
         "DefaultObjectSize/Height",
 
@@ -597,7 +594,7 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
         "PenWidth"
     };
 
-    rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 27 : 16 );
+    rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 26 : 15 );
     ppNames = aPropNames;
 }
 
@@ -615,46 +612,45 @@ sal_Bool SdOptionsMisc::ReadData( const Any* pValues )
     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() ) SetSolidMarkHdl( *(sal_Bool*) pValues[ 11 ].getValue() );
-    if( pValues[12].hasValue() ) SetDefaultObjectSizeWidth( *(sal_uInt32*) pValues[ 12 ].getValue() );
-    if( pValues[13].hasValue() ) SetDefaultObjectSizeHeight( *(sal_uInt32*) pValues[ 13 ].getValue() );
-    if( pValues[14].hasValue() ) SetPrinterIndependentLayout( *(sal_uInt16*) pValues[ 14 ].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[15].hasValue() )
-        SetShowComments(  *(sal_Bool*) pValues[ 15 ].getValue() );
+    if( pValues[14].hasValue() )
+        SetShowComments(  *(sal_Bool*) pValues[ 14 ].getValue() );
 
     // just for Impress
     if( GetConfigId() == SDCFG_IMPRESS )
     {
+        if( pValues[15].hasValue() )
+            SetStartWithTemplate( *(sal_Bool*) pValues[ 15 ].getValue() );
         if( pValues[16].hasValue() )
-            SetStartWithTemplate( *(sal_Bool*) pValues[ 16 ].getValue() );
+            SetStartWithActualPage( *(sal_Bool*) pValues[ 16 ].getValue() );
         if( pValues[17].hasValue() )
-            SetStartWithActualPage( *(sal_Bool*) pValues[ 17 ].getValue() );
+            SetSummationOfParagraphs( *(sal_Bool*) pValues[ 17 ].getValue() );
         if( pValues[18].hasValue() )
-            SetSummationOfParagraphs( *(sal_Bool*) pValues[ 18 ].getValue() );
+            SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 18 ].getValue() );
+
         if( pValues[19].hasValue() )
-            SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 19 ].getValue() );
+            SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 19 ].getValue());
 
         if( pValues[20].hasValue() )
-            SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 20 ].getValue());
+            SetPreviewNewEffects(*(sal_Bool*) pValues[ 20 ].getValue());
 
         if( pValues[21].hasValue() )
-            SetPreviewNewEffects(*(sal_Bool*) pValues[ 21 ].getValue());
+            SetPreviewChangedEffects(*(sal_Bool*) pValues[ 21 ].getValue());
 
         if( pValues[22].hasValue() )
-            SetPreviewChangedEffects(*(sal_Bool*) pValues[ 22 ].getValue());
+            SetPreviewTransitions(*(sal_Bool*) pValues[ 22 ].getValue());
 
         if( pValues[23].hasValue() )
-            SetPreviewTransitions(*(sal_Bool*) pValues[ 23 ].getValue());
+            SetDisplay(*(sal_Int32*) pValues[ 23 ].getValue());
 
         if( pValues[24].hasValue() )
-            SetDisplay(*(sal_Int32*) pValues[ 24 ].getValue());
+            SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 24 ] ) );
 
         if( pValues[25].hasValue() )
-            SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 25 ] ) );
-
-        if( pValues[26].hasValue() )
-            SetPresentationPenWidth( getSafeValue< double >( pValues[ 26 ] ) );
+            SetPresentationPenWidth( getSafeValue< double >( pValues[ 25 ] ) );
     }
 
     return sal_True;
@@ -676,29 +672,28 @@ sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const
     // The preview is not supported anymore.  Use a dummy value.
     pValues[ 9 ] <<= (double)0;// GetPreviewQuality();
     pValues[ 10 ] <<= IsSolidDragging();
-    pValues[ 11 ] <<= IsSolidMarkHdl();
-    pValues[ 12 ] <<= GetDefaultObjectSizeWidth();
-    pValues[ 13 ] <<= GetDefaultObjectSizeHeight();
-    pValues[ 14 ] <<= GetPrinterIndependentLayout();
-    pValues[ 15 ] <<= (sal_Bool)IsShowComments();
+    pValues[ 11 ] <<= GetDefaultObjectSizeWidth();
+    pValues[ 12 ] <<= GetDefaultObjectSizeHeight();
+    pValues[ 13 ] <<= GetPrinterIndependentLayout();
+    pValues[ 14 ] <<= (sal_Bool)IsShowComments();
 
     // just for Impress
     if( GetConfigId() == SDCFG_IMPRESS )
     {
-        pValues[ 16 ] <<= IsStartWithTemplate();
-        pValues[ 17 ] <<= IsStartWithActualPage();
-        pValues[ 18 ] <<= IsSummationOfParagraphs();
-        pValues[ 19 ] <<= IsShowUndoDeleteWarning();
-        pValues[ 20 ] <<= IsSlideshowRespectZOrder();
+        pValues[ 15 ] <<= IsStartWithTemplate();
+        pValues[ 16 ] <<= IsStartWithActualPage();
+        pValues[ 17 ] <<= IsSummationOfParagraphs();
+        pValues[ 18 ] <<= IsShowUndoDeleteWarning();
+        pValues[ 19 ] <<= IsSlideshowRespectZOrder();
 
-        pValues[ 21 ] <<= IsPreviewNewEffects();
-        pValues[ 22 ] <<= IsPreviewChangedEffects();
-        pValues[ 23 ] <<= IsPreviewTransitions();
+        pValues[ 20 ] <<= IsPreviewNewEffects();
+        pValues[ 21 ] <<= IsPreviewChangedEffects();
+        pValues[ 22 ] <<= IsPreviewTransitions();
 
-        pValues[ 24 ] <<= GetDisplay();
+        pValues[ 23 ] <<= GetDisplay();
 
-        pValues[ 25 ] <<= GetPresentationPenColor();
-        pValues[ 26 ] <<= GetPresentationPenWidth();
+        pValues[ 24 ] <<= GetPresentationPenColor();
+        pValues[ 25 ] <<= GetPresentationPenWidth();
     }
 
     return sal_True;
@@ -759,7 +754,6 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
         maOptionsMisc.SetDoubleClickTextEdit( pView->IsDoubleClickTextEdit() );
         maOptionsMisc.SetClickChangeRotation( pView->IsClickChangeRotation() );
         maOptionsMisc.SetSolidDragging( pView->IsSolidDragging() );
-        maOptionsMisc.SetSolidMarkHdl( pView->IsSolidMarkHdl() );
     }
     else if( pOpts )
     {
@@ -774,7 +768,6 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
         maOptionsMisc.SetDoubleClickTextEdit( pOpts->IsDoubleClickTextEdit() );
         maOptionsMisc.SetClickChangeRotation( pOpts->IsClickChangeRotation() );
         maOptionsMisc.SetSolidDragging( pOpts->IsSolidDragging() );
-        maOptionsMisc.SetSolidMarkHdl( pOpts->IsSolidMarkHdl() );
     }
 }
 
@@ -815,7 +808,6 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const
         pOpts->SetStartWithActualPage( maOptionsMisc.IsStartWithActualPage() );
         pOpts->SetSummationOfParagraphs( maOptionsMisc.IsSummationOfParagraphs() );
         pOpts->SetSolidDragging( maOptionsMisc.IsSolidDragging() );
-        pOpts->SetSolidMarkHdl( maOptionsMisc.IsSolidMarkHdl() );
         pOpts->SetShowUndoDeleteWarning( maOptionsMisc.IsShowUndoDeleteWarning() );
         pOpts->SetPrinterIndependentLayout( maOptionsMisc.GetPrinterIndependentLayout() );
         pOpts->SetShowComments( maOptionsMisc.IsShowComments() );
diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src
index 90fd733434a7..5ec5d2305231 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_HANDLES_DRAFT \
-    ToolBoxItem\
-    {\
-        Identifier = SID_HANDLES_DRAFT ; \
-        HelpID = SID_HANDLES_DRAFT ; \
-        AutoCheck = TRUE ; \
-    };
-
 #define TBI_BIG_HANDLES \
     ToolBoxItem\
     {\
diff --git a/sd/source/ui/app/toolbox2_tmpl.src b/sd/source/ui/app/toolbox2_tmpl.src
index d5033cef9127..b9bdaf4800de 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_HANDLES_DRAFT
         TBI_BIG_HANDLES
 #if SD_TOOLBOX != RID_DRAW_TOOLBOX
         TBI_SOLID_CREATE
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 42ecc2bd118b..36c9aac36c07 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -265,7 +265,6 @@ private:
     sal_Bool    bClickChangeRotation    : 1;    // Misc/RotateClick
     sal_Bool    bStartWithActualPage    : 1;    // Misc/Start/CurrentPage
     sal_Bool    bSolidDragging          : 1;    // Misc/ModifyWithAttributes
-    sal_Bool    bSolidMarkHdl           : 1;    // /Misc/SimpleHandles
     sal_Bool    bSummationOfParagraphs  : 1;    // misc/SummationOfParagraphs
     sal_Bool    bShowUndoDeleteWarning  : 1;    // Misc/ShowUndoDeleteWarning
     // #i75315#
@@ -315,7 +314,6 @@ public:
     sal_Bool    IsClickChangeRotation() const { Init(); return (sal_Bool) bClickChangeRotation; }
     sal_Bool    IsStartWithActualPage() const { Init(); return (sal_Bool) bStartWithActualPage; }
     sal_Bool    IsSolidDragging() const { Init(); return (sal_Bool) bSolidDragging; }
-    sal_Bool    IsSolidMarkHdl() const { Init(); return (sal_Bool) bSolidMarkHdl; }
     sal_Bool    IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs != 0; };
 
     /** Return the currently selected printer independent layout mode.
@@ -363,7 +361,6 @@ public:
     */
     void    SetPrinterIndependentLayout (sal_uInt16 nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } }
     void    SetSolidDragging( sal_Bool bOn = sal_True ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } }
-    void    SetSolidMarkHdl( sal_Bool bOn = sal_True ) { if( bSolidMarkHdl != bOn ) { OptionsChanged(); bSolidMarkHdl = bOn; } }
     void    SetShowUndoDeleteWarning( sal_Bool bOn = sal_True ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } }
     void    SetSlideshowRespectZOrder( sal_Bool bOn = sal_True ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } }
     void    SetDefaultObjectSizeWidth( sal_uLong nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } }
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index d645d8eb0018..892d9dd67c19 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -255,9 +255,6 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView)
     if (mpDrawView->IsEliminatePolyPoints() != pView->IsEliminatePolyPoints() )
         mpDrawView->SetEliminatePolyPoints( pView->IsEliminatePolyPoints() );
 
-    if (mpDrawView->IsSolidMarkHdl() != pView->IsSolidMarkHdl() )
-        mpDrawView->SetSolidMarkHdl( pView->IsSolidMarkHdl() );
-
     if (mpDrawView->IsSolidDragging() != pView->IsSolidDragging() )
         mpDrawView->SetSolidDragging( pView->IsSolidDragging() );
 
@@ -372,7 +369,6 @@ void DrawViewShell::WriteFrameViewData()
     mpFrameView->SetEliminatePolyPointLimitAngle( mpDrawView->GetEliminatePolyPointLimitAngle() );
     mpFrameView->SetEliminatePolyPoints( mpDrawView->IsEliminatePolyPoints() );
 
-    mpFrameView->SetSolidMarkHdl( mpDrawView->IsSolidMarkHdl() );
     mpFrameView->SetSolidDragging( mpDrawView->IsSolidDragging() );
     mpFrameView->SetQuickEdit( mpDrawView->IsQuickTextEditMode() );
 
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index 5928ddba641e..bfcee482352f 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -134,10 +134,6 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
 
     switch( nSlot )
     {
-        case SID_HANDLES_DRAFT:
-            pOptions->SetSolidMarkHdl( !mpDrawView->IsSolidMarkHdl() );
-        break;
-
         case SID_SOLID_CREATE:
             pOptions->SetSolidDragging( !mpDrawView->IsSolidDragging() );
         break;
@@ -256,7 +252,6 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
 
 void DrawViewShell::GetOptionsBarState( SfxItemSet& rSet )
 {
-    rSet.Put( SfxBoolItem( SID_HANDLES_DRAFT, !mpDrawView->IsSolidMarkHdl() ) );
     rSet.Put( SfxBoolItem( SID_SOLID_CREATE, mpDrawView->IsSolidDragging() ) );
     rSet.Put( SfxBoolItem( SID_GRID_VISIBLE, mpDrawView->IsGridVisible() ) );
     rSet.Put( SfxBoolItem( SID_GRID_USE, mpDrawView->IsGridSnap() ) );
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 124dd3f95f62..18fc3abccc0d 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -183,7 +183,6 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
         SetEliminatePolyPoints( pFrameView->IsEliminatePolyPoints() );
         SetDesignMode( pFrameView->IsDesignMode() );
 
-        SetSolidMarkHdl( pFrameView->IsSolidMarkHdl() );
         SetSolidDragging( pFrameView->IsSolidDragging() );
 
         maVisibleLayers = pFrameView->GetVisibleLayers();
@@ -350,7 +349,6 @@ void FrameView::Update(SdOptions* pOptions)
         SetEliminatePolyPointLimitAngle( pOptions->GetEliminatePolyPointLimitAngle() );
         GetModel()->SetPickThroughTransparentTextFrames( pOptions->IsPickThrough() );
 
-        SetSolidMarkHdl( pOptions->IsSolidMarkHdl() );
         SetSolidDragging( pOptions->IsSolidDragging() );
 
         SetGridCoarse( Size( pOptions->GetFldDrawX(), pOptions->GetFldDrawY() ) );
diff --git a/sd/uiconfig/sdraw/toolbar/optionsbar.xml b/sd/uiconfig/sdraw/toolbar/optionsbar.xml
index e3d92eb6a486..13a954851073 100644
--- a/sd/uiconfig/sdraw/toolbar/optionsbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/optionsbar.xml
@@ -17,9 +17,8 @@
  <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:HandlesDraft" toolbar:helpid="helpid:27150"  toolbar:style="auto" />
  <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" />
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/optionsbar.xml b/sd/uiconfig/simpress/toolbar/optionsbar.xml
index 6b6325bb9c78..9fe4141b8207 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:HandlesDraft" toolbar:helpid="27150"/>
  <toolbar:toolbaritem xlink:href=".uno:BigHandles" toolbar:helpid="27168"/>
  <toolbar:toolbaritem xlink:href=".uno:SolidCreate" toolbar:helpid="helpid:27151"/>
  <toolbar:toolbarseparator/>