Remove Large Handles option

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

10 files changed, 10 insertions, 44 deletions

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 }
     };