mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#96888 Kill internal vcl dog-tags ...

Browse Source 
Did a small change to short Dialog::Execute() in dialog.cxx file. Patch No. 3

Change-Id: I0ce2f62caea2d0aad4ced48df30d924f87de3c40
Reviewed-on: https://gerrit.libreoffice.org/21215
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
This commit is contained in:
Ras-al-Ghul
2016-01-07 21:52:26 +05:30
committed by Michael Meeks
parent 5821c8949e
commit 6ac256da90
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vcl/source/window/dialog.cxx
View File

@@ -867,34 +867,30 @@ short Dialog::Execute()
if ( !ImplStartExecuteModal() ) if ( !ImplStartExecuteModal() )
return 0; return 0;
ImplDelData aDelData; VclPtr<vcl::Window> xWindow = this;
ImplAddDel( &aDelData );
#ifdef DBG_UTIL #ifdef DBG_UTIL
ImplDelData aParentDelData; VclPtr<vcl::Window> xDialogParent = mpDialogParent;
vcl::Window* pDialogParent = mpDialogParent;
if( pDialogParent )
pDialogParent->ImplAddDel( &aParentDelData );
#endif #endif
// Yield util EndDialog is called or dialog gets destroyed // Yield util EndDialog is called or dialog gets destroyed
// (the latter should not happen, but better safe than sorry // (the latter should not happen, but better safe than sorry
while ( !aDelData.IsDead() && mbInExecute ) while ( !xWindow->IsDisposed() && mbInExecute )
Application::Yield(); Application::Yield();
ImplEndExecuteModal(); ImplEndExecuteModal();
#ifdef DBG_UTIL #ifdef DBG_UTIL
if( pDialogParent ) if( xDialogParent )
{ {
if( ! aParentDelData.IsDead() ) if( ! xDialogParent->IsDisposed() )
pDialogParent->ImplRemoveDel( &aParentDelData ); xDialogParent.clear()
else else
OSL_FAIL( "Dialog::Execute() - Parent of dialog destroyed in Execute()" ); OSL_FAIL( "Dialog::Execute() - Parent of dialog destroyed in Execute()" );
} }
#endif #endif
if ( !aDelData.IsDead() ) if ( !xWindow->IsDisposed() )
ImplRemoveDel( &aDelData ); xWindow.clear();
#ifdef DBG_UTIL #ifdef DBG_UTIL
else else
{ {