[Libreoffice-commits] core.git: drawinglayer/source

[Caolán McNamara]

 drawinglayer/source/primitive2d/textlayoutdevice.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit fedd856894f3c9ae5a6c4afb58c43922e3e7dbeb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 22 11:11:15 2016 +0100

    Resolves: tdf#101067 put SolarMutexGuard back in again
    
    commit 4f27ff917237be96eec897d4af90a3379be904c6
    Author: Tor Lillqvist <tml at 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 at 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

diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index a7eb749..2229023 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();
     }