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

[Ras-al-Ghul]

 vcl/source/window/dialog.cxx |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 8680813aa476eba172f078efddfd21ea99218cd8
Author: Ras-al-Ghul <dipankar1995 at gmail.com>
Date:   Thu Jan 7 20:53:50 2016 +0530

    tdf#96888 Kill internal vcl dog-tags ...
    
    Did a small change to bool Dialog::Close() in dialog.cxx file. Patch No. 2
    
    Change-Id: I5268e77bef2225308e9d01831c7b09de19c3ded9
    Reviewed-on: https://gerrit.libreoffice.org/21212
    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 523eee9..066ac97 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -728,12 +728,10 @@ void Dialog::DataChanged( const DataChangedEvent& rDCEvt )
 
 bool Dialog::Close()
 {
-    ImplDelData aDelData;
-    ImplAddDel( &aDelData );
+    VclPtr<vcl::Window> xWindow = this;
     CallEventListeners( VCLEVENT_WINDOW_CLOSE );
-    if ( aDelData.IsDead() )
+    if ( xWindow->IsDisposed() )
         return false;
-    ImplRemoveDel( &aDelData );
 
     if ( mpWindowImpl->mxWindowPeer.is() && IsCreatedWithToolkit() && !IsInExecute() )
         return false;
@@ -743,7 +741,6 @@ bool Dialog::Close()
     if ( !(GetStyle() & WB_CLOSEABLE) )
     {
         bool bRet = true;
-        ImplAddDel( &aDelData );
         PushButton* pButton = ImplGetCancelButton( this );
         if ( pButton )
             pButton->Click();
@@ -755,9 +752,8 @@ bool Dialog::Close()
             else
                 bRet = false;
         }
-        if ( aDelData.IsDead() )
+        if ( xWindow->IsDisposed() )
             return true;
-        ImplRemoveDel( &aDelData );
         return bRet;
     }