diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-12 12:18:59 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-12 12:29:23 +0200 |
| commit | c4444ea0c412d580a9ff0423bd9fa4d8b535490b (patch) | |
| tree | e38aedf452044706c56fc203722602a73f27c4f2 /postprocess | |
| parent | 551c915dcbf3e1d6bfd799c6e13e5700e2c3e535 (diff) | |
Avoid Solar Mutex deadlocks when disposing services
...as test code using gb_CppunitTest_use_vcl is implicitly run with Solar Mutex locked
Change-Id: I480b4bcce7c6a94922019679099b0883b3ee1030
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CppunitTest_services.mk | 1 | ||||
| -rw-r--r-- | postprocess/qa/services.cxx | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/postprocess/CppunitTest_services.mk b/postprocess/CppunitTest_services.mk index bdcae7bbe0c6..08c860e16412 100644 --- a/postprocess/CppunitTest_services.mk +++ b/postprocess/CppunitTest_services.mk @@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,services, \ cppu \ sal \ test \ + vcl \ $(gb_UWINAPI) \ )) diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx index 2d29e918a420..a7052c1180fe 100644 --- a/postprocess/qa/services.cxx +++ b/postprocess/qa/services.cxx @@ -16,6 +16,7 @@ #include <com/sun/star/reflection/XServiceConstructorDescription.hpp> #include <com/sun/star/reflection/XServiceTypeDescription2.hpp> #include <test/bootstrapfixture.hxx> +#include <vcl/svapp.hxx> using namespace css::container; using namespace css::reflection; @@ -87,6 +88,7 @@ void ServicesTest::test() } } } + SolarMutexReleaser rel; for (std::vector< css::uno::Reference<css::lang::XComponent> >::iterator i( comps.begin()); i != comps.end(); ++i) |