Tue Jun 3 23:56:00 PDT 2014

Repository.mk                                               |    1 
 basic/CppunitTest_basic_coverage.mk                         |    1 
 basic/CppunitTest_basic_enable.mk                           |    1 
 basic/CppunitTest_basic_nested_struct.mk                    |    1 
 basic/CppunitTest_basic_vba.mk                              |    1 
 chart2/CppunitTest_chart2_export.mk                         |    1 
 chart2/CppunitTest_chart2_import.mk                         |    1 
 chart2/CppunitTest_chart2_xshape.mk                         |    1 
 connectivity/CppunitTest_connectivity_commontools.mk        |    1 
 connectivity/CppunitTest_connectivity_mork.mk               |    1 
 cppcanvas/CppunitTest_cppcanvas_emfplus.mk                  |    1 
 cppcanvas/CppunitTest_cppcanvas_test.mk                     |    1 
 dbaccess/CppunitTest_dbaccess_dialog_save.mk                |    1 
 dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk |    1 
 dbaccess/CppunitTest_dbaccess_firebird_test.mk              |    1 
 dbaccess/CppunitTest_dbaccess_hsqldb_test.mk                |    1 
 dbaccess/CppunitTest_dbaccess_macros_test.mk                |    1 
 editeng/CppunitTest_editeng_core.mk                         |    1 
 extensions/CppunitTest_extensions_test_update.mk            |    1 
 filter/CppunitTest_filter_pcx_test.mk                       |    1 
 filter/CppunitTest_filter_pict_test.mk                      |    1 
 filter/CppunitTest_filter_ppm_test.mk                       |    1 
 filter/CppunitTest_filter_psd_test.mk                       |    1 
 filter/CppunitTest_filter_ras_test.mk                       |    1 
 filter/CppunitTest_filter_tga_test.mk                       |    1 
 filter/CppunitTest_filter_tiff_test.mk                      |    1 
 filter/CppunitTest_filter_xslt.mk                           |    1 
 hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk           |    1 
 include/cppunittester/protectorfactory.hxx                  |    1 
 include/vcl/svapp.hxx                                       |    3 +
 lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk  |    1 
 postprocess/CppunitTest_services.mk                         |    1 
 pyuno/qa/pytests/insertremovecells.py                       |    2 
 pyuno/source/module/pyuno_module.cxx                        |    4 -
 sal/cppunittester/cppunittester.cxx                         |   11 +++-
 sax/CppunitTest_sax_parser.mk                               |    1 
 sc/CppunitTest_sc_annotationobj.mk                          |    1 
 sc/CppunitTest_sc_annotationsobj.mk                         |    1 
 sc/CppunitTest_sc_cellrangeobj.mk                           |    1 
 sc/CppunitTest_sc_databaserangeobj.mk                       |    1 
 sc/CppunitTest_sc_datapilotfieldobj.mk                      |    1 
 sc/CppunitTest_sc_datapilottableobj.mk                      |    1 
 sc/CppunitTest_sc_editfieldobj_cell.mk                      |    1 
 sc/CppunitTest_sc_editfieldobj_header.mk                    |    1 
 sc/CppunitTest_sc_filters_test.mk                           |    1 
 sc/CppunitTest_sc_html_export_test.mk                       |    1 
 sc/CppunitTest_sc_macros_test.mk                            |    1 
 sc/CppunitTest_sc_modelobj.mk                               |    1 
 sc/CppunitTest_sc_namedrangeobj.mk                          |    1 
 sc/CppunitTest_sc_namedrangesobj.mk                         |    1 
 sc/CppunitTest_sc_opencl_test.mk                            |    1 
 sc/CppunitTest_sc_outlineobj.mk                             |    1 
 sc/CppunitTest_sc_rangelst_test.mk                          |    1 
 sc/CppunitTest_sc_subsequent_export_test.mk                 |    1 
 sc/CppunitTest_sc_subsequent_filters_test.mk                |    1 
 sc/CppunitTest_sc_tablesheetobj.mk                          |    1 
 sc/CppunitTest_sc_tablesheetsobj.mk                         |    1 
 sc/CppunitTest_sc_ucalc.mk                                  |    1 
 sccomp/CppunitTest_sccomp_lpsolver.mk                       |    1 
 sd/CppunitTest_sd_filters_test.mk                           |    1 
 sd/CppunitTest_sd_html_export_tests.mk                      |    1 
 sd/CppunitTest_sd_import_tests.mk                           |    1 
 sdext/CppunitTest_sdext_pdfimport.mk                        |    1 
 solenv/gbuild/CppunitTest.mk                                |   13 ++++-
 solenv/gbuild/PythonTest.mk                                 |   10 +--
 starmath/CppunitTest_starmath_qa_cppunit.mk                 |    1 
 svgio/CppunitTest_svgio.mk                                  |    1 
 sw/CppunitTest_sw_filters_test.mk                           |    1 
 sw/CppunitTest_sw_htmlexport.mk                             |    1 
 sw/CppunitTest_sw_macros_test.mk                            |    1 
 sw/CppunitTest_sw_odfexport.mk                              |    1 
 sw/CppunitTest_sw_odfimport.mk                              |    1 
 sw/CppunitTest_sw_ooxmlexport.mk                            |    1 
 sw/CppunitTest_sw_ooxmlimport.mk                            |    1 
 sw/CppunitTest_sw_ooxmlsdrexport.mk                         |    1 
 sw/CppunitTest_sw_ooxmlw14export.mk                         |    1 
 sw/CppunitTest_sw_rtfexport.mk                              |    1 
 sw/CppunitTest_sw_rtfimport.mk                              |    1 
 sw/CppunitTest_sw_uiwriter.mk                               |    1 
 sw/CppunitTest_sw_uwriter.mk                                |    1 
 sw/CppunitTest_sw_ww8export.mk                              |    1 
 sw/CppunitTest_sw_ww8import.mk                              |    1 
 test/Module_test.mk                                         |    1 
 test/source/bootstrapfixture.cxx                            |   31 ++++++------
 unotest/source/python/org/libreoffice/unotest.py            |    2 
 vcl/CppunitTest_vcl_complextext.mk                          |    1 
 vcl/CppunitTest_vcl_filters_test.mk                         |    1 
 vcl/CppunitTest_vcl_wmf_test.mk                             |    1 
 vcl/inc/svdata.hxx                                          |    2 
 vcl/source/app/svapp.cxx                                    |   10 +++
 vcl/source/app/svmain.cxx                                   |   15 +++++
 writerfilter/CppunitTest_writerfilter_rtftok.mk             |    1 
 writerperfect/CppunitTest_writerperfect_calc.mk             |    1 
 writerperfect/CppunitTest_writerperfect_draw.mk             |    1 
 writerperfect/CppunitTest_writerperfect_impress.mk          |    1 
 writerperfect/CppunitTest_writerperfect_stream.mk           |    1 
 xmloff/CppunitTest_xmloff_uxmloff.mk                        |    1 
 97 files changed, 158 insertions(+), 31 deletions(-)

