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

10 files changed, 2 insertions, 58 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 830bcb38291d..66566f1c0d7e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -829,14 +829,6 @@
           <value>1</value>
         </prop>
       </node>
-      <node oor:name=".uno:InsObjCtrl" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Insert Object</value>
-        </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>1</value>
-        </prop>
-      </node>
       <node oor:name=".uno:ShowChanges" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Show Changes...</value>
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index da4678d7a081..c332cd2d0e33 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -616,7 +616,6 @@
 //  slots for toolbox controller in toolbar
 #define SID_TBXCTL_INSERT       (SID_NEW_SLOTS+55)
 #define SID_TBXCTL_INSCELLS     (SID_NEW_SLOTS+56)
-#define SID_TBXCTL_INSOBJ       (SID_NEW_SLOTS+57)
 
 #define SID_DEFINE_COLROWNAMERANGES (SID_NEW_SLOTS+58)
 
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 744d2de2fa76..aa9d0da8a10e 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -4537,33 +4537,6 @@ SfxVoidItem InsertRowsAfter FID_INS_ROWS_AFTER
 ]
 
 
-SfxUInt16Item InsObjCtrl SID_TBXCTL_INSOBJ
-
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_VIEW;
-]
-
-
 SfxVoidItem JumpToNextCell SID_CURSORENTERDOWN
 ()
 [
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index 89439b89c8ad..d2ff98931277 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -269,7 +269,6 @@ shell ScTabViewShell
     SID_STATUS_PAGESTYLE    [ ExecMethod = Execute; StateMethod = GetState; ]
     SID_TBXCTL_INSERT       [ ExecMethod = ExecTbx; StateMethod = GetTbxState; ]
     SID_TBXCTL_INSCELLS     [ ExecMethod = ExecTbx; StateMethod = GetTbxState; ]
-    SID_TBXCTL_INSOBJ       [ ExecMethod = ExecTbx; StateMethod = GetTbxState; ]
 
 }
 
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: */
diff --git a/sc/uiconfig/scalc/toolbar/insertbar.xml b/sc/uiconfig/scalc/toolbar/insertbar.xml
index bdd373a42620..98cb2b818955 100644
--- a/sc/uiconfig/scalc/toolbar/insertbar.xml
+++ b/sc/uiconfig/scalc/toolbar/insertbar.xml
@@ -25,6 +25,6 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath"/>
- <toolbar:toolbaritem xlink:href=".uno:DrawChart" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:DrawChart"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObject"/>
 </toolbar:toolbar>
diff --git a/sc/uiconfig/scalc/toolbar/toolbar.xml b/sc/uiconfig/scalc/toolbar/toolbar.xml
index 0bc03ae16bc1..2760b496a2be 100644
--- a/sc/uiconfig/scalc/toolbar/toolbar.xml
+++ b/sc/uiconfig/scalc/toolbar/toolbar.xml
@@ -20,7 +20,6 @@
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
  <toolbar:toolbaritem xlink:href=".uno:InsertCtrl" toolbar:style="dropdown"/>
  <toolbar:toolbaritem xlink:href=".uno:InsCellsCtrl" toolbar:style="dropdown"/>
- <toolbar:toolbaritem xlink:href=".uno:InsObjCtrl" toolbar:style="dropdown"/>
  <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:style="dropdown"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:AutoFormat"/>