mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#101067 put SolarMutexGuard back in again

Browse Source 
commit 4f27ff9172
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 9f0766917a
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
This commit is contained in:
Caolán McNamara
2016-07-22 11:11:15 +01:00
parent 2263ff8550
commit fedd856894
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drawinglayer/source/primitive2d/textlayoutdevice.cxx
View File

@@ -85,6 +85,7 @@ namespace
ImpTimedRefDev::~ImpTimedRefDev() ImpTimedRefDev::~ImpTimedRefDev()
{ {
OSL_ENSURE(0L == mnUseCount, "destruction of a still used ImpTimedRefDev (!)"); OSL_ENSURE(0L == mnUseCount, "destruction of a still used ImpTimedRefDev (!)");
const SolarMutexGuard aSolarGuard;
mpVirDev.disposeAndClear(); mpVirDev.disposeAndClear();
} }