New commits:
commit 369d95931f42267eb2f55e066f58ee859183025d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 4 08:45:54 2014 +0200

    DeInitVCL at end of tests
    
    This required some changes to the framework:
    
    * Init-/DeInitVCL is no longer done per individual test in BootstrapFixture, but
      once per CppunitTest invocation in a new vclbootstrapprotector (similarly to
      the exisiting unobootstrapprotector).  CppunitTests that need VCL now need to
      declare gb_CppunitTest_use_vcl.
    
    * For things to work properly, the UNO component context needs to be disposed
      from within DeInitVCL (cf. Desktop's Application::DeInit called from
      DeInitVCL).  The easiest solution was to introduce an
      Application::setDeInitHook (where the hook is called from DeInitVCL)
      specifically for vclbootstrapprotector to call.
    
    * PythonTests don't (yet) call DeInitVCL; they still hook into
      BootstrapFixture's original test_init functionality (to call InitVCL), and do
      not make use of the vclbootstrapprotector.
    
    Change-Id: I4f3a3c75db30b58c1cd49d81c51db14902ed68b2

diff --git a/Repository.mk b/Repository.mk
index 700d9f5..1f0d38b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -453,6 +453,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
 	unobootstrapprotector \
 	unoexceptionprotector \
 	unotest \
+	vclbootstrapprotector \
 	scqahelper \
 	unowinreg \
 ))
diff --git a/basic/CppunitTest_basic_coverage.mk b/basic/CppunitTest_basic_coverage.mk
index 52585fb..4031177 100644
--- a/basic/CppunitTest_basic_coverage.mk
+++ b/basic/CppunitTest_basic_coverage.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_CppunitTest_use_api,basic_coverage,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,basic_coverage))
+$(eval $(call gb_CppunitTest_use_vcl,basic_coverage))
 
 $(eval $(call gb_CppunitTest_use_components,basic_coverage,\
     configmgr/source/configmgr \
diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk
index 1e3f619..c9bdef7 100644
--- a/basic/CppunitTest_basic_enable.mk
+++ b/basic/CppunitTest_basic_enable.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_CppunitTest_use_api,basic_enable,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,basic_enable))
+$(eval $(call gb_CppunitTest_use_vcl,basic_enable))
 
 $(eval $(call gb_CppunitTest_use_components,basic_enable,\
     configmgr/source/configmgr \
diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk
index fcb4583..0c08cdc 100644
--- a/basic/CppunitTest_basic_nested_struct.mk
+++ b/basic/CppunitTest_basic_nested_struct.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_CppunitTest_use_api,basic_nested_struct,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,basic_nested_struct))
+$(eval $(call gb_CppunitTest_use_vcl,basic_nested_struct))
 
 $(eval $(call gb_CppunitTest_use_components,basic_nested_struct,\
     configmgr/source/configmgr \
diff --git a/basic/CppunitTest_basic_vba.mk b/basic/CppunitTest_basic_vba.mk
index 9d61671..02ac3eb 100644
--- a/basic/CppunitTest_basic_vba.mk
+++ b/basic/CppunitTest_basic_vba.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_CppunitTest_use_api,basic_vba,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,basic_vba))
+$(eval $(call gb_CppunitTest_use_vcl,basic_vba))
 
 $(eval $(call gb_CppunitTest_use_components,basic_vba,\
 	configmgr/source/configmgr \
diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk
index 7a32da0..b2bf0a0 100644
--- a/chart2/CppunitTest_chart2_export.mk
+++ b/chart2/CppunitTest_chart2_export.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_api,chart2_export,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,chart2_export))
+$(eval $(call gb_CppunitTest_use_vcl,chart2_export))
 
 $(eval $(call gb_CppunitTest_use_components,chart2_export,\
     basic/util/sb \
diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk
index 4413cf3..7805a03 100644
--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_CppunitTest_use_api,chart2_import,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,chart2_import))
+$(eval $(call gb_CppunitTest_use_vcl,chart2_import))
 
 $(eval $(call gb_CppunitTest_use_components,chart2_import,\
     basic/util/sb \
diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk
index 12d0952..47c03d2 100644
--- a/chart2/CppunitTest_chart2_xshape.mk
+++ b/chart2/CppunitTest_chart2_xshape.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_api,chart2_xshape,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,chart2_xshape))
+$(eval $(call gb_CppunitTest_use_vcl,chart2_xshape))
 
 $(eval $(call gb_CppunitTest_use_components,chart2_xshape,\
     basic/util/sb \
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk
index dc726dc..e1c899e 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_set_include,connectivity_commontools,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,connectivity_commontools))
+$(eval $(call gb_CppunitTest_use_vcl,connectivity_commontools))
 
 $(eval $(call gb_CppunitTest_use_external,connectivity_commontools,boost_headers))
 
diff --git a/connectivity/CppunitTest_connectivity_mork.mk b/connectivity/CppunitTest_connectivity_mork.mk
index f4e31d5..f076014 100644
--- a/connectivity/CppunitTest_connectivity_mork.mk
+++ b/connectivity/CppunitTest_connectivity_mork.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_CppunitTest_use_api,connectivity_mork,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,connectivity_mork))
+$(eval $(call gb_CppunitTest_use_vcl,connectivity_mork))
 
 $(eval $(call gb_CppunitTest_use_sdk_api,connectivity_mork))
 
diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
index d6a73b5..8cd1506 100644
--- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
+++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_use_api,cppcanvas_emfplus,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,cppcanvas_emfplus))
+$(eval $(call gb_CppunitTest_use_vcl,cppcanvas_emfplus))
 
 $(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\
 	canvas/source/cairo/cairocanvas \
diff --git a/cppcanvas/CppunitTest_cppcanvas_test.mk b/cppcanvas/CppunitTest_cppcanvas_test.mk
index e8b1094..b39c226 100644
--- a/cppcanvas/CppunitTest_cppcanvas_test.mk
+++ b/cppcanvas/CppunitTest_cppcanvas_test.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_api,cppcanvas_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,cppcanvas_test))
+$(eval $(call gb_CppunitTest_use_vcl,cppcanvas_test))
 
 $(eval $(call gb_CppunitTest_use_components,cppcanvas_test,\
 	canvas/source/cairo/cairocanvas \
diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
index 66abc7c..d5ff6bd 100644
--- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_dialog_save,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,dbaccess_dialog_save))
+$(eval $(call gb_CppunitTest_use_vcl,dbaccess_dialog_save))
 
 $(eval $(call gb_CppunitTest_use_components,dbaccess_dialog_save,\
     basic/util/sb \
diff --git a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk
index 631c72e..2fe7e94 100644
--- a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk
+++ b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_embeddeddb_performancetest,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,dbaccess_embeddeddb_performancetest))
+$(eval $(call gb_CppunitTest_use_vcl,dbaccess_embeddeddb_performancetest))
 
 $(eval $(call gb_CppunitTest_use_components,dbaccess_embeddeddb_performancetest,\
     basic/util/sb \
diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
index 1cb545d..68351a7 100644
--- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_firebird_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,dbaccess_firebird_test))
+$(eval $(call gb_CppunitTest_use_vcl,dbaccess_firebird_test))
 
 $(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_test,\
     basic/util/sb \
diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
index 5bdaef6..75b7a3e 100644
--- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_hsqldb_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,dbaccess_hsqldb_test))
+$(eval $(call gb_CppunitTest_use_vcl,dbaccess_hsqldb_test))
 
 $(eval $(call gb_CppunitTest_use_components,dbaccess_hsqldb_test,\
     basic/util/sb \
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index df8d67b..e0b81c8 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,dbaccess_macros_test))
+$(eval $(call gb_CppunitTest_use_vcl,dbaccess_macros_test))
 
 $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\
     basic/util/sb \
diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk
index 301c760..171a03f 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_CppunitTest_use_api,editeng_core,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,editeng_core))
+$(eval $(call gb_CppunitTest_use_vcl,editeng_core))
 
 $(eval $(call gb_CppunitTest_use_components,editeng_core,\
     configmgr/source/configmgr \
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index 4eebeb5..80309ec 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_CppunitTest_use_api,extensions_test_update,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,extensions_test_update))
+$(eval $(call gb_CppunitTest_use_vcl,extensions_test_update))
 
 $(eval $(call gb_CppunitTest_use_components,extensions_test_update,\
     configmgr/source/configmgr \
diff --git a/filter/CppunitTest_filter_pcx_test.mk b/filter/CppunitTest_filter_pcx_test.mk
index 5a5f6d6..6f054ca 100644
--- a/filter/CppunitTest_filter_pcx_test.mk
+++ b/filter/CppunitTest_filter_pcx_test.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_pcx_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_pcx_test))
+$(eval $(call gb_CppunitTest_use_vcl,filter_pcx_test))
 
 $(eval $(call gb_CppunitTest_use_components,filter_pcx_test,\
     configmgr/source/configmgr \
diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk
index a3fabd1..1742745 100644
--- a/filter/CppunitTest_filter_pict_test.mk
+++ b/filter/CppunitTest_filter_pict_test.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_pict_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_pict_test))
+$(eval $(call gb_CppunitTest_use_vcl,filter_pict_test))
 
 $(eval $(call gb_CppunitTest_use_components,filter_pict_test,\
     configmgr/source/configmgr \
diff --git a/filter/CppunitTest_filter_ppm_test.mk b/filter/CppunitTest_filter_ppm_test.mk
index cce9041..147d8e9 100644
--- a/filter/CppunitTest_filter_ppm_test.mk
+++ b/filter/CppunitTest_filter_ppm_test.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_ppm_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_ppm_test))
+$(eval $(call gb_CppunitTest_use_vcl,filter_ppm_test))
 
 $(eval $(call gb_CppunitTest_use_components,filter_ppm_test,\
     configmgr/source/configmgr \
diff --git a/filter/CppunitTest_filter_psd_test.mk b/filter/CppunitTest_filter_psd_test.mk
index 850cc32..9df6c4e 100644
--- a/filter/CppunitTest_filter_psd_test.mk
+++ b/filter/CppunitTest_filter_psd_test.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_psd_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_psd_test))
+$(eval $(call gb_CppunitTest_use_vcl,filter_psd_test))
 
 $(eval $(call gb_CppunitTest_use_components,filter_psd_test,\
     configmgr/source/configmgr \
diff --git a/filter/CppunitTest_filter_ras_test.mk b/filter/CppunitTest_filter_ras_test.mk
index feead9d..22a4950 100644
--- a/filter/CppunitTest_filter_ras_test.mk
+++ b/filter/CppunitTest_filter_ras_test.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_ras_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_ras_test))
+$(eval $(call gb_CppunitTest_use_vcl,filter_ras_test))
 
 $(eval $(call gb_CppunitTest_use_components,filter_ras_test,\
     configmgr/source/configmgr \
diff --git a/filter/CppunitTest_filter_tga_test.mk b/filter/CppunitTest_filter_tga_test.mk
index 3707f79..f788611 100644
--- a/filter/CppunitTest_filter_tga_test.mk
+++ b/filter/CppunitTest_filter_tga_test.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_tga_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_tga_test))
+$(eval $(call gb_CppunitTest_use_vcl,filter_tga_test))
 
 $(eval $(call gb_CppunitTest_use_components,filter_tga_test,\
     configmgr/source/configmgr \
diff --git a/filter/CppunitTest_filter_tiff_test.mk b/filter/CppunitTest_filter_tiff_test.mk
index 3d653da..42122c8 100644
--- a/filter/CppunitTest_filter_tiff_test.mk
+++ b/filter/CppunitTest_filter_tiff_test.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_tiff_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_tiff_test))
+$(eval $(call gb_CppunitTest_use_vcl,filter_tiff_test))
 
 $(eval $(call gb_CppunitTest_use_components,filter_tiff_test,\
     configmgr/source/configmgr \
diff --git a/filter/CppunitTest_filter_xslt.mk b/filter/CppunitTest_filter_xslt.mk
index 181f482..feaf502 100644
--- a/filter/CppunitTest_filter_xslt.mk
+++ b/filter/CppunitTest_filter_xslt.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_use_api,filter_xslt,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,filter_xslt))
+$(eval $(call gb_CppunitTest_use_vcl,filter_xslt))
 
 $(eval $(call gb_CppunitTest_use_configuration,filter_xslt))
 
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index 0098ebb..f205d80 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_use_api,hwpfilter_test_hwpfilter,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,hwpfilter_test_hwpfilter))
+$(eval $(call gb_CppunitTest_use_vcl,hwpfilter_test_hwpfilter))
 
 $(eval $(call gb_CppunitTest_use_components,hwpfilter_test_hwpfilter,\
     configmgr/source/configmgr \
diff --git a/include/cppunittester/protectorfactory.hxx b/include/cppunittester/protectorfactory.hxx
index b0b21bd..a024697 100644
--- a/include/cppunittester/protectorfactory.hxx
+++ b/include/cppunittester/protectorfactory.hxx
@@ -33,6 +33,7 @@ namespace cppunittester
 #ifdef DISABLE_DYNLOADING
 extern "C" CppUnit::Protector *unoexceptionprotector();
 extern "C" CppUnit::Protector *unobootstrapprotector();
+extern "C" CppUnit::Protector *vclbootstrapprotector();
 #endif
 
 #endif
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 810aa2b..8b3ef42 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1541,6 +1541,9 @@ public:
 
     ///@}
 
+    // For vclbootstrapprotector:
+    static void setDeInitHook(Link const & hook);
+
 private:
 
     static void InitSettings();
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 17b4f2b..74d0a6f 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_use_api,lotuswordpro_test_lotuswordpro,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,lotuswordpro_test_lotuswordpro))
+$(eval $(call gb_CppunitTest_use_vcl,lotuswordpro_test_lotuswordpro))
 
 $(eval $(call gb_CppunitTest_use_components,lotuswordpro_test_lotuswordpro,\
     configmgr/source/configmgr \
diff --git a/postprocess/CppunitTest_services.mk b/postprocess/CppunitTest_services.mk
index 5a8a65d..bdcae7b 100644
--- a/postprocess/CppunitTest_services.mk
+++ b/postprocess/CppunitTest_services.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,services, \
 $(eval $(call gb_CppunitTest_use_sdk_api,services))
 
 $(eval $(call gb_CppunitTest_use_ure,services))
+$(eval $(call gb_CppunitTest_use_vcl,services))
 
 $(eval $(call gb_CppunitTest_use_rdb,services,services))
 ifneq ($(DISABLE_PYTHON),TRUE)
diff --git a/sax/CppunitTest_sax_parser.mk b/sax/CppunitTest_sax_parser.mk
index b94b826..3308428 100644
--- a/sax/CppunitTest_sax_parser.mk
+++ b/sax/CppunitTest_sax_parser.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_CppunitTest_use_externals,sax_parser, \
 $(eval $(call gb_CppunitTest_use_sdk_api,sax_parser))
 
 $(eval $(call gb_CppunitTest_use_ure,sax_parser))
+$(eval $(call gb_CppunitTest_use_vcl,sax_parser))
 
 $(eval $(call gb_CppunitTest_use_components,sax_parser,\
 	configmgr/source/configmgr \
diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk
index fc7890b..5eb53c0 100644
--- a/sc/CppunitTest_sc_annotationobj.mk
+++ b/sc/CppunitTest_sc_annotationobj.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_annotationobj,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_annotationobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_annotationobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_annotationobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk
index 71fa8c6..f91f1d3 100644
--- a/sc/CppunitTest_sc_annotationsobj.mk
+++ b/sc/CppunitTest_sc_annotationsobj.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_annotationsobj,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_annotationsobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_annotationsobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_annotationsobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index 2260bef..804e454 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_cellrangeobj,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_cellrangeobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_cellrangeobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_cellrangeobj,\
 	basic/util/sb \
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index e558f2d..442dcfd 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_databaserangeobj,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_databaserangeobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_databaserangeobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 98ad5d2..1786af5 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_datapilotfieldobj,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_datapilotfieldobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_datapilotfieldobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 4e2fc40..76ffe9a 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_datapilottableobj,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_datapilottableobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_datapilottableobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\
 	basic/util/sb \
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk
index b84ba96..cc4d5d1 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_editfieldobj_cell,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_editfieldobj_cell))
+$(eval $(call gb_CppunitTest_use_vcl,sc_editfieldobj_cell))
 
 $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_cell,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk
index 12532f3..049becc 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_editfieldobj_header,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_editfieldobj_header))
+$(eval $(call gb_CppunitTest_use_vcl,sc_editfieldobj_header))
 
 $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_header,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 1d4e3d1..ff12276 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_filters_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_filters_test))
