diff options
| author | Bryan Quigley <gquigs@gmail.com> | 2014-08-04 17:31:23 -0400 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-09 15:20:35 +0200 |
| commit | 496bc3cd6c037360632c33471c4622a095cdcadd (patch) | |
| tree | 694253c3f03821765ec9fa3636e4255b3c4ea210 /cui/source | |
| parent | 1d62f6a24f6160c33ad5c96f39b2ab3c918f0625 (diff) | |
fdo#45071 Remove Libreoffice browser plugin
This removes ENABLE_NPAPI_INTO_BROWSER while it should keep
ENABLE_NPAPI_FROM_BROWSER (embed flash in LO) intact.
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Conflicts:
extensions/source/nsplugin/source/npshell.cxx
Change-Id: I80a9159a75653c74423d8fdc7c188568d3188e04
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/inc/cuires.hrc | 1 | ||||
| -rw-r--r-- | cui/source/options/treeopt.cxx | 29 | ||||
| -rw-r--r-- | cui/source/options/treeopt.src | 1 |
3 files changed, 0 insertions, 31 deletions
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 85a1ea339d78..c85b2948a232 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -114,7 +114,6 @@ #define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200) #define RID_SVXPAGE_INET_PROXY (RID_SVX_START + 157) #define RID_SVXPAGE_INET_MAIL (RID_SVX_START + 155) -#define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161) #define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100) #define OFA_TP_LANGUAGES (RID_OFA_START + 205) #define OFA_TP_MISC (RID_OFA_START + 200) diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 292a5ee86de3..6776974be81b 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -317,7 +317,6 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem case SID_SB_DBREGISTEROPTIONS: fnCreate = &::svx::DbRegistrationOptionsPage::Create; break; case RID_SVXPAGE_ACCESSIBILITYCONFIG: fnCreate = &SvxAccessibilityOptionsTabPage::Create; break; case RID_SVXPAGE_OPTIONS_CTL: fnCreate = &SvxCTLOptionsPage::Create ; break; - case RID_SVXPAGE_INET_MOZPLUGIN: fnCreate = &MozPluginTabPage::Create; break; case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break; case RID_SVXPAGE_ONLINEUPDATE: fnCreate = &SvxOnlineUpdateTabPage::Create; break; case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate = &SvxDefaultColorOptPage::Create; break; @@ -365,7 +364,6 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = { "Internet", NULL, SID_INET_DLG }, { "Internet", "Proxy", RID_SVXPAGE_INET_PROXY }, { "Internet", "Email", RID_SVXPAGE_INET_MAIL }, - { "Internet", "MozillaPlugin", RID_SVXPAGE_INET_MOZPLUGIN }, { "LoadSave", NULL, SID_FILTER_DLG }, { "LoadSave", "General", RID_SFXPAGE_SAVE }, { "LoadSave", "VBAProperties", SID_OPTFILTER_MSOFFICE }, @@ -1766,33 +1764,6 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( nPageId == RID_SVXPAGE_INET_MAIL ) continue; #endif -#if defined MACOSX - // Disable Mozilla Plug-in tab-page on Mac - if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) - continue; -#endif -#ifdef LINUX - // Disable Mozilla Plug-in tab-page on Linux if we find a - // globally installed plugin - if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) { - struct stat sb; - char *p; - bool bHaveSystemWidePlugin = false; - char mozpaths[]="/usr/lib/mozilla/plugins/libnpsoplugin.so:/usr/lib/firefox/plugins/libnpsoplugin.so:/usr/lib/mozilla-firefox/plugins/libnpsoplugin.so:/usr/lib/iceweasel/plugins/libnpsoplugin.so:/usr/lib/iceape/plugins/libnpsoplugin.so:/usr/lib/browser-plugins/libnpsoplugin.so:/usr/lib64/browser-plugins/libnpsoplugin.so"; - - p = strtok(mozpaths, ":"); - while (p != NULL) { - if (stat(p, &sb) != -1) { - bHaveSystemWidePlugin = true; - break; - } - p = strtok(NULL, ":"); - } - - if (bHaveSystemWidePlugin == true) - continue; - } -#endif AddTabPage( nPageId, rInetArray.GetString(i), nGroup ); } } diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src index 6df8d8223015..54be930ff059 100644 --- a/cui/source/options/treeopt.src +++ b/cui/source/options/treeopt.src @@ -64,7 +64,6 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES < "Internet" ; 0; > ; < "Proxy" ; RID_SVXPAGE_INET_PROXY; > ; < "E-mail" ; RID_SVXPAGE_INET_MAIL; > ; - < "Browser Plug-in" ; RID_SVXPAGE_INET_MOZPLUGIN; > ; }; }; StringArray SID_SW_EDITOPTIONS |