diff options
| author | Ras-al-Ghul <dipankar1995@gmail.com> | 2016-01-07 21:52:26 +0530 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2016-01-08 09:52:42 +0000 |
| commit | 6ac256da90d23d0b5483197543a1159fed827a41 (patch) | |
| tree | 2afd0a3aaea413fee5d7dcc1f65838f8968acb38 /vcl/source | |
| parent | 5821c8949e543e672cf55e29001b3e7964d070af (diff) | |
tdf#96888 Kill internal vcl dog-tags ...
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>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 1793afdf524f..09cb50c296be 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -867,34 +867,30 @@ short Dialog::Execute() if ( !ImplStartExecuteModal() ) return 0; - ImplDelData aDelData; - ImplAddDel( &aDelData ); + VclPtr<vcl::Window> xWindow = this; #ifdef DBG_UTIL - ImplDelData aParentDelData; - vcl::Window* pDialogParent = mpDialogParent; - if( pDialogParent ) - pDialogParent->ImplAddDel( &aParentDelData ); + VclPtr<vcl::Window> xDialogParent = mpDialogParent; #endif // Yield util EndDialog is called or dialog gets destroyed // (the latter should not happen, but better safe than sorry - while ( !aDelData.IsDead() && mbInExecute ) + while ( !xWindow->IsDisposed() && mbInExecute ) Application::Yield(); ImplEndExecuteModal(); #ifdef DBG_UTIL - if( pDialogParent ) + if( xDialogParent ) { - if( ! aParentDelData.IsDead() ) - pDialogParent->ImplRemoveDel( &aParentDelData ); + if( ! xDialogParent->IsDisposed() ) + xDialogParent.clear() else OSL_FAIL( "Dialog::Execute() - Parent of dialog destroyed in Execute()" ); } #endif - if ( !aDelData.IsDead() ) - ImplRemoveDel( &aDelData ); + if ( !xWindow->IsDisposed() ) + xWindow.clear(); #ifdef DBG_UTIL else { |