diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-24 09:37:46 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-24 09:39:59 +0100 |
commit | f2edd09bf3ab4f705818a9d7bae58a72e78f102c (patch) | |
tree | 218804ac4441251ae65ffe158eb79d6f148a89db | |
parent | 829fa56634414c55a50cda9a74a2683e3e5b822a (diff) |
tdf#88230 Blind fix for IOS-only code
...broken with c6c4d21847ef18ae7378e1a5a329000ea6547d18 "tdf#88230: Remove bogus
AcquireSolarMutex fpicker wrapper" and 183f3791bad09cf95c2eee6e7bb043d7b00546a0
"Reverts and correct 'tdf#88230: Cleanup solar mutex yielding'"
Change-Id: I568ea5aa0a43cadc1b6cf9f954293bf297ae489e
-rw-r--r-- | sw/source/core/view/viewsh.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index ef705c108305..1aa387977cc6 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. - SolarMutexReleaser::AcquireSolarMutex(1); if (pViewShell) { + // Creation, use and destruction of a VirtualDevice needs to be + // protected by the SolarMutex, it seems: + SolarMutexGuard g; + 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); } - SolarMutexReleaser::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; |