summaryrefslogtreecommitdiff
path: root/dtrans
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-12-15 07:01:07 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-12-15 07:01:07 +0000
commit46b3f2d50dc387b2b635de5f7d675e4c6a9a202a (patch)
tree598d70a841d0994ce7f5b489de6fde46ce793067 /dtrans
parent21fd41dec5d745cfacc131867acb8d09bf4ba509 (diff)
CWS-TOOLING: integrate CWS ooo301gsl2_DEV300
Diffstat (limited to 'dtrans')
-rw-r--r--dtrans/source/aqua/DropTarget.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/dtrans/source/aqua/DropTarget.cxx b/dtrans/source/aqua/DropTarget.cxx
index 8cec3daf7a2d..bb45742732e7 100644
--- a/dtrans/source/aqua/DropTarget.cxx
+++ b/dtrans/source/aqua/DropTarget.cxx
@@ -190,7 +190,9 @@ sal_Int8 DropTarget::determineDropAction(sal_Int8 dropActions, id sender) const
// has been set and we map this to ACTION_MOVE or ACTION_COPY
// depending on whether or not source and dest are equal,
// this hopefully satisfies all parties
- if (dropActions == DNDConstants::ACTION_DEFAULT)
+ if( (dropActions == DNDConstants::ACTION_DEFAULT)
+ || ((dropActions == mDragSourceSupportedActions)
+ && !(~mDragSourceSupportedActions & DNDConstants::ACTION_COPY_OR_MOVE ) ) )
{
dropAct = srcAndDestEqual ? DNDConstants::ACTION_MOVE :
DNDConstants::ACTION_COPY;