mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uitest: we also need a SolarMutex when deleting the wrapper object

Browse Source 
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
This commit is contained in:
Markus Mohrhard
2016-06-22 18:14:59 +02:00
parent 6da7ccfc2a
commit e41cb96847
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vcl/source/uitest/uno/uiobject_uno.cxx
View File

@@ -20,6 +20,8 @@ UIObjectUnoObj::UIObjectUnoObj(std::unique_ptr<UIObject> pObj):
UIObjectUnoObj::~UIObjectUnoObj() UIObjectUnoObj::~UIObjectUnoObj()
{ {
SolarMutexGuard aGuard;
mpObj.reset();
} }
css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UIObjectUnoObj::getChild(const OUString& rID) css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UIObjectUnoObj::getChild(const OUString& rID)