No need for --disable-activex and --disable-atl any longer

Change-Id: I7ac4f32cb01bfcc3a2c06e69280c2150d408ec6b
Reviewed-on: https://gerrit.libreoffice.org/35174Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>

Repository.mk

@@ -346,7 +346,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	$(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \
 	drawinglayer \
 	editeng \
-	$(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \
+	$(if $(filter WNT,$(OS)),emser) \
 	evtatt \
 	expwrap \
 	$(call gb_Helper_optional,DBCONNECTIVITY, \
@@ -456,7 +456,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	mozbootstrap \
 	$(if $(filter $(OS),WNT), \
 		ado \
-		$(if $(DISABLE_ATL),,oleautobridge) \
+		oleautobridge \
 		smplmail \
 		wininetbe1 \
 	) \
@@ -604,7 +604,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	$(if $(ENABLE_JAVA), \
 		$(if $(filter $(OS),MACOSX),,officebean) \
 	) \
-	$(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \
+	emboleobj \
 	package2 \
 	$(if $(USING_X11),recentfile) \
 	$(call gb_Helper_optional,SCRIPTING,scriptframe) \
@@ -636,11 +636,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 		dtrans \
 		fps \
 		ftransl \
-		$(if $(DISABLE_ATL),,\
-			inprocserv \
-			UAccCOM \
-			winaccessibility \
-		) \
+		inprocserv \
+		UAccCOM \
+		winaccessibility \
 	) \
 ))
 
@@ -652,24 +650,18 @@ endif
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbinarytable, \
-	$(if $(DISABLE_ACTIVEX),,\
-		regactivex \
-	) \
+	regactivex \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activex, \
-	$(if $(DISABLE_ACTIVEX),,\
-		so_activex \
-		spsupp \
-	) \
+	so_activex \
+	spsupp \
 ))
 
 ifneq ($(BUILD_X64),)
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexwin64, \
-	$(if $(DISABLE_ACTIVEX),,\
-		so_activex_x64 \
-		spsupp_x64 \
-	) \
+	so_activex_x64 \
+	spsupp_x64 \
 ))
 endif
 

config_host.mk.in

@@ -91,8 +91,6 @@ export DCONF_CFLAGS=@DCONF_CFLAGS@
 export DCONF_LIBS=@DCONF_LIBS@
 export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
 export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
-export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@
-export DISABLE_ATL=@DISABLE_ATL@
 export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
 export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
 export DISABLE_OPENSSL=@DISABLE_OPENSSL@

config_host/config_features.h.in

@@ -159,11 +159,6 @@
  */
 #define HAVE_FEATURE_BREAKPAD 0
 
-/*
- * Whether to enable ATL
- */
-#define HAVE_FEATURE_ATL 0
-
 /*
  *  Whether OpenGL is enabled
  */

configure.ac

@@ -1130,16 +1130,6 @@ libo_FUZZ_ARG_ENABLE(directx,
          compile. (DirectX SDK, GDI+ libs)])
 )
 
