summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-10-29 18:00:39 +0200
committerJan Holesovsky <kendy@collabora.com>2013-11-15 16:51:55 +0100
commit745517c12eaf032580fccb06c37da186ba6487d1 (patch)
treefd11f521c4bed7bbd40c64d1ec78c185fbbab00c /sw
parent46f2b5388c1d7d1de3aa86054f28d2555634a8d9 (diff)
Need to acquire SolarMutex while using a VirtualDevice
Change-Id: I1f3b86a45bb26d07a0b738c7c2b264dc4a4013c8
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/view/viewsh.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index aff6c529a116..14bf6eb8b30c 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1780,6 +1780,9 @@ void touch_lo_draw_tile(void * context, int contextWidth, int contextHeight, int
// parameter.
SwWrtShell *pViewShell = GetActiveWrtShell();
+ // Creation, use and destruction of a VirtualDevice needs to be
+ // protected by the SolarMutex, it seems.
+ Application::AcquireSolarMutex(1);
if (pViewShell)
{
// TODO create a VirtualDevice based on SystemGraphicsData instead so
@@ -1810,6 +1813,7 @@ void touch_lo_draw_tile(void * context, int contextWidth, int contextHeight, int
contextWidth,
contextHeight);
}
+ Application::ReleaseSolarMutex();
}
#endif