removed Simple Handles option

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

7 files changed, 1 insertions, 28 deletions

diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 7bc50f1af812..72070af32f30 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -517,7 +517,6 @@
 #define SC_UNO_SHOWOBJ              "ShowObjects"
 #define SC_UNO_SHOWPAGEBR           "ShowPageBreaks"
 #define SC_UNO_SHOWZERO             "ShowZeroValues"
-#define SC_UNO_SHOWSOLID            "SolidHandles"
 #define SC_UNO_VALUEHIGH            "IsValueHighlightingEnabled"
 #define SC_UNO_VERTSCROLL           "HasVerticalScrollBar"
 #define SC_UNO_SNAPTORASTER         "IsSnapToRaster"
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 00233f15445d..63d244b9ac8e 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -56,7 +56,6 @@ enum ScViewOption
     VOPT_HELPLINES,
     VOPT_ANCHOR,
     VOPT_PAGEBREAKS,
-    VOPT_SOLIDHANDLES,
     VOPT_CLIPMARKS,
     VOPT_BIGHANDLES
 };
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index c2dbfa428e6a..149351c2d569 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -165,7 +165,6 @@ void ScViewOptions::SetDefaults()
     aOptArr[ VOPT_GRID        ] =
     aOptArr[ VOPT_ANCHOR      ] =
     aOptArr[ VOPT_PAGEBREAKS  ] =
-    aOptArr[ VOPT_SOLIDHANDLES] =
     aOptArr[ VOPT_CLIPMARKS   ] = sal_True;
 
     aModeArr[VOBJ_TYPE_OLE ]  =
@@ -457,10 +456,6 @@ ScViewCfg::ScViewCfg() :
                     case SCLAYOUTOPT_GUIDE:
                         SetOption( VOPT_HELPLINES, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
                         break;
-                    case SCLAYOUTOPT_SIMPLECONT:
-                        // content is reversed
-                        SetOption( VOPT_SOLIDHANDLES, !ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
-                        break;
                     case SCLAYOUTOPT_LARGECONT:
                         SetOption( VOPT_BIGHANDLES, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
                         break;
@@ -628,10 +623,6 @@ IMPL_LINK( ScViewCfg, LayoutCommitHdl, void *, EMPTYARG )
             case SCLAYOUTOPT_GUIDE:
                 ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_HELPLINES ) );
                 break;
-            case SCLAYOUTOPT_SIMPLECONT:
-                // content is reversed
-                ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], !GetOption( VOPT_SOLIDHANDLES ) );
-                break;
             case SCLAYOUTOPT_LARGECONT:
                 ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_BIGHANDLES ) );
                 break;
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 2599ea24e0c8..260ee38d297e 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        aHandleCB;
     CheckBox        aBigHandleCB;
 
     FixedLine       aSeparator1FL;
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index b03d49205c40..f9db04e0ce28 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -68,7 +68,6 @@ ScTpContentOptions::ScTpContentOptions( Window*         pParent,
     aColorLB( this,         ScResId(LB_COLOR            )),
     aBreakCB( this,         ScResId(CB_PAGEBREAKS       )),
     aGuideLineCB( this,     ScResId(CB_GUIDELINE        )),
-    aHandleCB( this,        ScResId(CB_HANDLES      )),
     aBigHandleCB( this,     ScResId(CB_BIGHANDLES       )),
 
     aSeparator1FL    (this, ScResId(FL_SEPARATOR1 )),
@@ -125,7 +124,6 @@ ScTpContentOptions::ScTpContentOptions( Window*         pParent,
     aOutlineCB  .SetClickHdl(aCBHdl);
     aBreakCB    .SetClickHdl(aCBHdl);
     aGuideLineCB.SetClickHdl(aCBHdl);
-    aHandleCB   .SetClickHdl(aCBHdl);
     aBigHandleCB.SetClickHdl(aCBHdl);
     aRowColHeaderCB.SetClickHdl(aCBHdl);
 
@@ -163,7 +161,6 @@ sal_Bool    ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
         aColorLB        .GetSavedValue() != aColorLB       .GetSelectEntryPos() ||
         aBreakCB        .GetSavedValue() != aBreakCB       .IsChecked() ||
         aGuideLineCB    .GetSavedValue() != aGuideLineCB   .IsChecked() ||
-        aHandleCB       .GetSavedValue() != aHandleCB      .IsChecked() ||
         aBigHandleCB    .GetSavedValue() != aBigHandleCB   .IsChecked())
     {
         pLocalOptions->SetGridColor( aColorLB.GetSelectEntryColor(),
@@ -215,7 +212,6 @@ void    ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
 
     aBreakCB.Check( pLocalOptions->GetOption(VOPT_PAGEBREAKS) );
     aGuideLineCB.Check( pLocalOptions->GetOption(VOPT_HELPLINES) );
-    aHandleCB.Check( !pLocalOptions->GetOption(VOPT_SOLIDHANDLES) );    // inverted
     aBigHandleCB.Check( pLocalOptions->GetOption(VOPT_BIGHANDLES) );
 
     if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, false, &pItem))
@@ -244,7 +240,6 @@ void    ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
     aColorLB        .SaveValue();
     aBreakCB        .SaveValue();
     aGuideLineCB    .SaveValue();
-    aHandleCB       .SaveValue();
     aBigHandleCB    .SaveValue();
 }
 
