diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-01 07:56:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-01 07:56:43 +0000 |
| commit | 3e89afb8d56ea987ff8e044320f7c0301006099b (patch) | |
| tree | 4532a675a0ac94ae6019f8282de01d5b401d8207 /dtrans | |
| parent | 49ff8c8942fe55e5b69f4bad969aca68678c7b88 (diff) | |
INTEGRATION: CWS vcl30stop1 (1.4.4); FILE MERGED
2008/07/22 14:54:28 pl 1.4.4.1: #i90747# more consistent Drop operations inside OOo
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/source/aqua/DropTarget.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/dtrans/source/aqua/DropTarget.cxx b/dtrans/source/aqua/DropTarget.cxx index 5400b1a9757e..8cec3daf7a2d 100644 --- a/dtrans/source/aqua/DropTarget.cxx +++ b/dtrans/source/aqua/DropTarget.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DropTarget.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -205,13 +205,7 @@ sal_Int8 DropTarget::determineDropAction(sal_Int8 dropActions, id sender) const { if (srcAndDestEqual) { - if ((dropActions & DNDConstants::ACTION_MOVE) || - (dropActions & DNDConstants::ACTION_DEFAULT)) - dropAct = DNDConstants::ACTION_MOVE; - else if (dropActions & DNDConstants::ACTION_COPY) - dropAct = DNDConstants::ACTION_COPY; - else if (dropActions & DNDConstants::ACTION_LINK) - dropAct = DNDConstants::ACTION_LINK; + dropAct = dropActions; } else // source and destination are different { |