-libo_FUZZ_ARG_ENABLE(activex,
-    AS_HELP_STRING([--disable-activex],
-        [Disable the use of ActiveX for a Windows build.])
-,)
-
-libo_FUZZ_ARG_ENABLE(atl,
-    AS_HELP_STRING([--disable-atl],
-        [Disable the use of ATL for a Windows build.])
-,)
-
 libo_FUZZ_ARG_ENABLE(avahi,
     AS_HELP_STRING([--enable-avahi],
         [Determines whether to use Avahi to advertise Impress to remote controls.]),
@@ -3698,34 +3688,11 @@ if test "$_os" = "WINNT"; then
         ENABLE_DIRECTX=""
         AC_MSG_RESULT([no])
     fi
-
-    AC_MSG_CHECKING([whether to use ActiveX])
-    if test "$enable_activex" = "yes" -o "$enable_activex" = ""; then
-        DISABLE_ACTIVEX=""
-        AC_MSG_RESULT([yes])
-    else
-        DISABLE_ACTIVEX="TRUE"
-        AC_MSG_RESULT([no])
-    fi
-
-    AC_MSG_CHECKING([whether to use ATL])
-    if test "$enable_atl" = "yes" -o "$enable_atl" = ""; then
-        DISABLE_ATL=""
-        AC_DEFINE(HAVE_FEATURE_ATL, 1)
-        AC_MSG_RESULT([yes])
-    else
-        DISABLE_ATL="TRUE"
-        AC_MSG_RESULT([no])
-    fi
 else
     ENABLE_DIRECTX=""
-    DISABLE_ACTIVEX="TRUE"
-    DISABLE_ATL="TRUE"
 fi
 
 AC_SUBST(ENABLE_DIRECTX)
-AC_SUBST(DISABLE_ACTIVEX)
-AC_SUBST(DISABLE_ATL)
 
 #
 # unowinreg.dll

extensions/Module_extensions.mk

@@ -69,7 +69,6 @@ endif
 ifeq ($(OS),WNT)
 
 ifeq ($(COM),MSC)
-ifneq ($(DISABLE_ACTIVEX),TRUE)
 $(eval $(call gb_Module_add_targets,extensions,\
 	WinResTarget_activex \
 	Library_so_activex \
@@ -82,14 +81,11 @@ $(eval $(call gb_Module_add_targets,extensions,\
 	Library_so_activex_x64 \
 ))
 endif # BUILD_X64
-endif # DISABLE_ACTIVEX
 endif # COM=MSC
 
-ifeq ($(DISABLE_ATL),)
 $(eval $(call gb_Module_add_targets,extensions,\
 	Library_oleautobridge \
 ))
-endif # DISABLE_ATL
 
 endif # WNT
 

scp2/InstallScript_setup_osl.mk

@@ -22,7 +22,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
 	scp2/writer \
 	scp2/xsltfilter \
 	$(if $(filter WNT,$(OS)),\
-		$(if $(DISABLE_ACTIVEX),,scp2/activex) \
+		scp2/activex \
 		scp2/quickstart \
 		scp2/windows \
 		$(if $(filter MSC,$(COM)),\

scp2/Module_scp2.mk

@@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
 		InstallScript_sdkoo \
 	) \
 	$(if $(filter WNT,$(OS)),\
-		$(if $(DISABLE_ACTIVEX),,InstallModule_activex) \
+		InstallModule_activex \
 		InstallModule_quickstart \
 		InstallModule_windows \
 		InstallModule_winexplorerext \

sd/qa/unit/export-tests-ooxml2.cxx

@@ -82,10 +82,7 @@ class SdOOXMLExportTest2 : public SdModelTestBaseXML
 public:
     void testTdf93883();
     void testTdf91378();
-//This test gives errors due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
     void testBnc822341();
-#endif
     void testMathObject();
     void testMathObjectPPT2010();
     void testTdf80224();
@@ -109,10 +106,7 @@ public:
 
     CPPUNIT_TEST(testTdf93883);
     CPPUNIT_TEST(testTdf91378);
-//This test gives errors due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
     CPPUNIT_TEST(testBnc822341);
-#endif
     CPPUNIT_TEST(testMathObject);
     CPPUNIT_TEST(testMathObjectPPT2010);
     CPPUNIT_TEST(testTdf80224);
@@ -174,8 +168,6 @@ void SdOOXMLExportTest2::testTdf93883()
     CPPUNIT_ASSERT(!xPropSet->getPropertyValue("NumberingLevel").hasValue());
 }
 
-//This test gives errors due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
 void SdOOXMLExportTest2::testBnc822341()
 {
     // Check import / export of embedded text document
@@ -245,7 +237,6 @@ void SdOOXMLExportTest2::testBnc822341()
 
     xDocShRef->DoClose();
 }
-#endif
 
 void SdOOXMLExportTest2::testMathObject()
 {

setup_native/Module_setup_native.mk

@@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_targets,setup_native,\
 	Library_instooofiltmsi \
 	Library_qslnkmsi \
 	Library_reg4allmsdoc \
-	$(if $(DISABLE_ACTIVEX),,Library_regactivex) \
+	Library_regactivex \
 	Library_sdqsmsi \
 	Library_sellangmsi \
 	Library_shlxtmsi \

shell/Module_shell.mk

@@ -61,11 +61,9 @@ $(eval $(call gb_Module_add_targets,shell,\
 	StaticLibrary_shlxthandler_common \
 	StaticLibrary_xmlparser \
 	WinResTarget_shlxthdl \
-	$(if $(DISABLE_ACTIVEX),,\
-		CustomTarget_spsupp_idl \
-		Library_spsupp \
-		WinResTarget_spsupp \
-	) \
+	CustomTarget_spsupp_idl \
+	Library_spsupp \
+	WinResTarget_spsupp \
 ))
 
 $(eval $(call gb_Module_add_check_targets,shell,\
@@ -81,9 +79,7 @@ $(eval $(call gb_Module_add_targets,shell,\
 	Library_shlxthdl_x64 \
 	StaticLibrary_shlxthandler_common_x64 \
 	StaticLibrary_xmlparser_x64 \
-	$(if $(DISABLE_ACTIVEX),,\
-		Library_spsupp_x64 \
-	) \
+	Library_spsupp_x64 \
 ))
 endif
 

sw/qa/extras/ooxmlexport/ooxmlexport.cxx

@@ -80,14 +80,11 @@ protected:
     }
 };
 
-//This test gives errors due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
 DECLARE_OOXMLEXPORT_TEST(testfdo81381, "fdo81381.docx")
 {
     if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
         assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:object[1]/o:OLEObject[1]", "DrawAspect", "Icon");
 }
-#endif
 
 DECLARE_OOXMLEXPORT_TEST(testSdtAlias, "sdt-alias.docx")
 {

sw/qa/extras/ooxmlexport/ooxmlexport4.cxx

@@ -485,8 +485,6 @@ DECLARE_OOXMLEXPORT_TEST(testAbi11739, "abi11739.docx")
     CPPUNIT_ASSERT(getXPathPosition(pXmlDoc, "/w:styles/w:style[11]", "unhideWhenUsed") < getXPathPosition(pXmlDoc, "/w:styles/w:style[11]", "qFormat"));
 }
 
-//This test gives error due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
 DECLARE_OOXMLEXPORT_TEST(testEmbeddedXlsx, "embedded-xlsx.docx")
 {
     // check there are two objects and they are FrameShapes
@@ -517,7 +515,6 @@ DECLARE_OOXMLEXPORT_TEST(testEmbeddedXlsx, "embedded-xlsx.docx")
     CPPUNIT_ASSERT_EQUAL(2, nSheetFiles);
     CPPUNIT_ASSERT_EQUAL(2, nImageFiles);
 }
-#endif
 
 DECLARE_OOXMLEXPORT_TEST(testNumberedLists_StartingWithZero, "FDO74105.docx")
 {
@@ -553,8 +550,6 @@ DECLARE_OOXMLEXPORT_TEST(testPageBreak,"fdo74566.docx")
     getRun(xParagraph4, 1, "Second Page First line after Page Break");
 }
 
-//This test gives errors due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
 DECLARE_OOXMLEXPORT_TEST(testOleObject, "test_ole_object.docx")
 {
     xmlDocPtr pXmlDoc = parseExport("word/document.xml");
@@ -582,7 +577,6 @@ DECLARE_OOXMLEXPORT_TEST(testOleObject, "test_ole_object.docx")
         "application/vnd.openxmlformats-officedocument.oleObject");
 
 }
-#endif
 
 DECLARE_OOXMLEXPORT_TEST(testFdo74792, "fdo74792.docx")
 {
@@ -732,8 +726,6 @@ DECLARE_OOXMLEXPORT_TEST(testParagraphWithComments, "paragraphWithComments.docx"
     CPPUNIT_ASSERT_EQUAL( idInDocXml, idInCommentXml );
 }
 
-//This features gives error due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
 DECLARE_OOXMLEXPORT_TEST(testOLEObjectinHeader, "2129393649.docx")
 {
     // fdo#76015 : Document contains oleobject in header xml.
@@ -766,7 +758,6 @@ DECLARE_OOXMLEXPORT_TEST(testOLEObjectinHeader, "2129393649.docx")
         "ProgID",
         "Word.Picture.8");
 }
-#endif
 
 DECLARE_OOXMLEXPORT_TEST(test_ClosingBrace, "2120112713.docx")
 {
@@ -912,8 +903,6 @@ DECLARE_OOXMLEXPORT_TEST(testSimpleSdts, "simple-sdts.docx")
     assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtPr/w:citation", 1);
 }
 
-//This feature gives error due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
 DECLARE_OOXMLEXPORT_TEST(testEmbeddedExcelChart, "EmbeddedExcelChart.docx")
 {
     xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
@@ -940,7 +929,6 @@ DECLARE_OOXMLEXPORT_TEST(testEmbeddedExcelChart, "EmbeddedExcelChart.docx")
         "ProgID",
         "Excel.Chart.8");
 }
-#endif
 
 DECLARE_OOXMLEXPORT_TEST(testTdf83227, "tdf83227.docx")
 {

sw/qa/extras/ooxmlexport/ooxmlexport5.cxx

@@ -369,8 +369,6 @@ DECLARE_OOXMLEXPORT_TEST(testFDO77812, "fdo77812.docx")
     assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:cols/w:col[2]", 1);
 }
 
-//This test gives errors due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
 DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE, "fdo77759.docx")
 {
     xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
@@ -396,7 +394,6 @@ DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE, "fdo77759.docx")
         "ProgID",
         "Excel.Sheet.12");
 }
