diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-03-06 08:10:53 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-03-06 08:10:53 +0000 |
| commit | 612b80794c9cb94c7ff367075d84b2f3a15e7d53 (patch) | |
| tree | 4d6537d8bbcaf059fd8217e39bfbf9866d5008d3 /svx/source/svdraw/svddrgv.cxx | |
| parent | 34936b2b30eb2b90518f8ab11b7d0748dfa8e86c (diff) | |
INTEGRATION: CWS impress85 (1.9.52); FILE MERGED
2006/02/15 16:00:48 sj 1.9.52.1: #i61492# now using SdrDragMove for CustomShapes to allow grid snaping when moving
Diffstat (limited to 'svx/source/svdraw/svddrgv.cxx')
| -rw-r--r-- | svx/source/svdraw/svddrgv.cxx | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index c69027d945c0..63b01ac0ec39 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svddrgv.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2006-01-10 14:48:44 $ + * last change: $Author: rt $ $Date: 2006-03-06 09:10:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,6 +49,9 @@ #include "svdglob.hxx" // StringCache #include "svddrgm1.hxx" #include "obj3d.hxx" +#ifndef _SVDOASHP_HXX +#include "svdoashp.hxx" +#endif #define XOR_DRAG_PEN PEN_DOT @@ -567,20 +570,30 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl } } break; - default: { // SDRDRAG_MOVE - if (eDragHdl==HDL_GLUE) { - pDragBla=new SdrDragMove(*this); - } else { - if (bFramDrag==TRUE) { - if (eDragHdl==HDL_MOVE) { - if (!IsMoveAllowed()) return FALSE; + default: + { // SDRDRAG_MOVE + if ( ( eDragHdl == HDL_MOVE ) && !IsMoveAllowed() ) + return FALSE; + else if ( eDragHdl==HDL_GLUE ) + pDragBla = new SdrDragMove(*this); + else + { + if ( bFramDrag ) + { + if ( eDragHdl == HDL_MOVE ) pDragBla=new SdrDragMove(*this); - } else { + else + { if (!IsResizeAllowed(TRUE)) return FALSE; pDragBla=new SdrDragResize(*this); } - } else { - if (eDragHdl==HDL_MOVE && !IsMoveAllowed()) return FALSE; + } + else + { + if ( ( eDragHdl == HDL_MOVE ) && ( GetMarkedObjectCount() == 1 ) + && GetMarkedObjectByIndex( 0 )->ISA( SdrObjCustomShape ) ) + pDragBla = new SdrDragMove( *this ); + else { bDragSpecial=TRUE; pDragBla=new SdrDragObjOwn(*this); |