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 /scp2 | |
| 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 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 9 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 13 |
3 files changed, 0 insertions, 23 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 70234f6d7acd..df767a1f4620 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -21,7 +21,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_KDE \ ENABLE_MACOSX_SANDBOX \ ENABLE_NPAPI_FROM_BROWSER \ - ENABLE_NPAPI_INTO_BROWSER \ ENABLE_ONLINE_UPDATE \ ENABLE_TDE \ SYSTEM_CURL \ diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 1e7f14aaf562..76922e25f95a 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -583,15 +583,6 @@ File gid_Brand_File_Bin_Unopkg Name = "unopkg.bin"; End -#if defined ENABLE_NPAPI_INTO_BROWSER -File gid_Brand_File_Lib_Npsoplugin - BIN_FILE_BODY; - Name = SPECIAL_NAME(npsoplugin); - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); -End -#endif - File gid_Brand_File_Bmp_IntroAboutShell TXT_FILE_BODY; Dir = FILELIST_DIR; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 23be13ca65c7..706a90776ddf 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -122,19 +122,6 @@ File gid_File_Basic_Tutorials Name = "wizards_basicsrvtutorials.filelist"; End -#if defined ENABLE_NPAPI_INTO_BROWSER -File gid_File_Exe_Nsplugin - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Program; - #ifdef UNX - Name = "nsplugin"; - #else - Name = "nsplugin.exe"; - #endif -End -#endif - File gid_File_Bin_UIPreviewer BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; |