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

[Caolán McNamara]

 sd/source/ui/app/sdxfer.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d49eabcc56677553a6d5d9fe7cecc5a5eee1f9b6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 16 11:11:54 2014 +0100

    ensure UserData dtors are done while SolarMutex is locked
    
    otherwise I can't even reorder two slides in the slide pane with
    dbgutil enabled without a SolarMutex assert in RemoveListener
    
    (and we have two SolarMutexes here for some reason, one should be enough)
    
    Change-Id: If224568f1b90d62c17bde65a896534aa10f8a661

diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 3d89c61..e967d18 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -118,8 +118,6 @@ SdTransferable::~SdTransferable()
     if( mpSdView )
         EndListening( *const_cast< sd::View *>( mpSdView) );
 
-    SolarMutexGuard aSolarGuard;
-
     ObjectReleased();
 
     if( mbOwnView )
@@ -146,6 +144,8 @@ SdTransferable::~SdTransferable()
     delete mpVDev;
     delete mpObjDesc;
 
+    //call explicitly at end of dtor to be covered by above SolarMutex
+    maUserData.clear();
 }
 
 void SdTransferable::CreateObjectReplacement( SdrObject* pObj )