Remove Large Handles option

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

57 files changed, 71 insertions, 300 deletions

diff --git a/default_images/cmd/lc_bighandles.png b/default_images/cmd/lc_bighandles.png
deleted file mode 100644
index c884cc22e4c1..000000000000
--- a/default_images/cmd/lc_bighandles.png
+++ /dev/null
diff --git a/default_images/cmd/sc_bighandles.png b/default_images/cmd/sc_bighandles.png
deleted file mode 100644
index 1224eec04f94..000000000000
--- a/default_images/cmd/sc_bighandles.png
+++ /dev/null
diff --git a/filter/source/xslt/import/uof/uof2odf_presentation.xsl b/filter/source/xslt/import/uof/uof2odf_presentation.xsl
index 8e03235c63bc..3c9c569e022a 100644
--- a/filter/source/xslt/import/uof/uof2odf_presentation.xsl
+++ b/filter/source/xslt/import/uof/uof2odf_presentation.xsl
@@ -37,7 +37,6 @@
 							<config:config-item config:name="PageKind" config:type="short">0</config:config-item>
 							<config:config-item config:name="SelectedPage" config:type="short">0</config:config-item>
 							<config:config-item config:name="IsLayerMode" config:type="boolean">false</config:config-item>
-							<config:config-item config:name="IsBigHandles" config:type="boolean">false</config:config-item>
 							<config:config-item config:name="IsDoubleClickTextEdit" config:type="boolean">true</config:config-item>
 							<config:config-item config:name="IsClickChangeRotation" config:type="boolean">false</config:config-item>
 							<config:config-item config:name="SlidesPerRow" config:type="short">4</config:config-item>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 84649499c29e..d97348ec5917 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1525,15 +1525,6 @@
           <value xml:lang="en-US">24 Bit True Color</value>
         </prop>
       </node>
-      <node oor:name=".uno:BigHandles" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-
-          <value xml:lang="en-US">Large Handles</value>
-        </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>1</value>
-        </prop>
-      </node>
       <node oor:name=".uno:DoubleClickTextEdit" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index 0cb2ee0eab74..14509143d360 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -364,17 +364,6 @@
 				</info>
 				<value>true</value>
 			</prop>
-      <prop oor:name="BigHandles" oor:type="xs:boolean">
-				<!-- OldPath: Draw/Other -->
-				<!-- OldLocation: soffice.cfg -->
-				<!-- UIHints: Optionbar -->
-				<info>
-					<author>AF</author>
-					<desc>Indicates whether to show big (true) or small (false) handles.</desc>
-					<label>Big Handles</label>
-				</info>
-                <value>true</value>
-			</prop>
 			<prop oor:name="ModifyWithAttributes" oor:type="xs:boolean">
 				<!-- OldPath: Draw/Other -->
 				<!-- OldLocation: soffice.cfg -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 2876a2909308..1b549d66b29b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -408,16 +408,6 @@
         </info>
         <value>true</value>
       </prop>
-      <prop oor:name="BigHandles" oor:type="xs:boolean">
-        <!-- OldPath: Impress/Other -->
-        <!-- OldLocation: soffice.cfg -->
-        <!-- UIHints: Optionbar -->
-        <info>
-          <desc>Indicates whether to show big (true) or small (false) handles.</desc>
-          <label>Big Handles</label>
-        </info>
-        <value>true</value>
-      </prop>
       <prop oor:name="ModifyWithAttributes" oor:type="xs:boolean">
         <!-- OldPath: Impress/Other -->
         <!-- OldLocation: soffice.cfg -->
diff --git a/ooo_custom_images/crystal/cmd/lc_bighandles.png b/ooo_custom_images/crystal/cmd/lc_bighandles.png
deleted file mode 100644
index e6c894d43357..000000000000
--- a/ooo_custom_images/crystal/cmd/lc_bighandles.png
+++ /dev/null
diff --git a/ooo_custom_images/crystal/cmd/sc_bighandles.png b/ooo_custom_images/crystal/cmd/sc_bighandles.png
deleted file mode 100644
index e0756c49f240..000000000000
--- a/ooo_custom_images/crystal/cmd/sc_bighandles.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/lc_bighandles.png b/ooo_custom_images/hicontrast/cmd/lc_bighandles.png
deleted file mode 100644
index 5878ddf58108..000000000000
--- a/ooo_custom_images/hicontrast/cmd/lc_bighandles.png
+++ /dev/null
diff --git a/ooo_custom_images/hicontrast/cmd/sc_bighandles.png b/ooo_custom_images/hicontrast/cmd/sc_bighandles.png
deleted file mode 100644
index 879e51c5d898..000000000000
--- a/ooo_custom_images/hicontrast/cmd/sc_bighandles.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/lc_bighandles.png b/ooo_custom_images/human/cmd/lc_bighandles.png
deleted file mode 100644
index c694b0a71093..000000000000
--- a/ooo_custom_images/human/cmd/lc_bighandles.png
+++ /dev/null
diff --git a/ooo_custom_images/human/cmd/sc_bighandles.png b/ooo_custom_images/human/cmd/sc_bighandles.png
deleted file mode 100644
index 7388a6a13f1b..000000000000
--- a/ooo_custom_images/human/cmd/sc_bighandles.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/cmd/lc_bighandles.png b/ooo_custom_images/industrial/cmd/lc_bighandles.png
deleted file mode 100644
index c694b0a71093..000000000000
--- a/ooo_custom_images/industrial/cmd/lc_bighandles.png
+++ /dev/null
diff --git a/ooo_custom_images/industrial/cmd/sc_bighandles.png b/ooo_custom_images/industrial/cmd/sc_bighandles.png
deleted file mode 100644
index 7388a6a13f1b..000000000000
--- a/ooo_custom_images/industrial/cmd/sc_bighandles.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/lc_bighandles.png b/ooo_custom_images/oxygen/cmd/lc_bighandles.png
deleted file mode 100644
index e6c894d43357..000000000000
--- a/ooo_custom_images/oxygen/cmd/lc_bighandles.png
+++ /dev/null
diff --git a/ooo_custom_images/oxygen/cmd/sc_bighandles.png b/ooo_custom_images/oxygen/cmd/sc_bighandles.png
deleted file mode 100644
index e0756c49f240..000000000000
--- a/ooo_custom_images/oxygen/cmd/sc_bighandles.png
+++ /dev/null
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 63d244b9ac8e..0c763cefb697 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -56,8 +56,7 @@ enum ScViewOption
     VOPT_HELPLINES,
     VOPT_ANCHOR,
     VOPT_PAGEBREAKS,
-    VOPT_CLIPMARKS,
-    VOPT_BIGHANDLES
+    VOPT_CLIPMARKS
 };
 
 enum ScVObjType
@@ -67,7 +66,7 @@ enum ScVObjType
     VOBJ_TYPE_DRAW
 };
 
