diff options
| author | Niklas Nebel <nn@openoffice.org> | 2001-03-30 18:14:44 +0000 |
|---|---|---|
| committer | Niklas Nebel <nn@openoffice.org> | 2001-03-30 18:14:44 +0000 |
| commit | aa148feb5df72cb3f1bb7f4527b775cfa2b60108 (patch) | |
| tree | addaa6c0e815890e5876e5ff2978fae0f8d63f49 /sc/source/ui/view/viewfun7.cxx | |
| parent | 299f294dfb66bff5219f172161d3b05a832b3ab6 (diff) | |
#84195# more drag&drop changes
Diffstat (limited to 'sc/source/ui/view/viewfun7.cxx')
| -rw-r--r-- | sc/source/ui/view/viewfun7.cxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index de0213d84ead..efc50ea868ac 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfun7.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: nn $ $Date: 2001-03-23 19:24:39 $ + * last change: $Author: nn $ $Date: 2001-03-30 19:14:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -390,6 +390,7 @@ #include "drawview.hxx" #include "scmod.hxx" #include "drwlayer.hxx" +#include "drwtrans.hxx" #include "globstr.hrc" extern Point aDragStartDiff; @@ -432,21 +433,23 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, BOOL bGrou pRef->SetMapMode( MapMode(MAP_100TH_MM) ); } -#ifdef OLD_DND - SdrView* pDragEditView = SC_MOD()->GetDragData().pSdrView; - if (pDragEditView) + SdrView* pDragEditView = NULL; + ScModule* pScMod = SC_MOD(); + const ScDragData& rData = pScMod->GetDragData(); + ScDrawTransferObj* pDrawTrans = rData.pDrawTransfer; + if (pDrawTrans) { + pDragEditView = pDrawTrans->GetDragSourceView(); + aPos -= aDragStartDiff; if (aPos.X() < 0) aPos.X() = 0; if (aPos.Y() < 0) aPos.Y() = 0; } -#endif ScDrawView* pDrawView = GetScDrawView(); if (bGroup) pDrawView->BegUndo( ScGlobal::GetRscString( STR_UNDO_PASTE ) ); -#ifdef OLD_DND BOOL bSameDoc = ( pDragEditView && pDragEditView->GetModel() == pDrawView->GetModel() ); if (bSameDoc) { @@ -498,7 +501,6 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, BOOL bGrou } } else -#endif { bPasteIsMove = FALSE; // kein internes Verschieben passiert |