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

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>

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)
 

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
 ()
 [

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

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

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

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;

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: */

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>

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"/>