-#define MAX_OPT             (sal_uInt16)VOPT_BIGHANDLES+1
+#define MAX_OPT             (sal_uInt16)VOPT_CLIPMARKS+1
 #define MAX_TYPE            (sal_uInt16)VOBJ_TYPE_DRAW+1
 
 #define SC_STD_GRIDCOLOR    COL_LIGHTGRAY
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 41a59cb223b2..cf763b07ea83 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -152,7 +152,6 @@ void ScViewOptions::SetDefaults()
     aOptArr[ VOPT_SYNTAX      ] =
     aOptArr[ VOPT_HELPLINES   ] =
     aOptArr[ VOPT_GRID_ONTOP  ] =
-    aOptArr[ VOPT_BIGHANDLES  ] = false;
     aOptArr[ VOPT_NOTES       ] =
     aOptArr[ VOPT_NULLVALS    ] =
     aOptArr[ VOPT_VSCROLL     ] =
@@ -299,8 +298,6 @@ SfxPoolItem* ScTpViewItem::Clone( SfxItemPool * ) const
 #define SCLAYOUTOPT_GRIDCOLOR       1
 #define SCLAYOUTOPT_PAGEBREAK       2
 #define SCLAYOUTOPT_GUIDE           3
-#define SCLAYOUTOPT_SIMPLECONT      4
-#define SCLAYOUTOPT_LARGECONT       5
 #define SCLAYOUTOPT_COLROWHDR       6
 #define SCLAYOUTOPT_HORISCROLL      7
 #define SCLAYOUTOPT_VERTSCROLL      8
@@ -345,8 +342,6 @@ Sequence<OUString> ScViewCfg::GetLayoutPropertyNames()
         "Line/GridLineColor",       // SCLAYOUTOPT_GRIDCOLOR
         "Line/PageBreak",           // SCLAYOUTOPT_PAGEBREAK
         "Line/Guide",               // SCLAYOUTOPT_GUIDE
-        "Line/SimpleControlPoint",  // SCLAYOUTOPT_SIMPLECONT
-        "Line/LargeControlPoint",   // SCLAYOUTOPT_LARGECONT
         "Window/ColumnRowHeader",   // SCLAYOUTOPT_COLROWHDR
         "Window/HorizontalScroll",  // SCLAYOUTOPT_HORISCROLL
         "Window/VerticalScroll",    // SCLAYOUTOPT_VERTSCROLL
@@ -454,9 +449,6 @@ ScViewCfg::ScViewCfg() :
                     case SCLAYOUTOPT_GUIDE:
                         SetOption( VOPT_HELPLINES, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
                         break;
-                    case SCLAYOUTOPT_LARGECONT:
-                        SetOption( VOPT_BIGHANDLES, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
-                        break;
                     case SCLAYOUTOPT_COLROWHDR:
                         SetOption( VOPT_HEADER, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
                         break;
@@ -621,9 +613,6 @@ IMPL_LINK( ScViewCfg, LayoutCommitHdl, void *, EMPTYARG )
             case SCLAYOUTOPT_GUIDE:
                 ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_HELPLINES ) );
                 break;
-            case SCLAYOUTOPT_LARGECONT:
-                ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_BIGHANDLES ) );
-                break;
             case SCLAYOUTOPT_COLROWHDR:
                 ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_HEADER ) );
                 break;
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 5b74ebe4c656..15c32cf8d98a 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -154,7 +154,6 @@
 #define GB_TAB          64
 #define MF_TAB          65
 #define CB_PAGEBREAKS   66
-#define CB_BIGHANDLES   68
 #define FT_TAB          69
 #define FT_UNIT         70
 #define FL_SEPARATOR1   71
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 260ee38d297e..015b9177a33f 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -53,7 +53,6 @@ class ScTpContentOptions : public SfxTabPage
     ColorListBox    aColorLB;
     CheckBox        aBreakCB;
     CheckBox        aGuideLineCB;
-    CheckBox        aBigHandleCB;
 
     FixedLine       aSeparator1FL;
 
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index d52514df8d13..c237288e1b9b 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -66,7 +66,6 @@ ScTpContentOptions::ScTpContentOptions( Window*         pParent,
     aColorLB( this,         ScResId(LB_COLOR            )),
     aBreakCB( this,         ScResId(CB_PAGEBREAKS       )),
     aGuideLineCB( this,     ScResId(CB_GUIDELINE        )),
-    aBigHandleCB( this,     ScResId(CB_BIGHANDLES       )),
 
     aSeparator1FL    (this, ScResId(FL_SEPARATOR1 )),
     aDisplayGB( this,   ScResId(GB_DISPLAY)),
@@ -122,7 +121,6 @@ ScTpContentOptions::ScTpContentOptions( Window*         pParent,
     aOutlineCB  .SetClickHdl(aCBHdl);
     aBreakCB    .SetClickHdl(aCBHdl);
     aGuideLineCB.SetClickHdl(aCBHdl);
-    aBigHandleCB.SetClickHdl(aCBHdl);
     aRowColHeaderCB.SetClickHdl(aCBHdl);
 
 }
@@ -158,8 +156,7 @@ sal_Bool    ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
         aOutlineCB      .GetSavedValue() != aOutlineCB     .IsChecked() ||
         aColorLB        .GetSavedValue() != aColorLB       .GetSelectEntryPos() ||
         aBreakCB        .GetSavedValue() != aBreakCB       .IsChecked() ||
-        aGuideLineCB    .GetSavedValue() != aGuideLineCB   .IsChecked() ||
-        aBigHandleCB    .GetSavedValue() != aBigHandleCB   .IsChecked())
+        aGuideLineCB    .GetSavedValue() != aGuideLineCB   .IsChecked())
     {
         pLocalOptions->SetGridColor( aColorLB.GetSelectEntryColor(),
                                      aColorLB.GetSelectEntry() );
@@ -210,7 +207,6 @@ void    ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
 
     aBreakCB.Check( pLocalOptions->GetOption(VOPT_PAGEBREAKS) );
     aGuideLineCB.Check( pLocalOptions->GetOption(VOPT_HELPLINES) );
-    aBigHandleCB.Check( pLocalOptions->GetOption(VOPT_BIGHANDLES) );
 
     if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, false, &pItem))
         aRangeFindCB.Check(((const SfxBoolItem*)pItem)->GetValue());
@@ -238,7 +234,6 @@ void    ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
     aColorLB        .SaveValue();
     aBreakCB        .SaveValue();
     aGuideLineCB    .SaveValue();
-    aBigHandleCB    .SaveValue();
 }
 
 void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
@@ -288,7 +283,6 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
     else if ( &aOutlineCB       == pBtn )   eOption = VOPT_OUTLINER;
     else if ( &aBreakCB         == pBtn )   eOption = VOPT_PAGEBREAKS;
     else if ( &aGuideLineCB     == pBtn )   eOption = VOPT_HELPLINES;
