diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-10-16 11:11:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-16 11:16:41 +0100 |
| commit | d49eabcc56677553a6d5d9fe7cecc5a5eee1f9b6 (patch) | |
| tree | d847c1de006132d22a000accc44260f548a55297 /sd | |
| parent | 3a6987beaf85876e1061d553cdc134d40c54597e (diff) | |
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
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/app/sdxfer.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 3d89c61be836..e967d188d3c4 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 ) |