vcl/source/window/dialog.cxx | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
New commits: commit 9a562c6f8075d55b92150ae70a595da69ab9fac8 Author: Ras-al-Ghul <[email protected]> Date: Sun Jan 10 03:59:15 2016 +0530 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 <[email protected]> Reviewed-by: Michael Meeks <[email protected]> Tested-by: Michael Meeks <[email protected]> diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 066ac97..e8d8d47 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(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