-#endif
 
 DECLARE_OOXMLEXPORT_TEST(testfdo78420, "fdo78420.docx")
 {
@@ -733,8 +730,6 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsm, "fdo79969_xlsm.docx")
         "Excel.SheetMacroEnabled.12");
 }
 
-//This test gives errors due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
 DECLARE_OOXMLEXPORT_TEST(testfdo80522,"fdo80522.docx")
 {
    xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
@@ -760,10 +755,7 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80522,"fdo80522.docx")
         "ProgID",
         "Word.DocumentMacroEnabled.12");
 }
-#endif
 
-//This test gives errors due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
 DECLARE_OOXMLEXPORT_TEST(testfdo80523_pptm,"fdo80523_pptm.docx")
 {
    xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
@@ -789,7 +781,6 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80523_pptm,"fdo80523_pptm.docx")
         "ProgID",
         "PowerPoint.ShowMacroEnabled.12");
 }
-#endif
 
 DECLARE_OOXMLEXPORT_TEST(testfdo80523_sldm,"fdo80523_sldm.docx")
 {
@@ -817,8 +808,6 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80523_sldm,"fdo80523_sldm.docx")
         "PowerPoint.SlideMacroEnabled.12");
 }
 
-//This test gives errors due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
 DECLARE_OOXMLEXPORT_TEST(testfdo80898, "fdo80898.docx")
 {
     // This UT for DOCX embedded with binary excel work sheet.
@@ -845,7 +834,6 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80898, "fdo80898.docx")
         "ProgID",
         "Word.Document.8");
 }
-#endif
 
 DECLARE_OOXMLEXPORT_TEST(testTableCellWithDirectFormatting, "fdo80800.docx")
 {