Kaydet (Commit) 94f8754f authored tarafından Michael Meeks's avatar Michael Meeks

tdf#91381 - fix a couple of animation related lifecycle issues.

Change-Id: I4aada7f27e3a88124ad670e62ddb6c92ecf431a8
üst 07f872d4
...@@ -1752,7 +1752,8 @@ void CustomAnimationPane::onChange( bool bCreate ) ...@@ -1752,7 +1752,8 @@ void CustomAnimationPane::onChange( bool bCreate )
} }
} }
VclPtrInstance< CustomAnimationCreateDialog > pDlg( this, this, aTargets, bHasText, sPresetId, fDuration ); {
ScopedVclPtrInstance< CustomAnimationCreateDialog > pDlg( this, this, aTargets, bHasText, sPresetId, fDuration );
if( pDlg->Execute() ) if( pDlg->Execute() )
{ {
addUndo(); addUndo();
...@@ -1788,11 +1789,9 @@ void CustomAnimationPane::onChange( bool bCreate ) ...@@ -1788,11 +1789,9 @@ void CustomAnimationPane::onChange( bool bCreate )
pCreated->setNodeType( EffectNodeType::WITH_PREVIOUS ); pCreated->setNodeType( EffectNodeType::WITH_PREVIOUS );
if( pCreated.get() ) if( pCreated.get() )
{
mpCustomAnimationList->select( pCreated ); mpCustomAnimationList->select( pCreated );
} }
} }
}
else else
{ {
MainSequenceRebuildGuard aGuard( mpMainSequence ); MainSequenceRebuildGuard aGuard( mpMainSequence );
...@@ -1820,8 +1819,7 @@ void CustomAnimationPane::onChange( bool bCreate ) ...@@ -1820,8 +1819,7 @@ void CustomAnimationPane::onChange( bool bCreate )
} }
mrBase.GetDocShell()->SetModified(); mrBase.GetDocShell()->SetModified();
} }
} // dispose pDlg
pDlg.reset();
updateControls(); updateControls();
......
...@@ -1729,6 +1729,9 @@ Size SfxDockingWindow::GetMinOutputSizePixel() const ...@@ -1729,6 +1729,9 @@ Size SfxDockingWindow::GetMinOutputSizePixel() const
bool SfxDockingWindow::Notify( NotifyEvent& rEvt ) bool SfxDockingWindow::Notify( NotifyEvent& rEvt )
{ {
if ( !pImp )
return DockingWindow::Notify( rEvt );
if ( rEvt.GetType() == MouseNotifyEvent::GETFOCUS ) if ( rEvt.GetType() == MouseNotifyEvent::GETFOCUS )
{ {
if (pMgr != NULL) if (pMgr != NULL)
......
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