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
This commit is contained in:
Rüdiger Timm
2008-08-01 07:56:43 +00:00
parent 49ff8c8942
commit 3e89afb8d5

View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: DropTarget.cxx,v $ * $RCSfile: DropTarget.cxx,v $
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -205,13 +205,7 @@ sal_Int8 DropTarget::determineDropAction(sal_Int8 dropActions, id sender) const
{ {
if (srcAndDestEqual) if (srcAndDestEqual)
{ {
if ((dropActions & DNDConstants::ACTION_MOVE) || dropAct = dropActions;
(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;
} }
else // source and destination are different else // source and destination are different
{ {