diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-22 11:11:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-22 11:55:36 +0100 |
| commit | fedd856894f3c9ae5a6c4afb58c43922e3e7dbeb (patch) | |
| tree | 7d15f508f0e73e0ac6bae8c57c9555fbabed02de | |
| parent | 2263ff8550a896312d2eae16e0b1b2e9b0d6c884 (diff) | |
Resolves: tdf#101067 put SolarMutexGuard back in again
commit 4f27ff917237be96eec897d4af90a3379be904c6
Author: Tor Lillqvist <tml@iki.fi>
Date: Mon Jul 29 18:24:23 2013 +0300
Avoid SolarMutex assertion in a dbgutil build when exiting Impress
put in a SolarMutex in that ImpTimedRefDev dtor for what sounds like
just this problem
commit 9f0766917a4fb1bc8fe1786c3b46132dd63c1c66
Author: Armin Le Grand <Armin.Le.Grand@cib.de>
Date: Fri Jul 1 14:40:00 2016 +0200
tdf#50613 add support to load charts asynchronously
took it out again, to presumably move it into TextLayouterDevice
but we destroy this thing asyncronously outside of TextLayouterDevice
so lets put it back in again
Change-Id: If801a701701a3d87fce2f76bc22bb3184b46743a
| -rw-r--r-- | drawinglayer/source/primitive2d/textlayoutdevice.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index a7eb74947faa..22290230ec81 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -85,6 +85,7 @@ namespace ImpTimedRefDev::~ImpTimedRefDev() { OSL_ENSURE(0L == mnUseCount, "destruction of a still used ImpTimedRefDev (!)"); + const SolarMutexGuard aSolarGuard; mpVirDev.disposeAndClear(); } |