diff options
| author | Ras-al-Ghul <dipankar1995@gmail.com> | 2016-01-10 03:59:15 +0530 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2016-01-11 09:50:34 +0000 |
| commit | 9a562c6f8075d55b92150ae70a595da69ab9fac8 (patch) | |
| tree | faae22d64f12b0b74ab9e896ed86b78467b481c7 /vcl | |
| parent | da40d2558e3de30914f4c181cceb66937c6f1124 (diff) | |
tdf#96888 Kill internal vcl dog-tags ..
Added an assert statement and corrected a glaring error regarding clear() usage
Change-Id: Icc8ce940a6f97570d37389530f9fd90890ae8055
Reviewed-on: https://gerrit.libreoffice.org/21280
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 066ac9739ac7..e8d8d477b1ff 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -865,10 +865,6 @@ short Dialog::Execute() VclPtr<vcl::Window> xWindow = this; -#ifdef DBG_UTIL - 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 ( !xWindow->IsDisposed() && mbInExecute ) @@ -877,13 +873,7 @@ short Dialog::Execute() ImplEndExecuteModal(); #ifdef DBG_UTIL - if( xDialogParent ) - { - if( ! xDialogParent->IsDisposed() ) - xDialogParent.clear(); - else - OSL_FAIL( "Dialog::Execute() - Parent of dialog destroyed in Execute()" ); - } + assert (!mpDialogParent || !mpDialogParent->IsDisposed()); #endif if ( !xWindow->IsDisposed() ) xWindow.clear(); |