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

15 files changed, 15 insertions, 0 deletions

diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index c5fd73cf0f42..c7805b413660 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 ad79cfdf7db0..59afe0aa1589 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 a33fe67837ea..e83100d6ef9c 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 2c0e19a3b429..080a840aa8ff 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 95e452df8d74..57086ef34875 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 f60da29021f9..369f1ae99ea4 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 2c4682bc2252..7eff1bc68ea3 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 97b17b4ea14a..4907b2fa0755 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 986767099d99..10583ec53c86 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 9c5e175cc830..fc692d76a0f4 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 772c5eb1e560..049e1a13cc37 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 25925434f143..7bfa0eaff9c9 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 9c43d3dace5c..495d0887b530 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 37e9170bede3..6a661028cad5 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 d2282f5dd298..b916cefeff20 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 \