summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPranav Kant <pranav913@gmail.com>2015-03-24 04:17:58 +0530
committerNoel Grandin <noelgrandin@gmail.com>2015-03-24 06:28:27 +0000
commitb15b97ee6b21be18d4ba5df396d39b6d3dab57e1 (patch)
treec55a3480bdc967a084765b5745fdffffbc069f57
parentd7a4135b072a693cb5ebf94c250d34d5beb741e3 (diff)
tdf#88230: Cleanup solar mutex yielding
Fallout from 9bb8ba4e0640521253e2f5a4d476cad7777da079 Change-Id: I84fab3d8f12015b5d5a4f93ea0164bc964de17bd Reviewed-on: https://gerrit.libreoffice.org/14973 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
-rw-r--r--sw/source/core/view/viewsh.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index b42032362ab5..59ee3b0e0957 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1865,11 +1865,12 @@ void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, MLOD
sleep(1);
}
- // Creation, use and destruction of a VirtualDevice needs to be
- // protected by the SolarMutex, it seems.
- Application::AcquireSolarMutex(1);
if (pViewShell)
{
+ // Creation, use and destruction of a VirtualDevice needs to be
+ // protected by the SolarMutex, it seems.
+ SolarMutexReleaser aReleaser;
+
SystemGraphicsData aData;
aData.rCGContext = (CGContextRef) context;
// the Size argument is irrelevant, I hope
@@ -1877,7 +1878,7 @@ void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, MLOD
// paint to it
pViewShell->PaintTile(aDevice, contextWidth, contextHeight, tilePosX, tilePosY, tileWidth, tileHeight);
}
- Application::ReleaseSolarMutex();
+
SAL_INFO("sw.tiled", "touch_lo_draw_tile(" << contextWidth << "x" << contextHeight << ", (" << tileDpxPosition.x << "," << tileDpxPosition.y << "), " << tileDpxSize.width << "x" << tileDpxSize.height << ") return");
#else
(void) context;