+$(eval $(call gb_CppunitTest_use_vcl,sc_filters_test))
 
 $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_html_export_test.mk b/sc/CppunitTest_sc_html_export_test.mk
index 7d95a73..f4ee040 100644
--- a/sc/CppunitTest_sc_html_export_test.mk
+++ b/sc/CppunitTest_sc_html_export_test.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_html_export_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_html_export_test))
+$(eval $(call gb_CppunitTest_use_vcl,sc_html_export_test))
 
 $(eval $(call gb_CppunitTest_use_components,sc_html_export_test,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 7251d48..8298b63 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_macros_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_macros_test))
+$(eval $(call gb_CppunitTest_use_vcl,sc_macros_test))
 
 $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk
index 90f70f5..4a3f1f3 100644
--- a/sc/CppunitTest_sc_modelobj.mk
+++ b/sc/CppunitTest_sc_modelobj.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_modelobj,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_modelobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_modelobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_modelobj,\
 	basic/util/sb \
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index d83525c..b405008 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_namedrangeobj,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_namedrangeobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_namedrangeobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 01adaef..724d61c 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_namedrangesobj,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_namedrangesobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_namedrangesobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk
index 1a892fa..4adafd6 100644
--- a/sc/CppunitTest_sc_opencl_test.mk
+++ b/sc/CppunitTest_sc_opencl_test.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_opencl_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_opencl_test))
+$(eval $(call gb_CppunitTest_use_vcl,sc_opencl_test))
 
 $(eval $(call gb_CppunitTest_use_components,sc_opencl_test,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk
index aeecc58..e319284 100644
--- a/sc/CppunitTest_sc_outlineobj.mk
+++ b/sc/CppunitTest_sc_outlineobj.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_outlineobj,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_outlineobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_outlineobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_outlineobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk
index 6d0e33c..2a394b1 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_rangelst_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_rangelst_test))
+$(eval $(call gb_CppunitTest_use_vcl,sc_rangelst_test))
 
 $(eval $(call gb_CppunitTest_use_components,sc_rangelst_test,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk
index 65fa468..4d02d6b 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_subsequent_export_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_subsequent_export_test))
+$(eval $(call gb_CppunitTest_use_vcl,sc_subsequent_export_test))
 
 $(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
     chart2/source/controller/chartcontroller \
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 3ad9d3b..b53bb24 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_subsequent_filters_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_subsequent_filters_test))
+$(eval $(call gb_CppunitTest_use_vcl,sc_subsequent_filters_test))
 
 $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
     chart2/source/controller/chartcontroller \
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index 0f27f70..bf9d53b 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_tablesheetobj,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_tablesheetobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_tablesheetobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_tablesheetobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index f5a5c464..60c1c22 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_tablesheetsobj,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_tablesheetsobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_tablesheetsobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_tablesheetsobj,\
     basic/util/sb \
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 9b3c498..fa5c3e9 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -87,6 +87,7 @@ $(eval $(call gb_CppunitTest_use_api,sc_ucalc,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_ucalc))
+$(eval $(call gb_CppunitTest_use_vcl,sc_ucalc))
 
 $(eval $(call gb_CppunitTest_use_components,sc_ucalc,\
     configmgr/source/configmgr \
diff --git a/sccomp/CppunitTest_sccomp_lpsolver.mk b/sccomp/CppunitTest_sccomp_lpsolver.mk
index 1c0c72a..5c89fb2 100644
--- a/sccomp/CppunitTest_sccomp_lpsolver.mk
+++ b/sccomp/CppunitTest_sccomp_lpsolver.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_api,sccomp_lpsolver,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sccomp_lpsolver))
+$(eval $(call gb_CppunitTest_use_vcl,sccomp_lpsolver))
 
 $(eval $(call gb_CppunitTest_use_rdb,sccomp_lpsolver,services))
 
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 646b112..43a8d13 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_CppunitTest_use_api,sd_filters_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sd_filters_test))
+$(eval $(call gb_CppunitTest_use_vcl,sd_filters_test))
 
 $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\
     animations/source/animcore/animcore \
diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk
index 457e907..0feb03b 100644
--- a/sd/CppunitTest_sd_html_export_tests.mk
+++ b/sd/CppunitTest_sd_html_export_tests.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sd_html_export_tests,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sd_html_export_tests))
+$(eval $(call gb_CppunitTest_use_vcl,sd_html_export_tests))
 
 $(eval $(call gb_CppunitTest_use_components,sd_html_export_tests,\
     animations/source/animcore/animcore \
diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index ce8ad63..e4801ac 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_CppunitTest_use_api,sd_import_tests,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sd_import_tests))
+$(eval $(call gb_CppunitTest_use_vcl,sd_import_tests))
 
 $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\
     animations/source/animcore/animcore \
diff --git a/sdext/CppunitTest_sdext_pdfimport.mk b/sdext/CppunitTest_sdext_pdfimport.mk
index a7e2a86..56680f2 100644
--- a/sdext/CppunitTest_sdext_pdfimport.mk
+++ b/sdext/CppunitTest_sdext_pdfimport.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sdext_pdfimport,\
 $(eval $(call gb_CppunitTest_use_executable,sdext_pdfimport,xpdfimport))
 
 $(eval $(call gb_CppunitTest_use_ure,sdext_pdfimport))
+$(eval $(call gb_CppunitTest_use_vcl,sdext_pdfimport))
 
 $(eval $(call gb_CppunitTest_use_components,sdext_pdfimport,\
     comphelper/util/comphelp \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index cfbfd81..c442601 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -57,7 +57,11 @@ $(if $(URE),\
 	-env:LO_JAVA_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)) \
 	--protector $(call gb_Library_get_target,unoexceptionprotector) unoexceptionprotector \
 	--protector $(call gb_Library_get_target,unobootstrapprotector) unobootstrapprotector \
- ) $(ARGS)
+ ) \
+$(if $(VCL),\
+	--protector $(call gb_Library_get_target,vclbootstrapprotector) vclbootstrapprotector \
+ ) \
+$(ARGS)
 endef
 
 .PHONY : $(call gb_CppunitTest_get_clean_target,%)
@@ -115,6 +119,7 @@ $(call gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(
 $(call gb_CppunitTest_get_target,$(1)) : ARGS :=
 $(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS :=
 $(call gb_CppunitTest_get_target,$(1)) : URE := $(false)
+$(call gb_CppunitTest_get_target,$(1)) : VCL := $(false)
 $(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES :=
 $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES :=
 $(call gb_CppunitTest_get_target,$(1)) : HEADLESS := --headless
@@ -142,6 +147,12 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,unoexcepti
 
 endef
 
+define gb_CppunitTest_use_vcl
+$(call gb_CppunitTest_get_target,$(1)) : VCL := $(true)
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,vclbootstrapprotector)
+
+endef
+
 define gb_CppunitTest__use_api
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2))
 $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES += $(call gb_UnoApi_get_target,$(2))
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 32b6b56..2130a22 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,starmath_qa_cppunit))
+$(eval $(call gb_CppunitTest_use_vcl,starmath_qa_cppunit))
 
 $(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\
     configmgr/source/configmgr \
diff --git a/svgio/CppunitTest_svgio.mk b/svgio/CppunitTest_svgio.mk
index 7fe8370..6c1380c 100644
--- a/svgio/CppunitTest_svgio.mk
+++ b/svgio/CppunitTest_svgio.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,svgio_import_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,svgio_import_test))
+$(eval $(call gb_CppunitTest_use_vcl,svgio_import_test))
 
 $(eval $(call gb_CppunitTest_use_components,svgio_import_test,\
     configmgr/source/configmgr \
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index c5fd73c..c7805b4 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_filters_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_filters_test))
+$(eval $(call gb_CppunitTest_use_vcl,sw_filters_test))
 
 $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
 	basic/util/sb \
diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index ad79cfd..59afe0a 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_htmlexport,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_htmlexport))
+$(eval $(call gb_CppunitTest_use_vcl,sw_htmlexport))
 
 $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\
 	basic/util/sb \
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index a33fe67..e83100d 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_macros_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_macros_test))
+$(eval $(call gb_CppunitTest_use_vcl,sw_macros_test))
 
 $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\
 	basic/util/sb \
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index 2c0e19a..080a840 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_odfexport,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_odfexport))
+$(eval $(call gb_CppunitTest_use_vcl,sw_odfexport))
 
 $(eval $(call gb_CppunitTest_use_components,sw_odfexport,\
     basic/util/sb \
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index 95e452d..57086ef 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_odfimport,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_odfimport))
+$(eval $(call gb_CppunitTest_use_vcl,sw_odfimport))
 
 $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\
 	basic/util/sb \
diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk
index f60da29..369f1ae 100644
--- a/sw/CppunitTest_sw_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_ooxmlexport.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ooxmlexport,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlexport))
+$(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlexport))
 
 $(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport,\
 	$(sw_ooxmlexport_components) \
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index 2c4682b..7eff1bc 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ooxmlimport,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlimport))
+$(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlimport))
 
 $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\
 	basic/util/sb \
diff --git a/sw/CppunitTest_sw_ooxmlsdrexport.mk b/sw/CppunitTest_sw_ooxmlsdrexport.mk
index 97b17b4..4907b2f 100644
--- a/sw/CppunitTest_sw_ooxmlsdrexport.mk
+++ b/sw/CppunitTest_sw_ooxmlsdrexport.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ooxmlsdrexport,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlsdrexport))
+$(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlsdrexport))
 
 $(eval $(call gb_CppunitTest_use_components,sw_ooxmlsdrexport,\
 	$(sw_ooxmlexport_components) \
diff --git a/sw/CppunitTest_sw_ooxmlw14export.mk b/sw/CppunitTest_sw_ooxmlw14export.mk
index 9867670..10583ec 100644
--- a/sw/CppunitTest_sw_ooxmlw14export.mk
+++ b/sw/CppunitTest_sw_ooxmlw14export.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ooxmlw14export,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlw14export))
+$(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlw14export))
 
 $(eval $(call gb_CppunitTest_use_components,sw_ooxmlw14export,\
 	$(sw_ooxmlexport_components) \
diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk
index 9c5e175..fc692d7 100644
--- a/sw/CppunitTest_sw_rtfexport.mk
+++ b/sw/CppunitTest_sw_rtfexport.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_rtfexport,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_rtfexport))
+$(eval $(call gb_CppunitTest_use_vcl,sw_rtfexport))
 
 $(eval $(call gb_CppunitTest_use_components,sw_rtfexport,\
 	basic/util/sb \
diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk
index 772c5eb..049e1a1 100644
--- a/sw/CppunitTest_sw_rtfimport.mk
+++ b/sw/CppunitTest_sw_rtfimport.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_rtfimport,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_rtfimport))
+$(eval $(call gb_CppunitTest_use_vcl,sw_rtfimport))
 
 $(eval $(call gb_CppunitTest_use_components,sw_rtfimport,\
 	basic/util/sb \
diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk
index 2592543..7bfa0ea 100644
--- a/sw/CppunitTest_sw_uiwriter.mk
+++ b/sw/CppunitTest_sw_uiwriter.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_uiwriter,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_uiwriter))
+$(eval $(call gb_CppunitTest_use_vcl,sw_uiwriter))
 
 $(eval $(call gb_CppunitTest_use_components,sw_uiwriter,\
     basic/util/sb \
diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk
index 9c43d3d..495d088 100644
--- a/sw/CppunitTest_sw_uwriter.mk
+++ b/sw/CppunitTest_sw_uwriter.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_uwriter,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_uwriter))
+$(eval $(call gb_CppunitTest_use_vcl,sw_uwriter))
 
 $(eval $(call gb_CppunitTest_use_components,sw_uwriter,\
     comphelper/util/comphelp \
diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
index 37e9170..6a66102 100644
--- a/sw/CppunitTest_sw_ww8export.mk
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ww8export,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_ww8export))
+$(eval $(call gb_CppunitTest_use_vcl,sw_ww8export))
 
 $(eval $(call gb_CppunitTest_use_components,sw_ww8export,\
     basic/util/sb \
diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
index d2282f5..b916cef 100644
--- a/sw/CppunitTest_sw_ww8import.mk
+++ b/sw/CppunitTest_sw_ww8import.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ww8import,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,sw_ww8import))
+$(eval $(call gb_CppunitTest_use_vcl,sw_ww8import))
 
 $(eval $(call gb_CppunitTest_use_components,sw_ww8import,\
 	basic/util/sb \
diff --git a/test/Module_test.mk b/test/Module_test.mk
index 905d66b..7482d28 100644
--- a/test/Module_test.mk
+++ b/test/Module_test.mk
@@ -14,6 +14,7 @@ ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,test,\
     Library_test \
     Library_subsequenttest \
+    Library_vclbootstrapprotector \
     Package_unittest \
 ))
 
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index e8dcfa8..110e0a5 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -60,21 +60,6 @@ extern "C"
 void test_init_impl(bool bAssertOnDialog, bool bNeedUCB,
         lang::XMultiServiceFactory * pSFactory)
 {
-    // force locale (and resource files loaded) to en-US
-    OUString aLangISO( "en-US" );
-    ResMgr::SetDefaultLocale( LanguageTag( aLangISO) );
-
-    SvtSysLocaleOptions aLocalOptions;
-    aLocalOptions.SetLocaleConfigString( aLangISO );
-    aLocalOptions.SetUILocaleConfigString( aLangISO );
-
-    MsLangId::setConfiguredSystemUILanguage(LANGUAGE_ENGLISH_US);
-    LanguageTag::setConfiguredSystemLanguage(LANGUAGE_ENGLISH_US);
-
-    InitVCL();
-    if (Application::IsHeadlessModeRequested())
-        Application::EnableHeadlessMode(true);
-
     if (bAssertOnDialog)
         ErrorHandler::RegisterDisplay( aBasicErrorFunc );
 
@@ -102,6 +87,22 @@ SAL_DLLPUBLIC_EXPORT void test_init(lang::XMultiServiceFactory *pFactory)
     try
     {
         ::comphelper::setProcessServiceFactory(pFactory);
+
+        // force locale (and resource files loaded) to en-US
+        OUString aLangISO( "en-US" );
+        ResMgr::SetDefaultLocale( LanguageTag( aLangISO) );
+
+        SvtSysLocaleOptions aLocalOptions;
+        aLocalOptions.SetLocaleConfigString( aLangISO );
+        aLocalOptions.SetUILocaleConfigString( aLangISO );
+
+        MsLangId::setConfiguredSystemUILanguage(LANGUAGE_ENGLISH_US);
+        LanguageTag::setConfiguredSystemLanguage(LANGUAGE_ENGLISH_US);
+
+        InitVCL();
+        if (Application::IsHeadlessModeRequested())
+            Application::EnableHeadlessMode(true);
+
         test_init_impl(false, true, pFactory);
     }
     catch (...) { abort(); }
diff --git a/vcl/CppunitTest_vcl_complextext.mk b/vcl/CppunitTest_vcl_complextext.mk
index dd85f12..60011a5 100644
--- a/vcl/CppunitTest_vcl_complextext.mk
+++ b/vcl/CppunitTest_vcl_complextext.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_CppunitTest_use_api,vcl_complextext,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_complextext))
+$(eval $(call gb_CppunitTest_use_vcl,vcl_complextext))
 
 $(eval $(call gb_CppunitTest_use_components,vcl_complextext,\
 	configmgr/source/configmgr \
diff --git a/vcl/CppunitTest_vcl_filters_test.mk b/vcl/CppunitTest_vcl_filters_test.mk
index 6edcff2..53122b1 100644
--- a/vcl/CppunitTest_vcl_filters_test.mk
+++ b/vcl/CppunitTest_vcl_filters_test.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_CppunitTest_use_api,vcl_filters_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_filters_test))
+$(eval $(call gb_CppunitTest_use_vcl,vcl_filters_test))
 
 $(eval $(call gb_CppunitTest_use_components,vcl_filters_test,\
     configmgr/source/configmgr \
diff --git a/vcl/CppunitTest_vcl_wmf_test.mk b/vcl/CppunitTest_vcl_wmf_test.mk
index f7272c9..5fb4e72 100644
--- a/vcl/CppunitTest_vcl_wmf_test.mk
+++ b/vcl/CppunitTest_vcl_wmf_test.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_api,vcl_wmf_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,vcl_wmf_test))
+$(eval $(call gb_CppunitTest_use_vcl,vcl_wmf_test))
 
 $(eval $(call gb_CppunitTest_use_components,vcl_wmf_test,\
     configmgr/source/configmgr \
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 21e6c54..b505ad6 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -337,6 +337,8 @@ struct ImplSVData
     ::vcl::SettingsConfigItem*          mpSettingsConfigItem;
     std::list< vcl::DeleteOnDeinitBase* >*   mpDeinitDeleteList;
     boost::unordered_map< int, OUString >*     mpPaperNames;
+
+    Link maDeInitHook;
 };
 
 void        ImplInitSVData();
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index b27b9c3..50cda48 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -68,6 +68,7 @@
 #include "comphelper/solarmutex.hxx"
 #include "osl/process.h"
 
+#include <cassert>
 #include <utility>
 
 using namespace ::com::sun::star;
@@ -1654,6 +1655,15 @@ Application::createFolderPicker( const Reference< uno::XComponentContext >& xSM
     return pSVData->mpDefInst->createFolderPicker( xSM );
 }
 
+void Application::setDeInitHook(Link const & hook) {
+    ImplSVData * pSVData = ImplGetSVData();
+    assert(!pSVData->maDeInitHook.IsSet());
+    pSVData->maDeInitHook = hook;
+    // Fake this for VCLXToolkit ctor instantiated from
+    // postprocess/CppunitTest_services.mk:
+    pSVData->maAppData.mbInAppMain = true;
+}
+
 // helper method to allow inline constructor even for pWindow!=NULL case
 void ImplDelData::AttachToWindow( const Window* pWindow )
 {
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 25c8f99..0acb009 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <cassert>
+
 #include "rtl/logfile.hxx"
 
 #include <osl/file.hxx>
@@ -464,13 +468,20 @@ void DeInitVCL()
         }
     }
 
-    if( pSVData->mpApp )
+    if( pSVData->mpApp || pSVData->maDeInitHook.IsSet() )
     {
         sal_uLong nCount = Application::ReleaseSolarMutex();
         // call deinit to deinitialize application class
         // soffice/sfx implementation disposes the global service manager
         // Warning: After this call you can't call uno services
-        pSVData->mpApp->DeInit();
+        if( pSVData->mpApp )
+        {
+            pSVData->mpApp->DeInit();
+        }
+        if( pSVData->maDeInitHook.IsSet() )
+        {
+            pSVData->maDeInitHook.Call(0);
+        }
         Application::AcquireSolarMutex(nCount);
     }
 
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index 7bec367..bb19800 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_use_api,writerfilter_rtftok,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,writerfilter_rtftok))
+$(eval $(call gb_CppunitTest_use_vcl,writerfilter_rtftok))
 
 $(eval $(call gb_CppunitTest_use_components,writerfilter_rtftok,\
 	configmgr/source/configmgr \
diff --git a/writerperfect/CppunitTest_writerperfect_calc.mk b/writerperfect/CppunitTest_writerperfect_calc.mk
index 1a05595..462871f 100644
--- a/writerperfect/CppunitTest_writerperfect_calc.mk
+++ b/writerperfect/CppunitTest_writerperfect_calc.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_calc,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,writerperfect_calc))
+$(eval $(call gb_CppunitTest_use_vcl,writerperfect_calc))
 
 $(eval $(call gb_CppunitTest_use_rdb,writerperfect_calc,services))
 
diff --git a/writerperfect/CppunitTest_writerperfect_draw.mk b/writerperfect/CppunitTest_writerperfect_draw.mk
index de02284..fac4476 100644
--- a/writerperfect/CppunitTest_writerperfect_draw.mk
+++ b/writerperfect/CppunitTest_writerperfect_draw.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_draw,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,writerperfect_draw))
+$(eval $(call gb_CppunitTest_use_vcl,writerperfect_draw))
 
 $(eval $(call gb_CppunitTest_use_rdb,writerperfect_draw,services))
 
diff --git a/writerperfect/CppunitTest_writerperfect_impress.mk b/writerperfect/CppunitTest_writerperfect_impress.mk
index bc361f7..4da810c 100644
--- a/writerperfect/CppunitTest_writerperfect_impress.mk
+++ b/writerperfect/CppunitTest_writerperfect_impress.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_impress,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,writerperfect_impress))
+$(eval $(call gb_CppunitTest_use_vcl,writerperfect_impress))
 
 $(eval $(call gb_CppunitTest_use_rdb,writerperfect_impress,services))
 
