mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#96888 Kill internal vcl dog-tags ...

Browse Source 
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@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
This commit is contained in:
Ras-al-Ghul
2016-01-08 01:15:54 +05:30
committed by Michael Meeks
parent b1ad632c72
commit f78ec21a80
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vcl/source/window/dockwin.cxx
View File

@@ -700,12 +700,10 @@ bool DockingWindow::PrepareToggleFloatingMode()
bool DockingWindow::Close() bool DockingWindow::Close()
{ {
ImplDelData aDelData; VclPtr<vcl::Window> xWindow = this;
ImplAddDel( &aDelData );
CallEventListeners( VCLEVENT_WINDOW_CLOSE ); CallEventListeners( VCLEVENT_WINDOW_CLOSE );
if ( aDelData.IsDead() ) if ( xWindow->IsDisposed() )
return false; return false;
ImplRemoveDel( &aDelData );
if ( mpWindowImpl->mxWindowPeer.is() && IsCreatedWithToolkit() ) if ( mpWindowImpl->mxWindowPeer.is() && IsCreatedWithToolkit() )
return false; return false;