diff options
| author | Ras-al-Ghul <dipankar1995@gmail.com> | 2016-01-07 20:53:50 +0530 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2016-01-08 13:49:08 +0000 |
| commit | 8680813aa476eba172f078efddfd21ea99218cd8 (patch) | |
| tree | 2778f415885698be83027b3451260055fa2b5214 | |
| parent | 08f0ef29e7acc824e6cef508edf1a3e2201b0892 (diff) | |
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@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
| -rw-r--r-- | vcl/source/window/dialog.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 523eee956593..066ac9739ac7 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; } |