diff options
39 files changed, 2 insertions, 53 deletions
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index fb7ea6738cc0..60cc0e1164c6 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\ )) $(eval $(call gb_CppunitTest_set_args,dbaccess_macros_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index 0ce7ad853573..6ce04b82cd47 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -70,7 +70,6 @@ $(eval $(call gb_CppunitTest_use_components,extensions_test_update,\ )) $(eval $(call gb_CppunitTest_set_args,extensions_test_update,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \ )) diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk index 85d8a1f4738f..2a8ddd021a64 100644 --- a/filter/CppunitTest_filter_tga_test.mk +++ b/filter/CppunitTest_filter_tga_test.mk @@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_components,filter_tga_test,\ )) $(eval $(call gb_CppunitTest_set_args,filter_tga_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \ )) diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk index 0fb7b1002399..1c07f80259b1 100644 --- a/filter/CppunitTest_filter_tiff_test.mk +++ b/filter/CppunitTest_filter_tiff_test.mk @@ -55,7 +55,6 @@ $(eval $(call gb_CppunitTest_use_components,filter_tiff_test,\ )) $(eval $(call gb_CppunitTest_set_args,filter_tiff_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \ )) diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index 2da7ad976d23..c5ea37a96727 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -62,7 +62,6 @@ $(eval $(call gb_CppunitTest_use_components,hwpfilter_test_hwpfilter,\ )) $(eval $(call gb_CppunitTest_set_args,hwpfilter_test_hwpfilter,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \ )) diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index b723b7ff2dd9..19808fffcc96 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -52,10 +52,6 @@ $(eval $(call gb_CppunitTest_use_components,i18npool_test_breakiterator,\ i18npool/util/i18npool \ )) -$(eval $(call gb_CppunitTest_set_args,i18npool_test_breakiterator,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ -)) - $(call gb_CppunitTest_get_target,i18npool_test_breakiterator) : $(call gb_Module_get_target,i18npool) # vim: set noet sw=4 ts=4: diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index 9e766e3a0718..945a96f22bca 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -62,7 +62,6 @@ $(eval $(call gb_CppunitTest_use_components,lotuswordpro_test_lotuswordpro,\ )) $(eval $(call gb_CppunitTest_set_args,lotuswordpro_test_lotuswordpro,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \ )) diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 011a65af92fe..eb95f867536f 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -119,7 +119,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\ )) $(eval $(call gb_CppunitTest_set_args,sc_cellrangesbase,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index 64a1dd0c3e4d..37c5915ea890 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -125,7 +125,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\ )) $(eval $(call gb_CppunitTest_set_args,sc_chart_regression_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index d9ff41b33db0..a8292a341d67 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\ )) $(eval $(call gb_CppunitTest_set_args,sc_databaserangeobj,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 82b6f05e2dfd..5eb0350b1e31 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\ )) $(eval $(call gb_CppunitTest_set_args,sc_datapilotfieldobj,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 4007f4f5ed51..29ec3b930c0c 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\ )) $(eval $(call gb_CppunitTest_set_args,sc_datapilottableobj,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 23177f3169f6..b1466477460a 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\ )) $(eval $(call gb_CppunitTest_set_args,sc_filters_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 60ceab324ce9..4a87930aa913 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -114,7 +114,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\ )) $(eval $(call gb_CppunitTest_set_args,sc_macros_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index 46c38bea8eb6..34689a54a07d 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\ )) $(eval $(call gb_CppunitTest_set_args,sc_namedrangeobj,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 4bdb78d9c686..03addcfb7481 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\ )) $(eval $(call gb_CppunitTest_set_args,sc_namedrangesobj,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index a25b8d265cd7..fb0436fe7b1a 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -130,7 +130,6 @@ endif endif $(eval $(call gb_CppunitTest_set_args,sc_subsequent_filters_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index 3fb51bfacbdb..daadfb1b172e 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\ )) $(eval $(call gb_CppunitTest_set_args,sc_tableautoformatfield,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 4b5578c98fa6..f2f72e1849c0 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -119,7 +119,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetobj,\ )) $(eval $(call gb_CppunitTest_set_args,sc_spreadsheetobj,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 3b076abc8d6d..a58afd30a81f 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsobj,\ )) $(eval $(call gb_CppunitTest_set_args,sc_spreadsheetsobj,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 7cd6d0b2559a..b0d2e6ad87e7 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -98,7 +98,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_ucalc,\ )) $(eval $(call gb_CppunitTest_set_args,sc_ucalc,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \ )) diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 6b8a328384b1..46ad622a7464 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -107,7 +107,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\ )) $(eval $(call gb_CppunitTest_set_args,sd_filters_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index bc055aab6579..2716c50e9f7a 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -117,7 +117,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_regression_test,\ )) $(eval $(call gb_CppunitTest_set_args,sd_regression_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ "-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \ )) diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index b996d2d08130..658a240292aa 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -83,7 +83,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_uimpress,\ )) $(eval $(call gb_CppunitTest_set_args,sd_uimpress,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \ )) diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk index 931ebb1f5735..872c56ea89b4 100644 --- a/sdext/CppunitTest_pdfimport.mk +++ b/sdext/CppunitTest_pdfimport.mk @@ -74,7 +74,6 @@ $(eval $(call gb_CppunitTest_use_components,sdext_pdfimport,\ )) $(eval $(call gb_CppunitTest_set_args,sdext_pdfimport,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \ )) diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index 851e2e4bd1e5..c51df89535bd 100644 --- a/smoketest/CppunitTest_smoketest.mk +++ b/smoketest/CppunitTest_smoketest.mk @@ -55,8 +55,6 @@ $(eval $(call gb_CppunitTest_set_args,smoketest,\ -env:arg-user=$(WORKDIR)/CustomTarget/smoketest \ -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ -env:arg-testarg.smoketest.doc=$(OUTDIR)/bin/smoketestdoc.sxw \ - --protector $(call gb_Library_get_target,unoexceptionprotector) \ - unoexceptionprotector \ )) $(call gb_CppunitTest_get_target,smoketest): clean_CustomTarget_smoketest diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index d69777ac62bb..51cde99e218b 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -69,7 +69,8 @@ $(if $(strip $(UNO_SERVICES)),\ "-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_CppunitTarget__make_url,$(item)))") \ $(if $(URE),\ $(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\ - -env:$(dir)=$(call gb_CppunitTarget__make_url,$(gb_CppunitTest_LIBDIR)))) + -env:$(dir)=$(call gb_CppunitTarget__make_url,$(gb_CppunitTest_LIBDIR))) \ + --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector) endef .PHONY : $(call gb_CppunitTest_get_clean_target,%) diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index b63556c0d947..003a346956cf 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -56,8 +56,4 @@ $(eval $(call gb_CppunitTest_use_api,sot_test_sot,\ udkapi \ )) -$(eval $(call gb_CppunitTest_set_args,sot_test_sot,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ -)) - # vim: set noet sw=4 ts=4: diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 21427629eed8..1af328685eb7 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -95,8 +95,4 @@ $(eval $(call gb_CppunitTest_use_old_components,starmath_qa_cppunit,\ )) endif -$(eval $(call gb_CppunitTest_set_args,starmath_qa_cppunit,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ -)) - # vim: set noet sw=4 ts=4: diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk index 70823717b9bf..8602756f2b9a 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -50,8 +50,3 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \ utl \ $(gb_STDLIBS) \ )) - -$(eval $(call gb_CppunitTest_set_args,svl_urihelper, \ - --protector unoexceptionprotector$(gb_Library_DLLEXT) \ - unoexceptionprotector \ -)) diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk index ee266443b314..ff764a13996a 100644 --- a/svtools/CppunitTest_svtools_filters_test.mk +++ b/svtools/CppunitTest_svtools_filters_test.mk @@ -58,7 +58,6 @@ $(eval $(call gb_CppunitTest_use_components,svtools_filters_test,\ )) $(eval $(call gb_CppunitTest_set_args,svtools_filters_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \ )) diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 2a3203cff39d..5400cdefda03 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -91,7 +91,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ )) $(eval $(call gb_CppunitTest_set_args,sw_filters_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \ )) diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index bf451885b7bf..44728dfb0145 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -114,7 +114,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_layout_test,\ )) $(eval $(call gb_CppunitTest_set_args,sw_layout_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 35801e63c27f..9be7339802a2 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -116,7 +116,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\ )) $(eval $(call gb_CppunitTest_set_args,sw_macros_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk index 9edc5c8293f3..9d37f66b8346 100644 --- a/sw/CppunitTest_sw_regression_test.mk +++ b/sw/CppunitTest_sw_regression_test.mk @@ -116,7 +116,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_regression_test,\ )) $(eval $(call gb_CppunitTest_set_args,sw_regression_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sw/CppunitTest_sw_subsequent_ooxmltok.mk b/sw/CppunitTest_sw_subsequent_ooxmltok.mk index 46b333a9ad66..21cfbff4bac6 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmltok.mk @@ -75,7 +75,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmltok,\ )) $(eval $(call gb_CppunitTest_set_args,sw_subsequent_ooxmltok,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtftok.mk b/sw/CppunitTest_sw_subsequent_rtftok.mk index 01d75fe06671..9689d049cc5e 100644 --- a/sw/CppunitTest_sw_subsequent_rtftok.mk +++ b/sw/CppunitTest_sw_subsequent_rtftok.mk @@ -69,7 +69,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtftok,\ )) $(eval $(call gb_CppunitTest_set_args,sw_subsequent_rtftok,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \ )) diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index c4f88488dec0..cb22c627a08b 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -98,7 +98,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_swdoc_test,\ )) $(eval $(call gb_CppunitTest_set_args,sw_swdoc_test,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \ )) diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 6fee584d4e98..a1d4de4cdb70 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -60,7 +60,6 @@ $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\ )) $(eval $(call gb_CppunitTest_set_args,writerfilter_rtftok,\ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \ )) |