@@ -295,15 +290,10 @@ 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 ( &aHandleCB        == pBtn )   eOption = VOPT_SOLIDHANDLES;
     else if ( &aBigHandleCB     == pBtn )   eOption = VOPT_BIGHANDLES;
     else if ( &aRowColHeaderCB  == pBtn )   eOption = VOPT_HEADER;
 
-    //  VOPT_SOLIDHANDLES is inverted (CheckBox is "simple handles")
-    if ( eOption == VOPT_SOLIDHANDLES )
-        pLocalOptions->SetOption( eOption, !bChecked );
-    else
-        pLocalOptions->SetOption( eOption, bChecked );
+    pLocalOptions->SetOption( eOption, bChecked );
 
 
     return 0;
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index b789d9d96090..f52b73a9eaa9 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -109,7 +109,6 @@ const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap()
         {MAP_CHAR_LEN(SC_UNO_SHOWOBJ),      0,  &getCppuType((sal_Int16*)0),    0, 0},
         {MAP_CHAR_LEN(SC_UNO_SHOWPAGEBR),   0,  &getBooleanCppuType(),          0, 0},
         {MAP_CHAR_LEN(SC_UNO_SHOWZERO),     0,  &getBooleanCppuType(),          0, 0},
-        {MAP_CHAR_LEN(SC_UNO_SHOWSOLID),    0,  &getBooleanCppuType(),          0, 0},
         {MAP_CHAR_LEN(OLD_UNO_VALUEHIGH),   0,  &getBooleanCppuType(),          0, 0},
         {MAP_CHAR_LEN(OLD_UNO_VERTSCROLL),  0,  &getBooleanCppuType(),          0, 0},
         {MAP_CHAR_LEN(SC_UNO_VISAREA),      0,  &getCppuType((awt::Rectangle*)0), 0, 0},
@@ -1929,8 +1928,6 @@ void SAL_CALL ScTabViewObj::setPropertyValue(
             aNewOpt.SetOption( VOPT_PAGEBREAKS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
         else if ( aString.EqualsAscii( SC_UNO_SHOWZERO ) )
             aNewOpt.SetOption( VOPT_NULLVALS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
-        else if ( aString.EqualsAscii( SC_UNO_SHOWSOLID ) )
-            aNewOpt.SetOption( VOPT_SOLIDHANDLES, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
         else if ( aString.EqualsAscii( SC_UNO_VALUEHIGH ) || aString.EqualsAscii( OLD_UNO_VALUEHIGH ) )
             aNewOpt.SetOption( VOPT_SYNTAX, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
         else if ( aString.EqualsAscii( SC_UNO_VERTSCROLL ) || aString.EqualsAscii( OLD_UNO_VERTSCROLL ) )
@@ -2046,7 +2043,6 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const rtl::OUString& aProperty
         else if ( aString.EqualsAscii( SC_UNO_SHOWNOTES ) )  ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_NOTES ) );
         else if ( aString.EqualsAscii( SC_UNO_SHOWPAGEBR ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_PAGEBREAKS ) );
         else if ( aString.EqualsAscii( SC_UNO_SHOWZERO ) )   ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_NULLVALS ) );
-        else if ( aString.EqualsAscii( SC_UNO_SHOWSOLID ) )  ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_SOLIDHANDLES ) );
         else if ( aString.EqualsAscii( SC_UNO_VALUEHIGH ) || aString.EqualsAscii( OLD_UNO_VALUEHIGH ) )
             ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_SYNTAX ) );
         else if ( aString.EqualsAscii( SC_UNO_VERTSCROLL ) || aString.EqualsAscii( OLD_UNO_VERTSCROLL ) )
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index d97364d455ad..bfd65dd0167d 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -557,7 +557,6 @@ void ScDrawView::UpdateUserViewOptions()
         sal_Bool bBigHdl = rOpt.GetOption( VOPT_BIGHANDLES );
 
         SetDragStripes( rOpt.GetOption( VOPT_HELPLINES ) );
-        SetSolidMarkHdl( rOpt.GetOption( VOPT_SOLIDHANDLES ) );
         SetMarkHdlSizePixel( bBigHdl ? SC_HANDLESIZE_BIG : SC_HANDLESIZE_SMALL );
 
         SetGridVisible( rGrid.GetGridVisible() );