diff --git a/writerperfect/CppunitTest_writerperfect_stream.mk b/writerperfect/CppunitTest_writerperfect_stream.mk
index ad943e0..337d6f1 100644
--- a/writerperfect/CppunitTest_writerperfect_stream.mk
+++ b/writerperfect/CppunitTest_writerperfect_stream.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_use_api,writerperfect_stream,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,writerperfect_stream))
+$(eval $(call gb_CppunitTest_use_vcl,writerperfect_stream))
 
 $(eval $(call gb_CppunitTest_use_externals,writerperfect_stream,\
 	boost_headers \
diff --git a/xmloff/CppunitTest_xmloff_uxmloff.mk b/xmloff/CppunitTest_xmloff_uxmloff.mk
index 41fed90..1fa4ca4 100644
--- a/xmloff/CppunitTest_xmloff_uxmloff.mk
+++ b/xmloff/CppunitTest_xmloff_uxmloff.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_api,xmloff_uxmloff,\
 ))
 
 $(eval $(call gb_CppunitTest_use_ure,xmloff_uxmloff))
+$(eval $(call gb_CppunitTest_use_vcl,xmloff_uxmloff))
 
 $(eval $(call gb_CppunitTest_use_library_objects,xmloff_uxmloff,xo))
 
commit 9e13afeaf67b9c07762692cd858de4b577234ab7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 3 14:49:55 2014 +0200

    Cover ctors/dtors of our TestFixtures under the protectors, too
    
    Change-Id: I4c3030e5a205bd102d0427e74d2fe3b828ff5ae6

diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 0c5a2a1..9c58b27 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -217,8 +217,6 @@ public:
             return false;
         }
 #endif
-        CppUnit::TestRunner runner;
-        runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
 
         CppUnit::TestResultCollector collector;
         result.addListener(&collector);
@@ -238,7 +236,12 @@ public:
         for (size_t i = 0; i < protectors.size(); ++i)
             result.pushProtector(protectors[i]);
 
-        runner.run(result);
+        {
+            CppUnit::TestRunner runner;
+            runner.addTest(
+                CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+            runner.run(result);
+        }
 
         for (size_t i = 0; i < protectors.size(); ++i)
             result.popProtector();
@@ -310,6 +313,8 @@ SAL_IMPLEMENT_MAIN() {
             fn = (oslGenericFunction) unoexceptionprotector;
         else if (sym == "unobootstrapprotector")
             fn = (oslGenericFunction) unobootstrapprotector;
+        else if (sym == "vclbootstrapprotector")
+            fn = (oslGenericFunction) vclbootstrapprotector;
         else
         {
             std::cerr
commit 127bfe4afedabd729832c05cbe0232e76cf15863
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 3 11:42:30 2014 +0200

    Include gdb backtrace in PythonTest done.long (just as for CppunitTest)
    
    Change-Id: Idc671a4af5474443130afed2dd6f0728c1504319

diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index c0a1f2f..ce5f5ed 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -33,8 +33,6 @@ $(call gb_PythonTest_get_clean_target,%) :
 
 ifneq ($(DISABLE_PYTHON),TRUE)
 
-# pass a hard-coded 139 to the gdb postprocess script to match soffice.bin
-# signal exit values (assumption: non-0 exit value here means it crashed)
 .PHONY : $(call gb_PythonTest_get_target,%)
 $(call gb_PythonTest_get_target,%) :| $(gb_PythonTest_DEPS)
 	$(call gb_Output_announce,$*,$(true),PYT,2)
@@ -58,10 +56,10 @@ $(call gb_PythonTest_get_target,%) :| $(gb_PythonTest_DEPS)
 			$(MODULES) \
 		$(if $(gb_CppunitTest__interactive),, \
 			> $@.log 2>&1 \
-			|| (cat $@.log \
-				$(if $(value gb_CppunitTest_postprocess), \
-					&& $(call gb_CppunitTest_postprocess,$(gb_PythonTest_EXECUTABLE_GDB),$@.core,139)) \
-				&& $(SRCDIR)/solenv/bin/unittest-failed.sh Python $*))))
+			|| ($(if $(value gb_CppunitTest_postprocess), \
+					RET=$$?; \
+					$(call gb_CppunitTest_postprocess,$(gb_PythonTest_EXECUTABLE_GDB),$@.core,$$RET) >> $@.log 2>&1;) \
+				cat $@.log; $(SRCDIR)/solenv/bin/unittest-failed.sh Python $*))))
 
 # always use udkapi and URE services
 define gb_PythonTest_PythonTest
commit 982820640865addb921e32b26d9aae3c3b3a10d7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 3 09:34:53 2014 +0200

    Demystify magic ponies
    
    Change-Id: I7e619daf8743d3471ece72d81f6cf1bb61741646

diff --git a/pyuno/qa/pytests/insertremovecells.py b/pyuno/qa/pytests/insertremovecells.py
index 4ce2707..0c9626c 100644
--- a/pyuno/qa/pytests/insertremovecells.py
+++ b/pyuno/qa/pytests/insertremovecells.py
@@ -14,7 +14,7 @@ class InsertRemoveCells(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.xContext = pyuno.getComponentContext()
-        pyuno.experimentalExtraMagic()
+        pyuno.private_initTestEnvironment()
 
 
     # no need for a tearDown(cls) method.
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index eeb039a..23800ee 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -319,7 +319,7 @@ static PyObject* getComponentContext(
     return ret.getAcquired();
 }
 
-static PyObject* initPoniesMode(
+static PyObject* initTestEnvironment(
     SAL_UNUSED_PARAMETER PyObject*, SAL_UNUSED_PARAMETER PyObject*)
 {
     // this tries to bootstrap enough of the soffice from python to run
@@ -841,7 +841,7 @@ static PyObject *setCurrentContext(
 
 struct PyMethodDef PyUNOModule_methods [] =
 {
-    {"experimentalExtraMagic", initPoniesMode, METH_VARARGS, NULL},
+    {"private_initTestEnvironment", initTestEnvironment, METH_VARARGS, NULL},
     {"getComponentContext", getComponentContext, METH_VARARGS, NULL},
     {"_createUnoStructHelper", reinterpret_cast<PyCFunction>(createUnoStructHelper), METH_VARARGS | METH_KEYWORDS, NULL},
     {"getTypeByName", getTypeByName, METH_VARARGS, NULL},
diff --git a/unotest/source/python/org/libreoffice/unotest.py b/unotest/source/python/org/libreoffice/unotest.py
index 3da77ff..6a7f814 100644
--- a/unotest/source/python/org/libreoffice/unotest.py
+++ b/unotest/source/python/org/libreoffice/unotest.py
@@ -175,7 +175,7 @@ class UnoInProcess:
         return self.xDoc
     def setUp(self):
         self.xContext = pyuno.getComponentContext()
-        pyuno.experimentalExtraMagic()
+        pyuno.private_initTestEnvironment()
     def openEmptyWriterDoc(self):
         assert(self.xContext)
         smgr = self.getContext().ServiceManager
