diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-22 18:14:59 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-22 18:19:35 +0200 |
| commit | e41cb9684784bc65733995c1e486b62b647d980c (patch) | |
| tree | cc492fab2f806cde8fe2539153929821356ceae8 /vcl | |
| parent | 6da7ccfc2ac3382c896a679b98061fce4a6d6cf2 (diff) | |
uitest: we also need a SolarMutex when deleting the wrapper object
The wrapper has references to vcl objects and the destructor might have
the last reference to a vcl::Window causing a delete. Avoid potential
problems (I have seen one deadlock in the chart wizard code) by taking
the SolarMutex.
Change-Id: I8afcf79842b2f8e8f822b975629d5c8e18a86163
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/uitest/uno/uiobject_uno.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx index 7c6ca8398b90..6506c058fd6f 100644 --- a/vcl/source/uitest/uno/uiobject_uno.cxx +++ b/vcl/source/uitest/uno/uiobject_uno.cxx @@ -20,6 +20,8 @@ UIObjectUnoObj::UIObjectUnoObj(std::unique_ptr<UIObject> pObj): UIObjectUnoObj::~UIObjectUnoObj() { + SolarMutexGuard aGuard; + mpObj.reset(); } css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UIObjectUnoObj::getChild(const OUString& rID) |