[Libreoffice-commits] core.git: vcl/source
Ras-al-Ghul
dipankar1995 at gmail.com
Fri Jan 8 05:49:53 PST 2016
vcl/source/window/dndevdis.cxx | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit f2f1f52d8b84ac088496a4964d799bb84007fc45
Author: Ras-al-Ghul <dipankar1995 at gmail.com>
Date: Thu Jan 7 20:37:53 2016 +0530
tdf#96888 Kill internal vcl dog-tags ...
Did a small change to dndevis.cxx file. Patch No. 1
Change-Id: I9240d97a9b0dd76a2df43e01f0d1e71de9015c48
Reviewed-on: https://gerrit.libreoffice.org/21211
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx
index 050b749..20476e3 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.cxx
@@ -413,8 +413,7 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( vcl::Window *pWindow,
Reference< XDropTarget > xDropTarget = pWindow->GetDropTarget();
// window may be destroyed in drop event handler
- ImplDelData aDelData;
- pWindow->ImplAddDel( &aDelData );
+ VclPtr<vcl::Window> xWindow = pWindow;
if( xDropTarget.is() )
{
@@ -426,9 +425,8 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( vcl::Window *pWindow,
xContext, nDropAction, relLoc.X(), relLoc.Y(), nSourceActions, xTransferable );
}
- if ( !aDelData.IsDead() )
+ if ( xWindow->IsDisposed() )
{
- pWindow->ImplRemoveDel( &aDelData );
// release UI lock
pWindow->DecrementLockCount();
}
More information about the Libreoffice-commits
mailing list