-    else if ( &aBigHandleCB     == pBtn )   eOption = VOPT_BIGHANDLES;
     else if ( &aRowColHeaderCB  == pBtn )   eOption = VOPT_HEADER;
 
     pLocalOptions->SetOption( eOption, bChecked );
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index b70900e4715e..93378d13b1c9 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -497,13 +497,6 @@ TabPage RID_SCPAGE_CONTENT
         Size = MAP_APPFONT ( 112 , 10 ) ;
         Text [ en-US ] = "Helplines ~While Moving";
     };
-    CheckBox CB_BIGHANDLES
-    {
-        HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_BIGHANDLES";
-        Pos = MAP_APPFONT ( 12 , 84 ) ;
-        Size = MAP_APPFONT ( 112 , 10 ) ;
-        Text [ en-US ] = "~Large handles";
-    };
     FixedLine FL_SEPARATOR1
     {
         Pos = MAP_APPFONT ( 130 , 14 ) ;
@@ -566,20 +559,20 @@ TabPage RID_SCPAGE_CONTENT
     };
     FixedLine GB_OBJECT
     {
-        Pos = MAP_APPFONT ( 6 , 100 ) ;
+        Pos = MAP_APPFONT ( 6 , 72 ) ;
         Size = MAP_APPFONT ( 121 , 8 ) ;
         Text [ en-US ] = "Objects" ;
     };
     FixedText FT_OBJGRF
     {
-        Pos = MAP_APPFONT ( 12 , 113 ) ;
+        Pos = MAP_APPFONT ( 12 , 85 ) ;
         Size = MAP_APPFONT ( 68 , 8 ) ;
         Text [ en-US ] = "Ob~jects/Graphics" ;
     };
     ListBox LB_OBJGRF
     {
         HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_OBJGRF";
-        Pos = MAP_APPFONT ( 84 , 111 ) ;
+        Pos = MAP_APPFONT ( 84 , 83 ) ;
         Size = MAP_APPFONT ( 40 , 46 ) ;
         Border = TRUE ;
         DropDown = TRUE ;
@@ -591,14 +584,14 @@ TabPage RID_SCPAGE_CONTENT
     };
     FixedText FT_DIAGRAM
     {
-        Pos = MAP_APPFONT ( 12 , 129 ) ;
+        Pos = MAP_APPFONT ( 12 , 101 ) ;
         Size = MAP_APPFONT ( 68 , 8 ) ;
         Text [ en-US ] = "Cha~rts" ;
     };
     ListBox LB_DIAGRAM
     {
         HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_DIAGRAM";
-        Pos = MAP_APPFONT ( 84 , 127 ) ;
+        Pos = MAP_APPFONT ( 84 , 99 ) ;
         Size = MAP_APPFONT ( 40 , 46 ) ;
         Border = TRUE ;
         DropDown = TRUE ;
@@ -611,14 +604,14 @@ TabPage RID_SCPAGE_CONTENT
     };
     FixedText FT_DRAW
     {
-        Pos = MAP_APPFONT ( 12 , 145 ) ;
+        Pos = MAP_APPFONT ( 12 , 117 ) ;
         Size = MAP_APPFONT ( 68 , 8 ) ;
         Text [ en-US ] = "~Drawing objects" ;
     };
     ListBox LB_DRAW
     {
         HelpID = "sc:ListBox:RID_SCPAGE_CONTENT:LB_DRAW";
-        Pos = MAP_APPFONT ( 84 , 143 ) ;
+        Pos = MAP_APPFONT ( 84 , 115 ) ;
         Size = MAP_APPFONT ( 40 , 46 ) ;
         Border = TRUE ;
         DropDown = TRUE ;
@@ -631,14 +624,14 @@ TabPage RID_SCPAGE_CONTENT
     };
     FixedLine GB_ZOOM
     {
-        Pos = MAP_APPFONT ( 6 , 160 ) ;
+        Pos = MAP_APPFONT ( 6 , 132 ) ;
         Size = MAP_APPFONT ( 121 , 8 ) ;
         Text [ en-US ] = "Zoom";
     };
     CheckBox CB_SYNCZOOM
     {
         HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_SYNCZOOM";
-        Pos = MAP_APPFONT ( 12 , 171 ) ;
+        Pos = MAP_APPFONT ( 12 , 143 ) ;
         Size = MAP_APPFONT ( 112 , 10 ) ;
         Text [ en-US ] = "S~ynchronize sheets" ;
     };
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index cb4f3ac61d2c..2243e7507146 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -70,7 +70,6 @@ using namespace com::sun::star;
 // -----------------------------------------------------------------------
 
 #define SC_HANDLESIZE_BIG       9
-#define SC_HANDLESIZE_SMALL     7
 
 // -----------------------------------------------------------------------
 
@@ -552,10 +551,8 @@ void ScDrawView::UpdateUserViewOptions()
         const ScViewOptions&    rOpt = pViewData->GetOptions();
         const ScGridOptions&    rGrid = rOpt.GetGridOptions();
 
-        sal_Bool bBigHdl = rOpt.GetOption( VOPT_BIGHANDLES );
-
         SetDragStripes( rOpt.GetOption( VOPT_HELPLINES ) );
-        SetMarkHdlSizePixel( bBigHdl ? SC_HANDLESIZE_BIG : SC_HANDLESIZE_SMALL );
+        SetMarkHdlSizePixel( SC_HANDLESIZE_BIG );
 
         SetGridVisible( rGrid.GetGridVisible() );
         SetSnapEnabled( rGrid.GetUseGridSnap() );
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"/>
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index d0fb01c4df2d..3d2e7868a0b0 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -133,16 +133,16 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
         default:
         {
             OSL_FAIL( "Unknown kind of marker." );
-            // no break here, return Rect_7x7 as default
+            // no break here, return Rect_9x9 as default
         }
-        case Rect_7x7:
+        case Rect_9x9:
         {
-            return impGetOrCreateTargetBitmap((0 * INDEX_COUNT) + nInd, Rectangle(Point(0, nYPos), Size(7, 7)));
+            return impGetOrCreateTargetBitmap((1 * INDEX_COUNT) + nInd, Rectangle(Point(7, nYPos), Size(9, 9)));
         }
 
-        case Rect_9x9:
+        case Rect_7x7:
         {
-            return impGetOrCreateTargetBitmap((1 * INDEX_COUNT) + nInd, Rectangle(Point(7, nYPos), Size(9, 9)));
+            return impGetOrCreateTargetBitmap((0 * INDEX_COUNT) + nInd, Rectangle(Point(0, nYPos), Size(7, 7)));
         }
 
         case Rect_11x11:
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 0c3e15625d36..1d5be794536c 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -75,7 +75,6 @@ namespace svtools{ class ColorConfig;}
 #define VIEWOPT_CORE2_CRSR_IN_PROT      0x00000008L
 #define VIEWOPT_CORE2_PDF_EXPORT        0x00000010L
 #define VIEWOPT_CORE2_PRINTING          0x00000020L
