diff options
| author | Joachim Lingner <jl@openoffice.org> | 2001-08-14 12:57:51 +0000 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2001-08-14 12:57:51 +0000 |
| commit | 09da395e32bde03e48ae2bf9aa63cfaa361d0849 (patch) | |
| tree | 4ae6cdb10362f4d87219fa6f455d9ceb4564e278 /dtrans | |
| parent | 8809cc27371cff4e192e31e535cec18e5541bc78 (diff) | |
#91016# SHIFT causes ACTION_MOVE now
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/source/win32/dnd/globals.cxx | 14 | ||||
| -rw-r--r-- | dtrans/source/win32/dnd/target.cxx | 6 |
2 files changed, 12 insertions, 8 deletions
diff --git a/dtrans/source/win32/dnd/globals.cxx b/dtrans/source/win32/dnd/globals.cxx index 2374197c9383..b6e6e0c9789a 100644 --- a/dtrans/source/win32/dnd/globals.cxx +++ b/dtrans/source/win32/dnd/globals.cxx @@ -2,9 +2,9 @@ * * $RCSfile: globals.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: jl $ $Date: 2001-08-08 08:36:47 $ + * last change: $Author: jl $ $Date: 2001-08-14 13:57:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,8 @@ sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 nSourceActions) // no MK_ALT, MK_CONTROL, MK_SHIFT if( !(grfKeyState & MK_CONTROL) && !(grfKeyState & MK_ALT) && - !(grfKeyState & MK_RBUTTON) ) + !(grfKeyState & MK_RBUTTON) && + !(grfKeyState & MK_SHIFT)) { if( nSourceActions & ACTION_MOVE ) { @@ -104,6 +105,11 @@ sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 nSourceActions) else ret = 0; } + else if( grfKeyState & MK_SHIFT && + !(grfKeyState & MK_CONTROL)) + { + ret= ACTION_MOVE; + } else if ( grfKeyState & MK_CONTROL && !(grfKeyState & MK_SHIFT) ) { @@ -129,7 +135,7 @@ sal_Int8 dndOleDropEffectsToActions( DWORD dwEffect) if( dwEffect & DROPEFFECT_COPY) ret |= ACTION_COPY; if( dwEffect & DROPEFFECT_MOVE) - ret |= ACTION_MOVE | ACTION_DEFAULT; + ret |= ACTION_MOVE; if( dwEffect & DROPEFFECT_LINK) ret |= ACTION_LINK; diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx index 6c9884354ab3..a3c64e61410d 100644 --- a/dtrans/source/win32/dnd/target.cxx +++ b/dtrans/source/win32/dnd/target.cxx @@ -2,9 +2,9 @@ * * $RCSfile: target.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: jl $ $Date: 2001-08-08 08:36:47 $ + * last change: $Author: jl $ $Date: 2001-08-14 13:57:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -653,8 +653,6 @@ void DropTarget::_acceptDrag( sal_Int8 dragOperation, const Reference<XDropTarge if( context == m_currentDragContext) { m_nLastDropAction= dragOperation; - if( m_nLastDropAction == ACTION_MOVE) - m_nLastDropAction |= ACTION_DEFAULT; } } |