[Libreoffice-commits] core.git: vcl/source

[Ras-al-Ghul]

 vcl/source/window/dialog.cxx |   20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 6ac256da90d23d0b5483197543a1159fed827a41
Author: Ras-al-Ghul <dipankar1995 at gmail.com>
Date:   Thu Jan 7 21:52:26 2016 +0530

    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 at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 1793afdf5..09cb50c 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
     {