-#define VIEWOPT_CORE2_BIGMARKHDL        0x00000040L
 
 #define VIEWOPT_2_UNUSED1           0x00000100L
 #define VIEWOPT_2_UNUSED2           0x00000200L
@@ -290,11 +289,6 @@ public:
     inline void SetPageBack( sal_Bool b )
         { (b != 0) ? (nCoreOptions |= VIEWOPT_1_PAGEBACK) : ( nCoreOptions &= ~VIEWOPT_1_PAGEBACK); }
 
-    inline sal_Bool IsBigMarkHdl() const
-        { return nCore2Options & VIEWOPT_CORE2_BIGMARKHDL ? sal_True : sal_False;}
-    inline void SetBigMarkHdl(sal_Bool b)
-        { (b != 0) ? (nCore2Options |=  VIEWOPT_CORE2_BIGMARKHDL ) : (nCore2Options &=  ~VIEWOPT_CORE2_BIGMARKHDL);}
-
     inline sal_Bool IsTable() const
         { return nCoreOptions & VIEWOPT_1_TABLE ? sal_True : sal_False; }
     inline void SetTable( sal_Bool b )
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 253008e92637..337d3f17058c 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -92,8 +92,8 @@ void SwViewImp::Init( const SwViewOption *pNewOpt )
 
     pDrawView->SetUseIncompatiblePathCreateInterface( sal_False );
 
-    // it's a JOE interface !
-    pDrawView->SetMarkHdlSizePixel(pNewOpt->IsBigMarkHdl() ? 9 : 7);
+    // set handle size to 9 pixels, always
+    pDrawView->SetMarkHdlSizePixel(9);
 }
 
 SwViewImp::SwViewImp( ViewShell *pParent ) :
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 0afe8124ebe9..41f1443ed612 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1977,9 +1977,8 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
         Fraction aSnGrWdtY(rSz.Height(), rOpt.GetDivisionY() + 1);
         pDView->SetSnapGridWidth( aSnGrWdtX, aSnGrWdtY );
 
-            // it's a JOE interface !
-        if ( pOpt->IsBigMarkHdl() != rOpt.IsBigMarkHdl() )
-            pDView->SetMarkHdlSizePixel(rOpt.IsBigMarkHdl() ? 9 : 7);
+            // set handle size to 9 pixels, always
+            pDView->SetMarkHdlSizePixel(9);
     }
 
     sal_Bool bOnlineSpellChgd = pOpt->IsOnlineSpell() != rOpt.IsOnlineSpell();
diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx
index 7d78e4570dba..22d4b20402a2 100644
--- a/sw/source/ui/config/cfgitems.cxx
+++ b/sw/source/ui/config/cfgitems.cxx
@@ -143,7 +143,6 @@ SwElemItem::SwElemItem( sal_uInt16 _nWhich ) :
     bVertRuler     =
     bVertRulerRight=
     bCrosshair     =
-    bBigHandles     =
     bSmoothScroll  =
     bTable              =
     bGraphic            =
@@ -168,7 +167,6 @@ SwElemItem::SwElemItem(const SwViewOption& rVOpt, sal_uInt16 _nWhich) :
     bVertRuler      = rVOpt.IsViewVRuler(sal_True);
     bVertRulerRight = rVOpt.IsVRulerRight();
     bCrosshair      = rVOpt.IsCrossHair();
-    bBigHandles     = rVOpt.IsBigMarkHdl();
     bSmoothScroll   = rVOpt.IsSmoothScroll();
     bTable              = rVOpt.IsTable();
     bGraphic            = rVOpt.IsGraphic();
@@ -196,7 +194,6 @@ int SwElemItem::operator==( const SfxPoolItem& rAttr ) const
                 bVertRuler      == rItem.bVertRuler     &&
                 bVertRulerRight == rItem.bVertRulerRight&&
                 bCrosshair      == rItem.bCrosshair     &&
-                bBigHandles     == rItem.bBigHandles    &&
                 bSmoothScroll   == rItem.bSmoothScroll  &&
                 bTable                == rItem.bTable              &&
                 bGraphic              == rItem.bGraphic            &&
@@ -214,7 +211,6 @@ void  SwElemItem::operator=( const SwElemItem& rElemItem)
     bVertRuler      = rElemItem.  bVertRuler        ;
     bVertRulerRight = rElemItem.  bVertRulerRight   ;
     bCrosshair      = rElemItem.  bCrosshair        ;
-    bBigHandles     = rElemItem.  bBigHandles       ;
     bSmoothScroll   = rElemItem.  bSmoothScroll     ;
     bTable              = rElemItem.bTable                ;
     bGraphic            = rElemItem.bGraphic              ;
@@ -232,7 +228,6 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const
     rVOpt.SetViewVRuler(bVertRuler    );
     rVOpt.SetVRulerRight(bVertRulerRight );
     rVOpt.SetCrossHair(bCrosshair     );
-    rVOpt.SetBigMarkHdl(bBigHandles );
     rVOpt.SetSmoothScroll(bSmoothScroll);
     rVOpt.SetTable      (bTable             );
     rVOpt.SetGraphic    (bGraphic           );
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 07cc1d7fba2a..c47594865747 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -61,20 +61,6 @@ TabPage TP_CONTENT_OPT
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "Helplines ~While Moving";
     };
