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>

16 files changed, 2 insertions, 92 deletions

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index d27eae2981f5..cbbffb3c157d 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -277,18 +277,6 @@ interface BaseText
         StateMethod = StateInsert ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
-    SID_INSERT_SOUND
-    [
-        ExecMethod = ExecInsert ;
-        StateMethod = StateInsert ;
-        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
-    ]
-    SID_INSERT_VIDEO
-    [
-        ExecMethod = ExecInsert ;
-        StateMethod = StateInsert ;
-        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
-    ]
     FN_INSERT_SMA // status(final|play)
     [
         ExecMethod = ExecInsert ;
@@ -307,12 +295,6 @@ interface BaseText
         StateMethod = StateInsert ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
-    SID_INSERT_PLUGIN  // status(final|play)
-    [
-        ExecMethod = ExecInsert ;
-        StateMethod = StateInsert ;
-        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
-    ]
     FN_INSERT_TABLE // status(final|play)
     [
         ExecMethod = ExecInsert ;
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index a587aff13892..3a91e23780e2 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -238,7 +238,6 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
 #endif
 
     case SID_INSERT_OBJECT:
-    case SID_INSERT_PLUGIN:
     {
         const SfxGlobalNameItem* pNameItem = rReq.GetArg<SfxGlobalNameItem>(SID_INSERT_OBJECT);
         SvGlobalName *pName = nullptr;
@@ -249,63 +248,9 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
             pName = &aName;
         }
 
-        const SfxStringItem* pClassLocationItem = rReq.GetArg<SfxStringItem>(FN_PARAM_2);
-        const SfxStringItem* pCommandsItem = rReq.GetArg<SfxStringItem>(FN_PARAM_3);
-        //TODO/LATER: recording currently not working, need code for Commandlist
         svt::EmbeddedObjectRef xObj;
-        if( nSlot == SID_INSERT_PLUGIN && ( pClassLocationItem || pCommandsItem ) )
-        {
-            OUString sClassLocation;
-            if(pClassLocationItem)
-                sClassLocation = pClassLocationItem->GetValue();
-
-            SvCommandList aCommandList;
-            if(pCommandsItem)
-            {
-                sal_Int32 nTemp;
-                aCommandList.AppendCommands( pCommandsItem->GetValue(), &nTemp );
-            }
-
-            {
-                comphelper::EmbeddedObjectContainer aCnt;
-                OUString sName;
-                xObj.Assign( aCnt.CreateEmbeddedObject( SvGlobalName( SO3_PLUGIN_CLASSID ).GetByteSequence(), sName ),
-                            embed::Aspects::MSOLE_CONTENT );
-                svt::EmbeddedObjectRef::TryRunningState( xObj.GetObject() );
-                uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY );
-                if ( xSet.is() )
-                {
-                    try
-                    {
-                        if ( !sClassLocation.isEmpty() )
-                            xSet->setPropertyValue("PluginURL",
-                                uno::makeAny(
-                                    OUString(
-                                        URIHelper::SmartRel2Abs(
-                                            INetURLObject(), sClassLocation,
-                                            URIHelper::GetMaybeFileHdl()) ) ) );
-                        uno::Sequence< beans::PropertyValue > aSeq;
-                        if ( aCommandList.size() )
-                        {
-                            aCommandList.FillSequence( aSeq );
-                            xSet->setPropertyValue("PluginCommands", uno::makeAny( aSeq ) );
-                        }
-                    }
-                    catch (const uno::Exception&)
-                    {
-                    }
-                }
-            }
-
-            if(xObj.is())
-                rSh.InsertOleObject( xObj );
-        }
-        else
-        {
-            OSL_ENSURE( !pNameItem || nSlot == SID_INSERT_OBJECT, "Superfluous argument!" );
-            rSh.InsertObject( xObj, pName, true, nSlot);
-            rReq.Done();
-        }
+        rSh.InsertObject( xObj, pName, true, nSlot);
+        rReq.Done();
         break;
     }
     case SID_INSERT_FLOATINGFRAME:
