summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorBryan Quigley <gquigs@gmail.com>2016-04-29 15:55:22 -0400
committerCaolán McNamara <caolanm@redhat.com>2016-05-03 09:17:01 +0000
commit4b3c211cfb4f64f0f31461aa2e623d64224c4423 (patch)
tree4fc4c1acd042d92d607657212ddde9767078c807 /sw
parent022b466db1142f95a4f0088b46abeb2787323b5e (diff)
Remove Edit -> Plug-in as no longer used
This functionality seems to only have been used with NPAPI plugins. They've been previously removed. Per the help text, if it is still used by anything, you can use the context menu instead. MN_READONLY_PLUGINOFF also appeared to be unused, so removed. More code might be removable, but would affect activate on click/visible. Change-Id: I12d5bf54edd3a2f716912179b87e798b47b3cc3d Reviewed-on: https://gerrit.libreoffice.org/24500 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/helpid.h1
-rw-r--r--sw/source/uibase/docvw/docvw.hrc2
-rw-r--r--sw/source/uibase/docvw/docvw.src6
-rw-r--r--sw/source/uibase/docvw/romenu.cxx6
-rw-r--r--sw/uiconfig/sglobal/menubar/menubar.xml1
-rw-r--r--sw/uiconfig/sweb/menubar/menubar.xml1
-rw-r--r--sw/uiconfig/swform/menubar/menubar.xml1
-rw-r--r--sw/uiconfig/swreport/menubar/menubar.xml1
-rw-r--r--sw/uiconfig/swriter/menubar/menubar.xml1
-rw-r--r--sw/uiconfig/swxform/menubar/menubar.xml1
10 files changed, 1 insertions, 20 deletions
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index aa0d9d1a8f33..97935287bf17 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -161,7 +161,6 @@
#define HID_MN_READONLY_COPYGRAPHIC "SW_HID_MN_READONLY_COPYGRAPHIC"
#define HID_MN_READONLY_LOADGRAPHIC "SW_HID_MN_READONLY_LOADGRAPHIC"
#define HID_MN_READONLY_GRAPHICOFF "SW_HID_MN_READONLY_GRAPHICOFF"
-#define HID_MN_READONLY_PLUGINOFF "SW_HID_MN_READONLY_PLUGINOFF"
#define HID_LINGU_ADD_WORD "SW_HID_LINGU_ADD_WORD"
#define HID_LINGU_IGNORE_WORD "SW_HID_LINGU_IGNORE_WORD"
diff --git a/sw/source/uibase/docvw/docvw.hrc b/sw/source/uibase/docvw/docvw.hrc
index 1161bca375a7..723ea8ae6d05 100644
--- a/sw/source/uibase/docvw/docvw.hrc
+++ b/sw/source/uibase/docvw/docvw.hrc
@@ -36,7 +36,7 @@
#define MN_READONLY_COPYGRAPHIC (RC_DOCVW_BEGIN + 14)
#define MN_READONLY_LOADGRAPHIC (RC_DOCVW_BEGIN + 15)
#define MN_READONLY_GRAPHICOFF (RC_DOCVW_BEGIN + 16)
-#define MN_READONLY_PLUGINOFF (RC_DOCVW_BEGIN + 17)
+// free (RC_DOCVW_BEGIN + 17)
#define MN_READONLY_TOGALLERYLINK (RC_DOCVW_BEGIN + 18)
#define MN_READONLY_TOGALLERYCOPY (RC_DOCVW_BEGIN + 19)
#define MN_READONLY_SOURCEVIEW (RC_DOCVW_BEGIN + 20)
diff --git a/sw/source/uibase/docvw/docvw.src b/sw/source/uibase/docvw/docvw.src
index 71654f2035fd..171c2988248e 100644
--- a/sw/source/uibase/docvw/docvw.src
+++ b/sw/source/uibase/docvw/docvw.src
@@ -169,12 +169,6 @@ Menu MN_READONLY_POPUP
HelpID = HID_MN_READONLY_GRAPHICOFF ;
Text [ en-US ] = "Image Off" ;
};
- MenuItem
- {
- Identifier = MN_READONLY_PLUGINOFF ;
- HelpID = HID_MN_READONLY_PLUGINOFF ;
- Text [ en-US ] = "Plug-ins Off" ;
- };
SEPARATOR
MenuItem
{
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 9b863d5c8a2e..3aef4866ede5 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -190,9 +190,6 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
Check( MN_READONLY_SOURCEVIEW, SID_SOURCEVIEW, rDis );
Check( MN_READONLY_BROWSE_BACKWARD, SID_BROWSE_BACKWARD,rDis );
Check( MN_READONLY_BROWSE_FORWARD, SID_BROWSE_FORWARD, rDis );
-#ifdef _WIN32
- Check( MN_READONLY_PLUGINOFF, SID_PLUGINS_ACTIVE, rDis );
-#endif
Check( MN_READONLY_OPENURL, SID_OPENDOC, rDis );
Check( MN_READONLY_OPENURLNEW, SID_OPENDOC, rDis );
@@ -314,9 +311,6 @@ void SwReadOnlyPopup::Execute( vcl::Window* pWin, sal_uInt16 nId )
break;
}
case MN_READONLY_GRAPHICOFF: nExecId = FN_VIEW_GRAPHIC; break;
-#ifdef _WIN32
- case MN_READONLY_PLUGINOFF: nExecId = SID_PLUGINS_ACTIVE; break;
-#endif
case MN_READONLY_TOGALLERYLINK:
SW_MOD()->GetModuleConfig()->SetGrfToGalleryAsLnk( true );
break;
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 0f3a7193833b..6a4eb3b7ece1 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -120,7 +120,6 @@
<menu:menuitem menu:id=".uno:EditHyperlink"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:LinkDialog"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
<menu:menuseparator/>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 422ce36d12e8..65828e57e012 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -89,7 +89,6 @@
<menu:menuitem menu:id=".uno:EditHyperlink"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:LinkDialog"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
<menu:menuseparator/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 9c0495edf25e..d3502cbdaf08 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -119,7 +119,6 @@
<menu:menuitem menu:id=".uno:EditHyperlink"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:LinkDialog"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
<menu:menuseparator/>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index d1cb979a3f93..37d1d4076718 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -120,7 +120,6 @@
<menu:menuitem menu:id=".uno:EditHyperlink"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:LinkDialog"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
<menu:menuseparator/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index fc9c443cc99c..78526e2c093b 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -127,7 +127,6 @@
</menu:menu>
<menu:menuitem menu:id=".uno:FieldDialog"/>
<menu:menuitem menu:id=".uno:LinkDialog"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
<menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index a1bbb159aa20..e24ab308eaed 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -121,7 +121,6 @@
<menu:menuitem menu:id=".uno:EditHyperlink"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:LinkDialog"/>
- <menu:menuitem menu:id=".uno:PlugInsActive"/>
<menu:menuitem menu:id=".uno:ImageMapDialog"/>
<menu:menuitem menu:id=".uno:ObjectMenue"/>
<menu:menuseparator/>