-    CheckBox CB_HANDLE
-    {
-        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_HANDLE";
-        Pos = MAP_APPFONT ( 12 , 27 ) ;
-        Size = MAP_APPFONT ( 118 , 10 ) ;
-        Text [ en-US ] = "Sim~ple handles";
-    };
-    CheckBox CB_BIGHANDLE
-    {
-        HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_BIGHANDLE";
-        Pos = MAP_APPFONT ( 12 , 40 ) ;
-        Size = MAP_APPFONT ( 118 , 10 ) ;
-        Text [ en-US ] = "Large handles";
-    };
     FixedLine FL_WINDOW
     {
         Pos = MAP_APPFONT ( 130 , 3 ) ;
@@ -147,7 +133,7 @@ TabPage TP_CONTENT_OPT
     };
     FixedLine FL_DISP
     {
-        Pos = MAP_APPFONT ( 6 , 56 ) ;
+        Pos = MAP_APPFONT ( 6 , 30 ) ;
         Size = MAP_APPFONT ( 118 , 8 ) ;
         Text [ en-US ] = "Display" ;
         Group = TRUE ;
@@ -155,7 +141,7 @@ TabPage TP_CONTENT_OPT
     CheckBox CB_GRF
     {
         HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_GRF";
-        Pos = MAP_APPFONT ( 12 , 67 ) ;
+        Pos = MAP_APPFONT ( 12 , 41 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "~Graphics and objects" ;
         TabStop = TRUE ;
@@ -164,28 +150,28 @@ TabPage TP_CONTENT_OPT
     CheckBox CB_TBL
     {
         HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_TBL";
-        Pos = MAP_APPFONT ( 12 , 80 ) ;
+        Pos = MAP_APPFONT ( 12 , 54 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "~Tables " ;
     };
     CheckBox CB_DRWFAST
     {
         HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_DRWFAST";
-        Pos = MAP_APPFONT ( 12 , 93 ) ;
+        Pos = MAP_APPFONT ( 12 , 67 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "Dra~wings and controls" ;
     };
     CheckBox CB_FIELD
     {
         HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_FIELD";
-        Pos = MAP_APPFONT ( 12 , 106 ) ;
+        Pos = MAP_APPFONT ( 12 , 80 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "~Field codes" ;
     };
     CheckBox CB_POSTIT
     {
         HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_POSTIT";
-        Pos = MAP_APPFONT ( 12 , 119 ) ;
+        Pos = MAP_APPFONT ( 12 , 103 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         Text [ en-US ] = "~Comments" ;
     };
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 50f405450c11..c8be2e244780 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -90,7 +90,6 @@ SwContentOptPage::SwContentOptPage( Window* pParent,
     SfxTabPage( pParent, SW_RES( TP_CONTENT_OPT ), rCoreSet ),
     aLineFL       ( this,   SW_RES( FL_LINE     ) ),
     aCrossCB      ( this,   SW_RES( CB_CROSS     ) ),
-    aBigHandleCB  ( this,   SW_RES( CB_BIGHANDLE) ),
 
     aWindowFL     ( this,   SW_RES( FL_WINDOW   ) ),
     aHScrollBox   ( this,   SW_RES( CB_HSCROLL   ) ),
@@ -215,7 +214,6 @@ void SwContentOptPage::Reset(const SfxItemSet& rSet)
         aFldNameCB  .Check  (pElemAttr->bFieldName            );
         aPostItCB   .Check  (pElemAttr->bNotes                );
         aCrossCB   .Check( pElemAttr->bCrosshair        );
-        aBigHandleCB.Check(pElemAttr->bBigHandles       );
         aHScrollBox.Check( pElemAttr->bHorzScrollbar     );
         aVScrollBox.Check( pElemAttr->bVertScrollbar     );
         aAnyRulerCB.Check( pElemAttr->bAnyRuler );
@@ -245,7 +243,6 @@ sal_Bool SwContentOptPage::FillItemSet(SfxItemSet& rSet)
     aElem.bFieldName            = aFldNameCB    .IsChecked();
     aElem.bNotes                = aPostItCB     .IsChecked();
     aElem.bCrosshair     = aCrossCB   .IsChecked();
-    aElem.bBigHandles    = aBigHandleCB.IsChecked();
     aElem.bHorzScrollbar = aHScrollBox.IsChecked();
     aElem.bVertScrollbar = aVScrollBox.IsChecked();
     aElem.bAnyRuler = aAnyRulerCB.IsChecked();
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index b329281b4eca..0d39be649782 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -286,7 +286,6 @@ void SwLayoutViewConfig::Commit()
         switch(nProp)
         {
             case  0: rVal <<= (sal_Bool) rParent.IsCrossHair(); break;              // "Line/Guide",
-            case  2: rVal <<= (sal_Bool) rParent.IsBigMarkHdl(); break;             // "Line/LargeControlPoint",
             case  3: rVal <<= (sal_Bool) rParent.IsViewHScrollBar(); break;         // "Window/HorizontalScroll",
             case  4: rVal <<= (sal_Bool) rParent.IsViewVScrollBar(); break;         // "Window/VerticalScroll",
             case  5: rVal <<= (sal_Bool) rParent.IsViewAnyRuler(); break;           // "Window/ShowRulers"
@@ -338,7 +337,6 @@ void SwLayoutViewConfig::Load()
                 switch(nProp)
                 {
                     case  0: rParent.SetCrossHair(bSet); break;// "Line/Guide",
-                    case  2: rParent.SetBigMarkHdl(bSet); break;// "Line/LargeControlPoint",
                     case  3: rParent.SetViewHScrollBar(bSet); break;// "Window/HorizontalScroll",
                     case  4: rParent.SetViewVScrollBar(bSet); break;// "Window/VerticalScroll",
                     case  5: rParent.SetViewAnyRuler(bSet);break; // "Window/ShowRulers"
diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx
index 68df6ea93d3a..aed0bb91d588 100644
--- a/sw/source/ui/inc/cfgitems.hxx
+++ b/sw/source/ui/inc/cfgitems.hxx
@@ -104,7 +104,6 @@ class SW_DLLPUBLIC SwElemItem : public SfxPoolItem
     //visual aids
     sal_Bool bCrosshair     :1;
     sal_Bool bHandles       :1;
-    sal_Bool bBigHandles    :1;
     //display
     sal_Bool bTable             :1;
     sal_Bool bGraphic           :1;
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index 017720ae81d7..382441962599 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -51,7 +51,6 @@ class SwContentOptPage : public SfxTabPage
     //visual aids
     FixedLine   aLineFL;
     CheckBox    aCrossCB;
-    CheckBox    aBigHandleCB;
 
     //view
     FixedLine   aWindowFL;
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index 6672f005b7e2..a56f5841f5b7 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -207,7 +207,6 @@ MasterPropertySetInfo * lcl_createSettingsInfo()
         { RTL_CONSTASCII_STRINGPARAM("ShowTableLimitGuide"),        HANDLE_SHOW_TABLE_LIMIT_GUIDE,          CPPUTYPE_BOOLEAN,           0,   0},
         { RTL_CONSTASCII_STRINGPARAM("ShowSectionLimitGuide"),      HANDLE_SHOW_SECTION_LIMIT_GUIDE,        CPPUTYPE_BOOLEAN,           0,   0},
         { RTL_CONSTASCII_STRINGPARAM("ShowGuidesWhileMoving"),      HANDLE_SHOW_GUIDES_WHILE_MOVING,        CPPUTYPE_BOOLEAN,           0,   0},
-        { RTL_CONSTASCII_STRINGPARAM("ShowLargeHandles"),           HANDLE_SHOW_LARGE_HANDLES,              CPPUTYPE_BOOLEAN,           0,   0},
 */
         { NULL, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 }
     };
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optionsbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optionsbar.xml
index 13a954851073..dac856b7669c 100644
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optionsbar.xml
+++ b/test/user-template/user/config/soffice.cfg/modules/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/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optionsbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optionsbar.xml
index 9fe4141b8207..e9f8b5199a5c 100644
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optionsbar.xml
+++ b/test/user-template/user/config/soffice.cfg/modules/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"/>
diff --git a/test/user-template/user/xslt/import/uof/uof2odf_presentation.xsl b/test/user-template/user/xslt/import/uof/uof2odf_presentation.xsl
index 8e03235c63bc..3c9c569e022a 100644
--- a/test/user-template/user/xslt/import/uof/uof2odf_presentation.xsl
+++ b/test/user-template/user/xslt/import/uof/uof2odf_presentation.xsl
@@ -37,7 +37,6 @@
 							<config:config-item config:name="PageKind" config:type="short">0</config:config-item>
 							<config:config-item config:name="SelectedPage" config:type="short">0</config:config-item>
 							<config:config-item config:name="IsLayerMode" config:type="boolean">false</config:config-item>
-							<config:config-item config:name="IsBigHandles" config:type="boolean">false</config:config-item>
 							<config:config-item config:name="IsDoubleClickTextEdit" config:type="boolean">true</config:config-item>
 							<config:config-item config:name="IsClickChangeRotation" config:type="boolean">false</config:config-item>
 							<config:config-item config:name="SlidesPerRow" config:type="short">4</config:config-item>
diff --git a/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt b/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt
index b02b8fada10a..1c8c16825e13 100755
--- a/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt
+++ b/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt
@@ -979,7 +979,6 @@ OpenOffice.org Chart : gutter
 OpenOffice.org Chart : handles
 OpenOffice.org Chart : handles;displaying (Writer)
 OpenOffice.org Chart : handles;scaling
-OpenOffice.org Chart : handles;showing simple/large handles (Calc)
 OpenOffice.org Chart : Hangul/Hanja
 OpenOffice.org Chart : hatching
 OpenOffice.org Chart : headers
@@ -1172,7 +1171,6 @@ OpenOffice.org Chart : languages;selecting for text
 OpenOffice.org Chart : languages;setting options
 OpenOffice.org Chart : languages;spellcheck
 OpenOffice.org Chart : languages;spellchecking and formatting
-OpenOffice.org Chart : large handles (Writer)
 OpenOffice.org Chart : large icons
 OpenOffice.org Chart : layer arrangement
 OpenOffice.org Chart : layout
@@ -3382,7 +3380,6 @@ OpenOffice.org Basic : gutter
 OpenOffice.org Basic : handles
 OpenOffice.org Basic : handles;displaying (Writer)
 OpenOffice.org Basic : handles;scaling
-OpenOffice.org Basic : handles;showing simple/large handles (Calc)
 OpenOffice.org Basic : Hangul/Hanja
 OpenOffice.org Basic : HasUnoInterfaces function
 OpenOffice.org Basic : hatching
@@ -3601,7 +3598,6 @@ OpenOffice.org Basic : languages;selecting for text
 OpenOffice.org Basic : languages;setting options
 OpenOffice.org Basic : languages;spellcheck
 OpenOffice.org Basic : languages;spellchecking and formatting
-OpenOffice.org Basic : large handles (Writer)
 OpenOffice.org Basic : large icons
 OpenOffice.org Basic : layer arrangement
 OpenOffice.org Basic : layout
@@ -6505,7 +6501,6 @@ OpenOffice.org Calc : gutter
 OpenOffice.org Calc : handles
 OpenOffice.org Calc : handles;displaying (Writer)
 OpenOffice.org Calc : handles;scaling
-OpenOffice.org Calc : handles;showing simple/large handles (Calc)
 OpenOffice.org Calc : Hangul/Hanja
 OpenOffice.org Calc : HARMEAN function
 OpenOffice.org Calc : hatching
@@ -6835,7 +6830,6 @@ OpenOffice.org Calc : languages;setting options
 OpenOffice.org Calc : languages;spellcheck
 OpenOffice.org Calc : languages;spellchecking and formatting
 OpenOffice.org Calc : LARGE function
-OpenOffice.org Calc : large handles (Writer)
 OpenOffice.org Calc : large icons
 OpenOffice.org Calc : layer arrangement
 OpenOffice.org Calc : layout
@@ -9519,7 +9513,6 @@ OpenOffice.org Base : gutter
 OpenOffice.org Base : handles
 OpenOffice.org Base : handles;displaying (Writer)
 OpenOffice.org Base : handles;scaling
-OpenOffice.org Base : handles;showing simple/large handles (Calc)
 OpenOffice.org Base : Hangul/Hanja
 OpenOffice.org Base : hatching
 OpenOffice.org Base : headers
@@ -9707,7 +9700,6 @@ OpenOffice.org Base : languages;selecting for text
 OpenOffice.org Base : languages;setting options
 OpenOffice.org Base : languages;spellcheck
 OpenOffice.org Base : languages;spellchecking and formatting
-OpenOffice.org Base : large handles (Writer)
 OpenOffice.org Base : large icons
 OpenOffice.org Base : layer arrangement
 OpenOffice.org Base : layout
@@ -11961,10 +11953,7 @@ OpenOffice.org Draw : half-spheres
 OpenOffice.org Draw : hand icon for moving slides
 OpenOffice.org Draw : handles
 OpenOffice.org Draw : handles;displaying (Writer)
-OpenOffice.org Draw : handles;large
 OpenOffice.org Draw : handles;scaling
-OpenOffice.org Draw : handles;showing simple/large handles (Calc)
-OpenOffice.org Draw : handles;simple
 OpenOffice.org Draw : handout printing
 OpenOffice.org Draw : Hangul/Hanja
 OpenOffice.org Draw : hatching
@@ -12206,7 +12195,6 @@ OpenOffice.org Draw : languages;selecting for text
 OpenOffice.org Draw : languages;setting options
 OpenOffice.org Draw : languages;spellcheck
 OpenOffice.org Draw : languages;spellchecking and formatting
-OpenOffice.org Draw : large handles (Writer)
 OpenOffice.org Draw : large icons
 OpenOffice.org Draw : layer arrangement
 OpenOffice.org Draw : layers
@@ -14791,7 +14779,6 @@ OpenOffice.org Writer : gutter
 OpenOffice.org Writer : handles
 OpenOffice.org Writer : handles;displaying (Writer)
 OpenOffice.org Writer : handles;scaling
-OpenOffice.org Writer : handles;showing simple/large handles (Calc)
 OpenOffice.org Writer : hanging indents in paragraphs
 OpenOffice.org Writer : Hangul/Hanja
 OpenOffice.org Writer : hard returns in pasted text
@@ -15077,7 +15064,6 @@ OpenOffice.org Writer : languages;selecting for text
 OpenOffice.org Writer : languages;setting options
 OpenOffice.org Writer : languages;spellcheck
 OpenOffice.org Writer : languages;spellchecking and formatting
-OpenOffice.org Writer : large handles (Writer)
 OpenOffice.org Writer : large icons
 OpenOffice.org Writer : layer arrangement
 OpenOffice.org Writer : layout
@@ -17732,7 +17718,6 @@ OpenOffice.org Math : h-bar symbol
 OpenOffice.org Math : handles
 OpenOffice.org Math : handles;displaying (Writer)
 OpenOffice.org Math : handles;scaling
-OpenOffice.org Math : handles;showing simple/large handles (Calc)
 OpenOffice.org Math : Hangul/Hanja
 OpenOffice.org Math : hatching
 OpenOffice.org Math : headers
@@ -17946,7 +17931,6 @@ OpenOffice.org Math : languages;selecting for text
 OpenOffice.org Math : languages;setting options
 OpenOffice.org Math : languages;spellcheck
 OpenOffice.org Math : languages;spellchecking and formatting
-OpenOffice.org Math : large handles (Writer)
 OpenOffice.org Math : large icons
 OpenOffice.org Math : layer arrangement
 OpenOffice.org Math : layout
@@ -20376,10 +20360,7 @@ OpenOffice.org Impress : half-spheres
 OpenOffice.org Impress : hand icon for moving slides
 OpenOffice.org Impress : handles
 OpenOffice.org Impress : handles;displaying (Writer)
-OpenOffice.org Impress : handles;large
 OpenOffice.org Impress : handles;scaling
-OpenOffice.org Impress : handles;showing simple/large handles (Calc)
-OpenOffice.org Impress : handles;simple
 OpenOffice.org Impress : handout printing
 OpenOffice.org Impress : Hangul/Hanja
 OpenOffice.org Impress : hatching
@@ -20621,7 +20602,6 @@ OpenOffice.org Impress : languages;selecting for text
 OpenOffice.org Impress : languages;setting options
 OpenOffice.org Impress : languages;spellcheck
 OpenOffice.org Impress : languages;spellchecking and formatting
-OpenOffice.org Impress : large handles (Writer)
 OpenOffice.org Impress : large icons
 OpenOffice.org Impress : layer arrangement
 OpenOffice.org Impress : layers
diff --git a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
index eeebd893e1bc..51f806d9dc40 100644
--- a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
+++ b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
@@ -1677,7 +1677,6 @@ Oracle Open Office Calc : gutter
 Oracle Open Office Calc : handles
 Oracle Open Office Calc : handles;displaying (Writer)
 Oracle Open Office Calc : handles;scaling
-Oracle Open Office Calc : handles;showing simple/large handles (Calc)
 Oracle Open Office Calc : Hangul/Hanja
 Oracle Open Office Calc : HARMEAN function
 Oracle Open Office Calc : hatching
@@ -2014,7 +2013,6 @@ Oracle Open Office Calc : languages;setting options
 Oracle Open Office Calc : languages;spellcheck
 Oracle Open Office Calc : languages;spellchecking and formatting
 Oracle Open Office Calc : LARGE function
-Oracle Open Office Calc : large handles (Writer)
 Oracle Open Office Calc : large icons
 Oracle Open Office Calc : layer arrangement
 Oracle Open Office Calc : layout
@@ -4965,10 +4963,7 @@ Oracle Open Office Impress : half-spheres
 Oracle Open Office Impress : hand icon for moving slides
 Oracle Open Office Impress : handles
 Oracle Open Office Impress : handles;displaying (Writer)
-Oracle Open Office Impress : handles;large
 Oracle Open Office Impress : handles;scaling
-Oracle Open Office Impress : handles;showing simple/large handles (Calc)
-Oracle Open Office Impress : handles;simple
 Oracle Open Office Impress : handout printing
 Oracle Open Office Impress : Hangul/Hanja
 Oracle Open Office Impress : hatching
@@ -5219,7 +5214,6 @@ Oracle Open Office Impress : languages;selecting for text
 Oracle Open Office Impress : languages;setting options
 Oracle Open Office Impress : languages;spellcheck
 Oracle Open Office Impress : languages;spellchecking and formatting
-Oracle Open Office Impress : large handles (Writer)
 Oracle Open Office Impress : large icons
 Oracle Open Office Impress : layer arrangement
 Oracle Open Office Impress : layers
@@ -7536,7 +7530,6 @@ Oracle Open Office Chart : gutter
 Oracle Open Office Chart : handles
 Oracle Open Office Chart : handles;displaying (Writer)
 Oracle Open Office Chart : handles;scaling
-Oracle Open Office Chart : handles;showing simple/large handles (Calc)
 Oracle Open Office Chart : Hangul/Hanja
 Oracle Open Office Chart : hatching
 Oracle Open Office Chart : headers
@@ -7737,7 +7730,6 @@ Oracle Open Office Chart : languages;selecting for text
 Oracle Open Office Chart : languages;setting options
 Oracle Open Office Chart : languages;spellcheck
 Oracle Open Office Chart : languages;spellchecking and formatting
-Oracle Open Office Chart : large handles (Writer)
 Oracle Open Office Chart : large icons
 Oracle Open Office Chart : layer arrangement
 Oracle Open Office Chart : layout
@@ -9774,7 +9766,6 @@ Oracle Open Office Base : gutter
 Oracle Open Office Base : handles
 Oracle Open Office Base : handles;displaying (Writer)
 Oracle Open Office Base : handles;scaling
-Oracle Open Office Base : handles;showing simple/large handles (Calc)
 Oracle Open Office Base : Hangul/Hanja
 Oracle Open Office Base : hatching
 Oracle Open Office Base : headers
@@ -9970,7 +9961,6 @@ Oracle Open Office Base : languages;selecting for text
 Oracle Open Office Base : languages;setting options
 Oracle Open Office Base : languages;spellcheck
 Oracle Open Office Base : languages;spellchecking and formatting
-Oracle Open Office Base : large handles (Writer)
 Oracle Open Office Base : large icons
 Oracle Open Office Base : layer arrangement
 Oracle Open Office Base : layout
@@ -12139,7 +12129,6 @@ Oracle Open Office Basic : gutter
 Oracle Open Office Basic : handles
 Oracle Open Office Basic : handles;displaying (Writer)
 Oracle Open Office Basic : handles;scaling
-Oracle Open Office Basic : handles;showing simple/large handles (Calc)
 Oracle Open Office Basic : Hangul/Hanja
 Oracle Open Office Basic : HasUnoInterfaces function
 Oracle Open Office Basic : hatching
@@ -12366,7 +12355,6 @@ Oracle Open Office Basic : languages;selecting for text
 Oracle Open Office Basic : languages;setting options
 Oracle Open Office Basic : languages;spellcheck
 Oracle Open Office Basic : languages;spellchecking and formatting
-Oracle Open Office Basic : large handles (Writer)
 Oracle Open Office Basic : large icons
 Oracle Open Office Basic : layer arrangement
 Oracle Open Office Basic : layout
@@ -14697,7 +14685,6 @@ Oracle Open Office Math : h-bar symbol
 Oracle Open Office Math : handles
 Oracle Open Office Math : handles;displaying (Writer)
 Oracle Open Office Math : handles;scaling
-Oracle Open Office Math : handles;showing simple/large handles (Calc)
 Oracle Open Office Math : Hangul/Hanja
 Oracle Open Office Math : hatching
 Oracle Open Office Math : headers
@@ -14919,7 +14906,6 @@ Oracle Open Office Math : languages;selecting for text
 Oracle Open Office Math : languages;setting options
 Oracle Open Office Math : languages;spellcheck
 Oracle Open Office Math : languages;spellchecking and formatting
-Oracle Open Office Math : large handles (Writer)
 Oracle Open Office Math : large icons
 Oracle Open Office Math : layer arrangement
 Oracle Open Office Math : layout
@@ -17429,7 +17415,6 @@ Oracle Open Office Writer : gutter
 Oracle Open Office Writer : handles
 Oracle Open Office Writer : handles;displaying (Writer)
 Oracle Open Office Writer : handles;scaling
-Oracle Open Office Writer : handles;showing simple/large handles (Calc)
 Oracle Open Office Writer : hanging indents in paragraphs
 Oracle Open Office Writer : Hangul/Hanja
 Oracle Open Office Writer : hard returns in pasted text
@@ -17725,7 +17710,6 @@ Oracle Open Office Writer : languages;selecting for text
 Oracle Open Office Writer : languages;setting options
 Oracle Open Office Writer : languages;spellcheck
 Oracle Open Office Writer : languages;spellchecking and formatting
-Oracle Open Office Writer : large handles (Writer)
 Oracle Open Office Writer : large icons
 Oracle Open Office Writer : layer arrangement
 Oracle Open Office Writer : layout
@@ -20483,10 +20467,7 @@ Oracle Open Office Draw : half-spheres
 Oracle Open Office Draw : hand icon for moving slides
 Oracle Open Office Draw : handles
 Oracle Open Office Draw : handles;displaying (Writer)
-Oracle Open Office Draw : handles;large
 Oracle Open Office Draw : handles;scaling
-Oracle Open Office Draw : handles;showing simple/large handles (Calc)
-Oracle Open Office Draw : handles;simple
 Oracle Open Office Draw : handout printing
 Oracle Open Office Draw : Hangul/Hanja
 Oracle Open Office Draw : hatching
@@ -20737,7 +20718,6 @@ Oracle Open Office Draw : languages;selecting for text
 Oracle Open Office Draw : languages;setting options
 Oracle Open Office Draw : languages;spellcheck
 Oracle Open Office Draw : languages;spellchecking and formatting
-Oracle Open Office Draw : large handles (Writer)
 Oracle Open Office Draw : large icons
 Oracle Open Office Draw : layer arrangement
 Oracle Open Office Draw : layers
diff --git a/testautomation/global/sid/bars.sid b/testautomation/global/sid/bars.sid
index 834e9acef24f..9bb56eb80903 100644
--- a/testautomation/global/sid/bars.sid
+++ b/testautomation/global/sid/bars.sid
@@ -738,6 +738,5 @@ Opl_SD_FangenAnObjektpunkten .uno:SnapPoints
 Opl_SD_Schnellbearbeitung .uno:QuickEdit
 Opl_SD_NurTextbreichSelektieren .uno:PickThrough
 Opl_SD_TextBearbeitenBeiDoppelklick .uno:DoubleClickTextEdit
-Opl_SD_GrosseHandles .uno:BigHandles
 Opl_SD_ObjektMitAttributen .uno:SolidCreate
 Opl_SD_AlleGruppierungenVerlassen .uno:ConnectorLinesCircles
diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win
index 78184ce650a2..42a360a9134e 100644
--- a/testautomation/global/win/bars.win
+++ b/testautomation/global/win/bars.win
@@ -894,7 +894,6 @@ FangenAnSeitenraendern .uno:SnapBorder
 FanglinieBenutzen .uno:HelplinesUse
 FanglinieSichtbar .uno:HelplinesVisible
 FremdgrafikenAndeuten .uno:GraphicDraft
-GrosseHandles .uno:BigHandles
 HilfslinienBeimVerschiebenAnzeigen .uno:HelplinesMove
 KeineFuellungen .uno:FillDraft
 GluePoints .uno:GlueEditMode
diff --git a/testautomation/global/win/tab_h_o.win b/testautomation/global/win/tab_h_o.win
index f9f8489a5715..160e4a578327 100644
--- a/testautomation/global/win/tab_h_o.win
+++ b/testautomation/global/win/tab_h_o.win
@@ -130,7 +130,6 @@ Gitterlinien sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_GRID
 Farbe sym:sc:ListBox:RID_SCPAGE_CONTENT:LB_COLOR
 Seitenumbruch sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_PAGEBREAKS
 Hilfslinien sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_GUIDELINE
-GrosseGriffe sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_BIGHANDLES
 ZeilenUndSpaltenkoepfe sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_ROWCOLHEADER
 HorizontalerBildaufbau sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_HSCROLL
 VertikalerBildaufbau sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_VSCROLL
@@ -151,8 +150,6 @@ Zeichnungen sym:sw:CheckBox:TP_CONTENT_OPT:CB_DRWFAST
 Feldnamen sym:sw:CheckBox:TP_CONTENT_OPT:CB_FIELD
 Notizen sym:sw:CheckBox:TP_CONTENT_OPT:CB_POSTIT
 Hilfslinien sym:sw:CheckBox:TP_CONTENT_OPT:CB_CROSS
-FarbigeHandles sym:sw:CheckBox:TP_CONTENT_OPT:CB_HANDLE
-GrosseHandles sym:sw:CheckBox:TP_CONTENT_OPT:CB_BIGHANDLE
 HorizontaleBildlaufleiste sym:sw:CheckBox:TP_CONTENT_OPT:CB_HSCROLL
 VertikaleBildlaufleiste sym:sw:CheckBox:TP_CONTENT_OPT:CB_VSCROLL
 HorizontalesLineal sym:sw:CheckBox:TP_CONTENT_OPT:CB_HRULER
@@ -171,8 +168,6 @@ Zeichnungen sym:sw:CheckBox:TP_CONTENT_OPT:CB_DRWFAST
 Feldname sym:sw:CheckBox:TP_CONTENT_OPT:CB_FIELD
 Notizen sym:sw:CheckBox:TP_CONTENT_OPT:CB_POSTIT
 Hilfslinien sym:sw:CheckBox:TP_CONTENT_OPT:CB_CROSS
-FarbigeHandles sym:sw:CheckBox:TP_CONTENT_OPT:CB_HANDLE
-GrosseHandles sym:sw:CheckBox:TP_CONTENT_OPT:CB_BIGHANDLE
 HorizontaleBildlaufleiste sym:sw:CheckBox:TP_CONTENT_OPT:CB_HSCROLL
 VertikaleBildlaufleiste sym:sw:CheckBox:TP_CONTENT_OPT:CB_VSCROLL
 HorizontalesLineal sym:sw:CheckBox:TP_CONTENT_OPT:CB_HRULER