Kaydet (Commit) d49eabcc authored tarafından Caolán McNamara's avatar Caolán McNamara

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
üst 3a6987be
......@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment