From f78ec21a800a5598a021ae76b5b5d72f03617a54 Mon Sep 17 00:00:00 2001 From: Ras-al-Ghul Date: Fri, 8 Jan 2016 01:15:54 +0530 Subject: [PATCH] tdf#96888 Kill internal vcl dog-tags ... Did some changes to dockwin.cxx file. Patch No. 15 Change-Id: Iec42df460be350ffbb5aa11a801c7dea2df7c9cd Reviewed-on: https://gerrit.libreoffice.org/21232 Reviewed-by: Michael Meeks Tested-by: Michael Meeks --- vcl/source/window/dockwin.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 2f0fc5b57d9f..84322a9df9b2 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -700,12 +700,10 @@ bool DockingWindow::PrepareToggleFloatingMode() bool DockingWindow::Close() { - ImplDelData aDelData; - ImplAddDel( &aDelData ); + VclPtr xWindow = this; CallEventListeners( VCLEVENT_WINDOW_CLOSE ); - if ( aDelData.IsDead() ) + if ( xWindow->IsDisposed() ) return false; - ImplRemoveDel( &aDelData ); if ( mpWindowImpl->mxWindowPeer.is() && IsCreatedWithToolkit() ) return false;