diff options
| author | Daniel Vogelheim <dvo@openoffice.org> | 2002-09-13 11:45:10 +0000 |
|---|---|---|
| committer | Daniel Vogelheim <dvo@openoffice.org> | 2002-09-13 11:45:10 +0000 |
| commit | 32b07fe598bbf46248f4787dc250089bbd18bad4 (patch) | |
| tree | 9fcc1f9dc045eb6d513af76fdf4361ef56ad4363 | |
| parent | be3df865ad986a75bdd708795b22970c3fdeb509 (diff) | |
#102940# move all VCL calls before the SolarMutex release point
| -rw-r--r-- | svtools/source/misc/transfer.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index c8679bce4b01..2776bd284d27 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: transfer.cxx,v $ * - * $Revision: 1.59 $ + * $Revision: 1.60 $ * - * last change: $Author: dvo $ $Date: 2002-09-11 15:05:50 $ + * last change: $Author: dvo $ $Date: 2002-09-13 12:45:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1003,22 +1003,20 @@ void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions, if( xDragSource.is() ) { - // #102940# call into VCL required SolarMutex + /* + * #96792# release mouse before actually starting DnD. + * This is necessary for the X11 DnD implementation to work. + */ + if( pWindow->IsMouseCaptured() ) + pWindow->ReleaseMouse(); + const Point aPt( pWindow->GetPointerPosPixel() ); const sal_uInt32 nRef = Application::ReleaseSolarMutex(); try { - /* - * #96792# release mouse before actually starting DnD. - * This is necessary for the X11 DnD implementation to work. - */ - if( pWindow->IsMouseCaptured() ) - pWindow->ReleaseMouse(); - DragGestureEvent aEvt; - aEvt.DragAction = DNDConstants::ACTION_COPY; aEvt.DragOriginX = aPt.X(); aEvt.DragOriginY = aPt.Y(); |