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

22 files changed, 22 insertions, 0 deletions

diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk
index fc7890b5b6c3..5eb53c0a7d96 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 71fa8c60c8ac..f91f1d3bff25 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 2260beff4aed..804e4543cde9 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 e558f2d20b6e..442dcfdc7c3c 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 98ad5d24a916..1786af50ece8 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 4e2fc40c74e2..76ffe9a847c1 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 b84ba964e9af..cc4d5d166cc8 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 12532f309a9e..049becc8e4fd 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 1d4e3d167af8..ff12276e4439 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 7d95a7332325..f4ee040e13a1 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 7251d48a4243..8298b633fd69 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 90f70f51da52..4a3f1f3e0ec9 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 d83525cda338..b405008f5083 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 01adaef54a25..724d61c502ff 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 1a892fa64640..4adafd6bfd00 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 aeecc5873ba7..e319284e346a 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 6d0e33c89089..2a394b1dc64c 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 65fa468a057e..4d02d6bc79f7 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 3ad9d3b9a433..b53bb2461b81 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 0f27f7056ad4..bf9d53bfdb52 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 f5a5c4641420..60c1c22d6195 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 9b3c4988ce6f..fa5c3e9afa97 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 \