Key different browser plugin features to specific flags

This is a rework of f9059d4eee8e53c0a6b531fff16e1fade58cb8b0 "Key all browser
plugin features to --enable-nsplugin."  The problem with that was that Mac OS X
supports pluging browser plugins into LO documents (which was originally
controlled by --enable-mozilla) but not plugging LO into browser windows (which
was originally controlled by --enable-nsplugin), so controlling the former with
the same switch as the latter did not actually work.

Thus I replaced the single ENABLE_NSPLUGIN feature flag with two dedicated ones,
ENABLE_NPAPI_FROM_BROWSER (for plugging browser plugins into LO documents) and
ENABLE_NPAPI_INTO_BROWSER (for plugging LO into browser windows).  The
--enable-nsplugin configure switch is gone completely, setting the feature flags
is always done fully automatically now.

Change-Id: Iecf706637465e865c987563b5de489fa90b4c904

4 files changed, 16 insertions, 15 deletions

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index d9c6f571313d..58168619b436 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -39,7 +39,8 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	ENABLE_KDE \
 	ENABLE_KDE4 \
 	ENABLE_LIBLANGTAG \
-	ENABLE_NSPLUGIN \
+	ENABLE_NPAPI_FROM_BROWSER \
+	ENABLE_NPAPI_INTO_BROWSER \
 	ENABLE_ONLINE_UPDATE \
 	ENABLE_OPENGL \
 	ENABLE_TDE \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 6617e4ad9570..53299c9b4409 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -624,7 +624,7 @@ File gid_Brand_File_Bin_Libxml2
 End
 #endif
 
-#if defined ENABLE_NSPLUGIN
+#if defined ENABLE_NPAPI_INTO_BROWSER
 File gid_Brand_File_Lib_Npsoplugin
     BIN_FILE_BODY;
     Name = SPECIAL_NAME(npsoplugin);
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 1e038f8c284b..deeca822de2e 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -934,7 +934,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
 
 STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
 
-#if defined ENABLE_NSPLUGIN
+#if defined ENABLE_NPAPI_FROM_BROWSER
 STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index b73224858ae2..c3e3a834c982 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -102,8 +102,7 @@ File gid_File_Basic_Tutorials
     Name = "basicsrvtutorials.zip";
 End
 
-#ifdef ENABLE_NSPLUGIN
-
+#if defined ENABLE_NPAPI_INTO_BROWSER
 File gid_File_Exe_Nsplugin
         BIN_FILE_BODY;
         Styles          = (PACKED);
@@ -114,18 +113,8 @@ File gid_File_Exe_Nsplugin
     Name = "nsplugin.exe";
   #endif
 End
-
-#if defined(UNX) && !defined(QUARTZ)
-File gid_File_Bin_Pluginapp
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "pluginapp.bin";
-    Styles = (PACKED);
-End
 #endif
 
-#endif // ENABLE_NSPLUGIN
-
 File gid_File_Bin_Gengal
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
@@ -159,6 +148,17 @@ End
 
 #endif
 
+#if defined ENABLE_NPAPI_FROM_BROWSER && defined UNX && !defined QUARTZ
+
+File gid_File_Bin_Pluginapp
+    BIN_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Name = "pluginapp.bin";
+    Styles = (PACKED);
+End
+
+#endif
+
 #ifdef UNX
 
 File gid_File_Bin_Open_Url