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

Ras-al-Ghul dipankar1995 at gmail.com
Fri Jan 8 02:04:24 PST 2016


 vcl/source/window/dockwin.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit f78ec21a800a5598a021ae76b5b5d72f03617a54
Author: Ras-al-Ghul <dipankar1995 at gmail.com>
Date:   Fri Jan 8 01:15:54 2016 +0530

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

diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 2f0fc5b..84322a9 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<vcl::Window> xWindow = this;
     CallEventListeners( VCLEVENT_WINDOW_CLOSE );
-    if ( aDelData.IsDead() )
+    if ( xWindow->IsDisposed() )
         return false;
-    ImplRemoveDel( &aDelData );
 
     if ( mpWindowImpl->mxWindowPeer.is() && IsCreatedWithToolkit() )
         return false;


More information about the Libreoffice-commits mailing list