Kill SID_TBXCTL_INSOBJ

The associated toolbar doesn't exist anymore, and most of the
buttons that were there in (at least) OOo 2.0 were moved to the
Insert toolbar (it's the one that's pulled from the "Insert"
button). So kill it, and make Insert Chart/Object visible by
default in the Insert toolbar.

Change-Id: I84ea43f560ea23ceff2e885e9ce615b9d76f3075

4 files changed, 0 insertions, 18 deletions

diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 384ae4c40bcb..f303727de1b6 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -157,7 +157,6 @@ void ScDLL::Init()
     // Own Controller
     ScTbxInsertCtrl     ::RegisterControl(SID_TBXCTL_INSERT, pMod);
     ScTbxInsertCtrl     ::RegisterControl(SID_TBXCTL_INSCELLS, pMod);
-    ScTbxInsertCtrl     ::RegisterControl(SID_TBXCTL_INSOBJ, pMod);
     ScZoomSliderControl ::RegisterControl(SID_PREVIEW_SCALINGFACTOR, pMod);
 
     // SvxToolboxController
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 85f9f6d61d53..049949cc1a69 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -84,11 +84,6 @@ VclPtr<SfxPopupWindow> ScTbxInsertCtrl::CreatePopupWindow()
         OUString aInsertCellsBarResStr( "private:resource/toolbar/insertcellsbar" );
         createAndPositionSubToolBar( aInsertCellsBarResStr );
     }
-    else
-    {
-        OUString aInsertObjectBarResStr( "private:resource/toolbar/insertobjectbar" );
-        createAndPositionSubToolBar( aInsertObjectBarResStr );
-    }
     return NULL;
 }
 
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 04e21a965ada..1d7998945954 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -94,7 +94,6 @@ class ScTabViewShell: public SfxViewShell, public ScDBFunc
 private:
     static sal_uInt16           nInsertCtrlState;
     static sal_uInt16           nInsCellsCtrlState;
-    static sal_uInt16           nInsObjCtrlState;
 
     SvxHtmlOptions          aHTMLOpt;
     ObjectSelectionType     eCurOST;
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index fa35ea977b78..7351d0aaf199 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -106,7 +106,6 @@ using namespace com::sun::star;
 
 sal_uInt16 ScTabViewShell::nInsertCtrlState = SID_INSERT_GRAPHIC;
 sal_uInt16 ScTabViewShell::nInsCellsCtrlState = 0;
-sal_uInt16 ScTabViewShell::nInsObjCtrlState = SID_INSERT_DIAGRAM;
 
 void ScTabViewShell::Activate(bool bMDI)
 {
@@ -1849,10 +1848,6 @@ void ScTabViewShell::ExecTbx( SfxRequest& rReq )
             if ( pItem )
                 nInsCellsCtrlState = static_cast<const SfxUInt16Item*>(pItem)->GetValue();
             break;
-        case SID_TBXCTL_INSOBJ:
-            if ( pItem )
-                nInsObjCtrlState = static_cast<const SfxUInt16Item*>(pItem)->GetValue();
-            break;
         default:
             OSL_FAIL("Slot im Wald");
     }
@@ -1863,12 +1858,6 @@ void ScTabViewShell::GetTbxState( SfxItemSet& rSet )
 {
     rSet.Put( SfxUInt16Item( SID_TBXCTL_INSERT,   nInsertCtrlState ) );
     rSet.Put( SfxUInt16Item( SID_TBXCTL_INSCELLS, nInsCellsCtrlState ) );
-
-    //  ohne installiertes Chart darf Chart nicht Default sein...
-    if ( nInsObjCtrlState == SID_DRAW_CHART && !SvtModuleOptions().IsChart() )
-        nInsObjCtrlState = SID_INSERT_OBJECT;
-
-    rSet.Put( SfxUInt16Item( SID_TBXCTL_INSOBJ,   nInsObjCtrlState ) );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */