[Libreoffice-commits] core.git: configmgr/qa cui/uiconfig cui/UIConfig_cui.mk include/sfx2 officecfg/registry sc/sdi sc/source sc/uiconfig sd/sdi sd/source sd/uiconfig svx/sdi sw/sdi sw/source sw/uiconfig
Maxim Monastirsky
momonasmon at gmail.com
Wed Dec 30 01:32:03 PST 2015
configmgr/qa/unit/data.xcd | 24 -
cui/UIConfig_cui.mk | 1
cui/uiconfig/ui/insertplugin.ui | 222 ----------
include/sfx2/sfxsids.hrc | 6
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 24 -
sc/sdi/tabvwsh.sdi | 3
sc/source/ui/drawfunc/fuins2.cxx | 1
sc/source/ui/view/tabvwshb.cxx | 13
sc/uiconfig/scalc/menubar/menubar.xml | 1
sd/sdi/_drvwsh.sdi | 15
sd/source/ui/func/fuinsert.cxx | 1
sd/source/ui/view/drviews2.cxx | 3
sd/source/ui/view/drviews7.cxx | 6
sd/uiconfig/sdraw/menubar/menubar.xml | 1
sd/uiconfig/sdraw/toolbar/insertbar.xml | 3
sd/uiconfig/simpress/menubar/menubar.xml | 1
sd/uiconfig/simpress/toolbar/insertbar.xml | 5
svx/sdi/svx.sdi | 76 ---
sw/sdi/_textsh.sdi | 18
sw/source/uibase/shells/textsh.cxx | 62 --
sw/source/uibase/wrtsh/wrtsh1.cxx | 1
sw/uiconfig/sglobal/menubar/menubar.xml | 1
sw/uiconfig/sglobal/toolbar/insertbar.xml | 1
sw/uiconfig/sglobal/toolbar/insertobjectbar.xml | 1
sw/uiconfig/sweb/menubar/menubar.xml | 1
sw/uiconfig/sweb/toolbar/standardbar.xml | 1
sw/uiconfig/swform/menubar/menubar.xml | 1
sw/uiconfig/swform/toolbar/insertobjectbar.xml | 1
sw/uiconfig/swreport/menubar/menubar.xml | 1
sw/uiconfig/swreport/toolbar/insertobjectbar.xml | 1
sw/uiconfig/swriter/menubar/menubar.xml | 1
sw/uiconfig/swriter/toolbar/insertbar.xml | 1
sw/uiconfig/swxform/menubar/menubar.xml | 1
sw/uiconfig/swxform/toolbar/insertobjectbar.xml | 1
34 files changed, 6 insertions(+), 494 deletions(-)
New commits:
commit 41dde8319cbbdc4a8224d348a3969d34841845ed
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Wed Dec 30 10:05:06 2015 +0200
Kill remaining plugin bits
Change-Id: Icd99757b48626ef43313e8de42c4e5462f85a958
Reviewed-on: https://gerrit.libreoffice.org/21008
Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
Tested-by: Maxim Monastirsky <momonasmon at gmail.com>
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index c4da17c..8453c3b 100644
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -3174,14 +3174,6 @@
<value xml:lang="x-no-translate"></value><value xml:lang="en-US">Insert business cards</value>
</prop>
</node>
- <node oor:name=".uno:InsertPlugin" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Plug-in...</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:BringToFront" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Bring to Front</value>
@@ -3214,22 +3206,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:InsertSound" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Sound...</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:InsertVideo" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Video...</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:HyperlinkDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Hyperlink</value>
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 36f5942..b0f72cb 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -87,7 +87,6 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/iconselectordialog \
cui/uiconfig/ui/insertfloatingframe \
cui/uiconfig/ui/insertoleobject \
- cui/uiconfig/ui/insertplugin \
cui/uiconfig/ui/insertrowcolumn \
cui/uiconfig/ui/javaclasspathdialog \
cui/uiconfig/ui/javastartparametersdialog \
diff --git a/cui/uiconfig/ui/insertplugin.ui b/cui/uiconfig/ui/insertplugin.ui
deleted file mode 100644
index c20100a..0000000
--- a/cui/uiconfig/ui/insertplugin.ui
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
-<interface>
- <requires lib="gtk+" version="3.0"/>
- <object class="GtkDialog" id="InsertPluginDialog">
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Insert Plug-in</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Warning: Plugins may not work on all platforms and may be removed in the future</property>
- <attributes>
- <attribute name="style" value="oblique"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkEntry" id="urled">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property name="hexpand">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="urlbtn">
- <property name="label" translatable="yes">Browse...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="valign">center</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">File/URL</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="width_request">400</property>
- <property name="height_request">80</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTextView" id="pluginoptions:border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="wrap_mode">char</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">ok</action-widget>
- <action-widget response="0">cancel</action-widget>
- <action-widget response="0">help</action-widget>
- </action-widgets>
- </object>
-</interface>
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index e288708..717f5df 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -348,9 +348,9 @@
#define SID_INSERT_OBJECT (SID_SFX_START + 561)
#define SID_INSERT_FLOATINGFRAME (SID_SFX_START + 563)
-#define SID_INSERT_PLUGIN (SID_SFX_START + 672)
-#define SID_INSERT_SOUND (SID_SFX_START + 676)
-#define SID_INSERT_VIDEO (SID_SFX_START + 677)
+// FREE (SID_SFX_START + 672)
+// FREE (SID_SFX_START + 676)
+// FREE (SID_SFX_START + 677)
#define SID_HYPERLINK_DIALOG (SID_SFX_START + 678)
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 6e9b725..8c8812d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3559,14 +3559,6 @@
<value xml:lang="en-US">Insert business cards</value>
</prop>
</node>
- <node oor:name=".uno:InsertPlugin" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Plug-in...</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:BringToFront" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Bring to Front</value>
@@ -3591,22 +3583,6 @@
<value>9</value>
</prop>
</node>
- <node oor:name=".uno:InsertSound" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Audio...</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
- <node oor:name=".uno:InsertVideo" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Video...</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:HyperlinkDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Hyperlink...</value>
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index eeb9019..8999ad8 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -64,9 +64,6 @@ interface BaseSelection
SID_INSERT_GRAPHIC [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
SID_INSERT_FRAME [ ExecMethod = ExecDraw; StateMethod = GetDrawState; Export = FALSE; ]
SID_INSERT_OBJECT [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
- SID_INSERT_PLUGIN [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
- SID_INSERT_SOUND [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
- SID_INSERT_VIDEO [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
SID_INSERT_FLOATINGFRAME [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
SID_INSERT_AVMEDIA [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index c89b0c8..b98890e 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -237,7 +237,6 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView*
aServerLst.FillInsertObjects();
aServerLst.Remove( ScDocShell::Factory().GetClassId() ); // Starcalc nicht anzeigen
//TODO/LATER: currently no inserting of ClassId into SfxRequest!
- case SID_INSERT_PLUGIN :
case SID_INSERT_FLOATINGFRAME :
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 36fd74a..c2356aa 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -295,9 +295,6 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
break;
case SID_INSERT_OBJECT:
- case SID_INSERT_PLUGIN:
- case SID_INSERT_SOUND:
- case SID_INSERT_VIDEO:
case SID_INSERT_SMATH:
case SID_INSERT_FLOATINGFRAME:
FuInsertOLE(this, pWin, pView, pDrModel, rReq);
@@ -456,21 +453,11 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet)
break;
case SID_INSERT_OBJECT:
- case SID_INSERT_PLUGIN:
case SID_INSERT_FLOATINGFRAME:
if ( bOle || bTabProt || bShared )
rSet.DisableItem( nWhich );
break;
- case SID_INSERT_SOUND:
- case SID_INSERT_VIDEO:
- /* #i102735# discussed with NN: removed for performance reasons
- || !SvxPluginFileDlg::IsAvailable(nWhich)
- */
- if ( bOle || bTabProt || bShared )
- rSet.DisableItem( nWhich );
- break;
-
case SID_INSERT_GRAPHIC:
case SID_INSERT_AVMEDIA:
case SID_FONTWORK_GALLERY_FLOATER:
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index d1113e4..13fa140 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -167,7 +167,6 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:InsertObjectStarMath"/>
<menu:menuitem menu:id=".uno:InsertObject"/>
- <menu:menuitem menu:id=".uno:InsertPlugin"/>
<menu:menuitem menu:id=".uno:InsertObjectChartFromFile"/>
</menu:menupopup>
</menu:menu>
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 9482da0..ce8ceb0 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 073efde..7e5b08a 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 cebb95b..72cbb03 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 2f38a30..6ae5994 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 13ee972..3868304 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 dda3149..19ea9ce 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 8143126..14086ca 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 6513e9f..bb09b17 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>
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 51b6e80..e62333e 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -6719,57 +6719,6 @@ SfxVoidItem InsertObjectChartFromFile SID_INSERT_DIAGRAM_FROM_FILE
]
-SfxVoidItem InsertPlugin SID_INSERT_PLUGIN
-(SfxStringItem ClassLocation FN_PARAM_2,
- SfxStringItem Commands FN_PARAM_3)
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_INSERT;
-]
-
-
-SfxVoidItem InsertSound SID_INSERT_SOUND
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_INSERT;
-]
-
-
SfxVoidItem InsertSymbol SID_CHARMAP
(SfxStringItem Symbols SID_CHARMAP, SfxStringItem FontName SID_ATTR_SPECIALCHAR)
[
@@ -6874,31 +6823,6 @@ SfxVoidItem InsertTextFrame SID_INSERT_FRAME
]
-SfxVoidItem InsertVideo SID_INSERT_VIDEO
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_INSERT;
-]
-
-
SfxVoidItem InternetDialog SID_INET_DLG
()
[
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index d27eae2..cbbffb3 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 a587aff..3a91e23 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 b98305f..f47ffbc 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 4a27b28..7c6e1a2 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 75b4915..14d1baf 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 f210a66..7d82137 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 922b0cf..41f8257 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 be11b5b..f00b549 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 4795e44..e824b00 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 f210a66..7d82137 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 f9d3fec..3b090bd 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 f210a66..7d82137 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 4ebdaab..2c84032 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 7c910fe..6668d73 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 c6cf58f..883ec24 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 f210a66..7d82137 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
More information about the Libreoffice-commits
mailing list