Kill remaining plugin bits

Change-Id: Icd99757b48626ef43313e8de42c4e5462f85a958
Reviewed-on: https://gerrit.libreoffice.org/21008
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>

8 files changed, 1 insertions, 34 deletions

diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 9482da05ac94..ce8ceb0c4c63 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -399,21 +399,6 @@ interface DrawView
         ExecMethod = FuTemporary ;
         StateMethod = GetMenuState ;
     ]
-    SID_INSERT_PLUGIN // ole : yes, status : ?
-    [
-        ExecMethod = FuTemporary ;
-        StateMethod = GetMenuState ;
-    ]
-    SID_INSERT_SOUND // ole : yes, status : ?
-    [
-        ExecMethod = FuTemporary ;
-        StateMethod = GetMenuState ;
-    ]
-    SID_INSERT_VIDEO // ole : yes, status : ?
-    [
-        ExecMethod = FuTemporary ;
-        StateMethod = GetMenuState ;
-    ]
     SID_INSERT_FLOATINGFRAME // ole : yes, status : ?
     [
         ExecMethod = FuTemporary ;
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 073efde5578e..7e5b08abd804 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -482,7 +482,6 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
 
                     // intentionally no break!
                 }
-                case SID_INSERT_PLUGIN :
                 case SID_INSERT_FLOATINGFRAME :
                 {
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index cebb95bc1d91..72cbb03e5d54 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1117,9 +1117,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
         break;
 
         case SID_INSERT_OBJECT:
-        case SID_INSERT_PLUGIN:
-        case SID_INSERT_SOUND:
-        case SID_INSERT_VIDEO:
         case SID_INSERT_FLOATINGFRAME:
         case SID_INSERT_MATH:
         case SID_INSERT_DIAGRAM:
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 2f38a3043138..6ae5994a3b6c 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -882,9 +882,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
     if ( GetDocSh()->IsUIActive() )
     {
         rSet.DisableItem( SID_INSERT_OBJECT );
-        rSet.DisableItem( SID_INSERT_PLUGIN );
-        rSet.DisableItem( SID_INSERT_SOUND );
-        rSet.DisableItem( SID_INSERT_VIDEO );
         rSet.DisableItem( SID_INSERT_FLOATINGFRAME );
         rSet.DisableItem( SID_INSERT_MATH );
         rSet.DisableItem( SID_INSERT_DIAGRAM );
@@ -1001,9 +998,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         rSet.DisableItem( SID_INSERT_AVMEDIA );
         rSet.DisableItem( SID_INSERT_DIAGRAM );
         rSet.DisableItem( SID_INSERT_OBJECT );
-        rSet.DisableItem( SID_INSERT_PLUGIN );
-        rSet.DisableItem( SID_INSERT_SOUND );
-        rSet.DisableItem( SID_INSERT_VIDEO );
         rSet.DisableItem( SID_INSERT_FLOATINGFRAME );
 
         rSet.DisableItem( SID_INSERT_MATH );
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 13ee9727bd6d..3868304a847c 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -205,7 +205,6 @@
       <menu:menu menu:id=".uno:ObjectMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:InsertObject"/>
-          <menu:menuitem menu:id=".uno:InsertPlugin"/>
           <menu:menuitem menu:id=".uno:InsertMath"/>
         </menu:menupopup>
       </menu:menu>
diff --git a/sd/uiconfig/sdraw/toolbar/insertbar.xml b/sd/uiconfig/sdraw/toolbar/insertbar.xml
index dda314972162..19ea9ce3d9b7 100644
--- a/sd/uiconfig/sdraw/toolbar/insertbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/insertbar.xml
@@ -27,11 +27,8 @@
     <toolbar:toolbarseparator/>
     <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
     <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
-    <toolbar:toolbaritem xlink:href=".uno:InsertSound" toolbar:visible="false"/>
-    <toolbar:toolbaritem xlink:href=".uno:InsertVideo" toolbar:visible="false"/>
     <toolbar:toolbaritem xlink:href=".uno:InsertMath"/>
     <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
     <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false"/>
-    <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:visible="false"/>
     <toolbar:toolbarseparator/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 81431265f91f..14086ca7fed6 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -182,7 +182,6 @@
                     <menu:menuitem menu:id=".uno:InsertMath"/>
                     <menu:menuitem menu:id=".uno:Insert3DModel"/>
                     <menu:menuitem menu:id=".uno:InsertObject"/>
-                    <menu:menuitem menu:id=".uno:InsertPlugin"/>
                 </menu:menupopup>
             </menu:menu>
             <menu:menu menu:id=".uno:ShapesMenu">
diff --git a/sd/uiconfig/simpress/toolbar/insertbar.xml b/sd/uiconfig/simpress/toolbar/insertbar.xml
index 6513e9fb4770..bb09b17e05e7 100644
--- a/sd/uiconfig/simpress/toolbar/insertbar.xml
+++ b/sd/uiconfig/simpress/toolbar/insertbar.xml
@@ -27,11 +27,8 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:InsertGraphic"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertAVMedia"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertSound" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertVideo" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertMath"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false"   />
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false"/>
 </toolbar:toolbar>