[Libreoffice-commits] core.git: distro-configs/LibreOfficeCoverity.conf postprocess/Rdb_services.mk scp2/InstallModule_ooo.mk

[Bryan Quigley]

 distro-configs/LibreOfficeCoverity.conf |    1 -
 postprocess/Rdb_services.mk             |    6 ------
 scp2/InstallModule_ooo.mk               |    1 -
 3 files changed, 8 deletions(-)

New commits:
commit 054b25c9ce96eb50d80177cb48cd9b10513806c3
Author: Bryan Quigley <gquigs at gmail.com>
Date:   Wed Dec 30 21:01:45 2015 -0500

    Remove missed NPAPI items
    
    These were missed during the removal of NPAPI.
    
    Change-Id: Ie6233a755cd8f2995692fb8790bd65055d100251
    Reviewed-on: https://gerrit.libreoffice.org/21015
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/distro-configs/LibreOfficeCoverity.conf b/distro-configs/LibreOfficeCoverity.conf
index 63f55c4..bcbdab2 100644
--- a/distro-configs/LibreOfficeCoverity.conf
+++ b/distro-configs/LibreOfficeCoverity.conf
@@ -8,7 +8,6 @@
 --enable-option-checking=fatal
 --with-system-libs
 --with-system-headers
---without-system-npapi-headers
 --without-system-libcmis
 --without-system-cppunit
 --without-system-libmwaw
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 1974b59..51c9eba 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -321,12 +321,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 
 endif # DESKTOP
 
-ifeq ($(ENABLE_NPAPI_FROM_BROWSER),TRUE)
-$(eval $(call gb_Rdb_add_components,services,\
-	extensions/source/plugin/pl \
-))
-endif
-
 ifeq ($(ENABLE_PDFIMPORT),TRUE)
 $(eval $(call gb_Rdb_add_components,services,\
 	sdext/source/pdfimport/pdfimport \
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 91b11a3..c9e4199 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
 $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	ENABLE_GTK \
 	ENABLE_MACOSX_SANDBOX \
-	ENABLE_NPAPI_FROM_BROWSER \
 	ENABLE_ONLINE_UPDATE \
 	ENABLE_TDE \
 	SYSTEM_CURL \