[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - sw/source

Tor Lillqvist tml at collabora.com
Tue Oct 29 17:03:57 CET 2013


 sw/source/core/view/viewsh.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 43846931cbd1fa569e1bd463ddd63f3f5fd59ac2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Oct 29 18:00:39 2013 +0200

    Need to acquire SolarMutex while using a VirtualDevice
    
    Change-Id: I1f3b86a45bb26d07a0b738c7c2b264dc4a4013c8

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index c4a8dd8..68ba9bb 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1782,6 +1782,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
@@ -1812,6 +1815,7 @@ void touch_lo_draw_tile(void * context, int contextWidth, int contextHeight, int
                              contextWidth,
                              contextHeight);
     }
+    Application::ReleaseSolarMutex();
 }
 #endif
 


More information about the Libreoffice-commits mailing list