@@ -631,8 +576,6 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
         switch ( nWhich )
         {
         case SID_INSERT_AVMEDIA:
-        case SID_INSERT_SOUND:
-        case SID_INSERT_VIDEO:
             if ( GetShell().IsSelFrameMode()
                  || GetShell().CursorInsideInputField()
                  || SfxObjectCreateMode::EMBEDDED == eCreateMode
@@ -664,7 +607,6 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
 
             case SID_INSERT_FLOATINGFRAME:
             case SID_INSERT_OBJECT:
-            case SID_INSERT_PLUGIN:
                 {
                     if( eCreateMode == SfxObjectCreateMode::EMBEDDED || bCursorInHidden )
                     {
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index b98305fe2894..f47ffbc81a43 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -366,7 +366,6 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName
                 }
 
                 // TODO/LATER: recording! Convert properties to items
-                case SID_INSERT_PLUGIN:
                 case SID_INSERT_FLOATINGFRAME:
                 {
                     SfxSlotPool* pSlotPool = SW_MOD()->GetSlotPool();
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 4a27b2814053..7c6e1a28c1f0 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -230,7 +230,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:InsertObjectStarMath"/>
           <menu:menuitem menu:id=".uno:InsertObjectChart"/>
         </menu:menupopup>
diff --git a/sw/uiconfig/sglobal/toolbar/insertbar.xml b/sw/uiconfig/sglobal/toolbar/insertbar.xml
index 75b491549c06..14d1baf12558 100644
--- a/sw/uiconfig/sglobal/toolbar/insertbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/insertbar.xml
@@ -40,7 +40,6 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:helpid="20369"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="10140"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:InsertMultiIndex" toolbar:helpid="21420"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry" toolbar:helpid="20335"/>
diff --git a/sw/uiconfig/sglobal/toolbar/insertobjectbar.xml b/sw/uiconfig/sglobal/toolbar/insertobjectbar.xml
index f210a6601251..7d821372f2e2 100644
--- a/sw/uiconfig/sglobal/toolbar/insertobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/insertobjectbar.xml
@@ -20,5 +20,4 @@
 <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:InsertObjectFloatingFrame"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertObject"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin"/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 922b0cf5595e..41f82571310c 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -176,7 +176,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:InsertObjectStarMath"/>
           <menu:menuitem menu:id=".uno:InsertObjectChart"/>
         </menu:menupopup>
diff --git a/sw/uiconfig/sweb/toolbar/standardbar.xml b/sw/uiconfig/sweb/toolbar/standardbar.xml
index be11b5b1ee6f..f00b54960e08 100644
--- a/sw/uiconfig/sweb/toolbar/standardbar.xml
+++ b/sw/uiconfig/sweb/toolbar/standardbar.xml
@@ -58,7 +58,6 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertBookmark"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertFootnote"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertScript" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertFieldCtrl" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 4795e4476b33..e824b00acd04 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -229,7 +229,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:InsertObjectStarMath"/>
           <menu:menuitem menu:id=".uno:InsertObjectChart"/>
         </menu:menupopup>
diff --git a/sw/uiconfig/swform/toolbar/insertobjectbar.xml b/sw/uiconfig/swform/toolbar/insertobjectbar.xml
index f210a6601251..7d821372f2e2 100644
--- a/sw/uiconfig/swform/toolbar/insertobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/insertobjectbar.xml
@@ -20,5 +20,4 @@
 <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:InsertObjectFloatingFrame"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertObject"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin"/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index f9d3fececa89..3b090bdf7779 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -231,7 +231,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:InsertObjectStarMath"/>
           <menu:menuitem menu:id=".uno:InsertObjectChart"/>
         </menu:menupopup>
diff --git a/sw/uiconfig/swreport/toolbar/insertobjectbar.xml b/sw/uiconfig/swreport/toolbar/insertobjectbar.xml
index f210a6601251..7d821372f2e2 100644
--- a/sw/uiconfig/swreport/toolbar/insertobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/insertobjectbar.xml
@@ -20,5 +20,4 @@
 <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:InsertObjectFloatingFrame"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertObject"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin"/>
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 4ebdaab1b1c5..2c8403243fc4 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -223,7 +223,6 @@
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:InsertObjectStarMath"/>
           <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/sw/uiconfig/swriter/toolbar/insertbar.xml b/sw/uiconfig/swriter/toolbar/insertbar.xml
index 7c910fe42ad3..6668d73f3901 100644
--- a/sw/uiconfig/swriter/toolbar/insertbar.xml
+++ b/sw/uiconfig/swriter/toolbar/insertbar.xml
@@ -40,7 +40,6 @@
  <toolbar:toolbaritem xlink:href=".uno:InsertObjectStarMath" toolbar:helpid="20369"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart" toolbar:helpid="10140"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertObject" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:InsertMultiIndex" toolbar:helpid="21420"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertIndexesEntry" toolbar:helpid="20335"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index c6cf58f31702..883ec24b8c9f 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -231,7 +231,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:InsertObjectStarMath"/>
           <menu:menuitem menu:id=".uno:InsertObjectChart"/>
         </menu:menupopup>
diff --git a/sw/uiconfig/swxform/toolbar/insertobjectbar.xml b/sw/uiconfig/swxform/toolbar/insertobjectbar.xml
index f210a6601251..7d821372f2e2 100644
--- a/sw/uiconfig/swxform/toolbar/insertobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/insertobjectbar.xml
@@ -20,5 +20,4 @@
 <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:InsertObjectFloatingFrame"/>
  <toolbar:toolbaritem xlink:href=".uno:InsertObject"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertPlugin"/>
 </toolbar:toolbar>
\ No newline at end of file