diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 09:58:12 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 09:58:12 +0000 |
| commit | 2c32696a04bc195c8ce61a0df6dcafb8c0c49fe0 (patch) | |
| tree | 20f65f4b4d1a3a1c7c73f694210b3a07b6bea496 /sd/source/ui/view/sdview2.cxx | |
| parent | 534bd7f86535dc81073d673d9bc185bb34520a55 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'sd/source/ui/view/sdview2.cxx')
| -rw-r--r-- | sd/source/ui/view/sdview2.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index cd58deb99627..1a8c3863aca2 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdview2.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: ka $ $Date: 2002-12-11 14:54:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 10:58:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -569,17 +569,18 @@ sal_Int8 SdView::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTar { const SdView* pSourceView = pDragTransferable->GetView(); - if( pSourceView ) + if( pDragTransferable->IsPageTransferable() ) + { + nRet = DND_ACTION_COPY; + } + else if( pSourceView ) { if( !( nDropAction & DND_ACTION_LINK ) || - pSourceView->GetDocSh()->GetMedium()->GetName().Len() || - pDragTransferable->IsPageTransferable() ) + pSourceView->GetDocSh()->GetMedium()->GetName().Len() ) { nRet = nDropAction; } } - else if( pDragTransferable->IsPageTransferable() ) - nRet = nDropAction; } else { |