diff options
Diffstat (limited to 'svx/source/svdraw/svddrgmt.cxx')
| -rwxr-xr-x[-rw-r--r--] | svx/source/svdraw/svddrgmt.cxx | 70 |
1 files changed, 40 insertions, 30 deletions
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 8ea6f410cbfe..89c0e1ab3211 100644..100755 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -38,7 +38,7 @@ #include <tools/bigint.hxx> #include <vcl/svapp.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xpoly.hxx> #include <svx/svdetc.hxx> #include <svx/svdtrans.hxx> @@ -46,8 +46,8 @@ #include <svx/svdmark.hxx> #include <svx/svdocapt.hxx> #include <svx/svdpagv.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svddrgv.hxx> #include <svx/svdundo.hxx> #include <svx/svdograf.hxx> @@ -60,7 +60,7 @@ #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdr/overlay/overlayrollingrectangle.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> @@ -69,7 +69,7 @@ #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <svx/sdr/contact/objectcontact.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdopath.hxx> #include <svx/polypolygoneditor.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> @@ -903,6 +903,9 @@ void SdrDragMovHdl::TakeSdrDragComment(XubString& rStr) const bool SdrDragMovHdl::BeginSdrDrag() { + if( !GetDragHdl() ) + return false; + DragStat().Ref1()=GetDragHdl()->GetPos(); DragStat().SetShown(!DragStat().IsShown()); SdrHdlKind eKind=GetDragHdl()->GetKind(); @@ -932,7 +935,7 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt) { Point aPnt(rNoSnapPnt); - if (DragStat().CheckMinMoved(rNoSnapPnt)) + if ( GetDragHdl() && DragStat().CheckMinMoved(rNoSnapPnt)) { if (GetDragHdl()->GetKind()==HDL_MIRX) { @@ -1043,22 +1046,25 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt) bool SdrDragMovHdl::EndSdrDrag(bool /*bCopy*/) { - switch (GetDragHdl()->GetKind()) + if( GetDragHdl() ) { - case HDL_REF1: - Ref1()=DragStat().GetNow(); - break; + switch (GetDragHdl()->GetKind()) + { + case HDL_REF1: + Ref1()=DragStat().GetNow(); + break; - case HDL_REF2: - Ref2()=DragStat().GetNow(); - break; + case HDL_REF2: + Ref2()=DragStat().GetNow(); + break; - case HDL_MIRX: - Ref1()+=DragStat().GetNow()-DragStat().GetStart(); - Ref2()+=DragStat().GetNow()-DragStat().GetStart(); - break; + case HDL_MIRX: + Ref1()+=DragStat().GetNow()-DragStat().GetStart(); + Ref2()+=DragStat().GetNow()-DragStat().GetStart(); + break; - default: break; + default: break; + } } return true; @@ -1067,7 +1073,11 @@ bool SdrDragMovHdl::EndSdrDrag(bool /*bCopy*/) void SdrDragMovHdl::CancelSdrDrag() { Hide(); - GetDragHdl()->SetPos(DragStat().GetRef1()); + + SdrHdl* pHdl = GetDragHdl(); + if( pHdl ) + pHdl->SetPos(DragStat().GetRef1()); + SdrHdl* pHM = GetHdlList().GetHdl(HDL_MIRX); if(pHM) @@ -1576,13 +1586,13 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_) { // Klebepunkte aufs BoundRect des Obj limitieren aPt1-=DragStat().GetStart(); const SdrMarkList& rML=GetMarkedObjectList(); - ULONG nMarkAnz=rML.GetMarkCount(); + sal_uLong nMarkAnz=rML.GetMarkCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) + for (sal_uLong nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=rML.GetMark(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); + sal_uLong nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); if (nPtAnz!=0) { @@ -1590,7 +1600,7 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_) const SdrGluePointList* pGPL=pObj->GetGluePointList(); Rectangle aBound(pObj->GetCurrentBoundRect()); - for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) + for (sal_uLong nPtNum=0; nPtNum<nPtAnz; nPtNum++) { sal_uInt16 nId=pPts->GetObject(nPtNum); sal_uInt16 nGlueNum=pGPL->FindGluePoint(nId); @@ -1679,12 +1689,12 @@ void SdrDragResize::TakeSdrDragComment(XubString& rStr) const Fraction aFact1(1,1); Point aStart(DragStat().GetStart()); Point aRef(DragStat().GetRef1()); - INT32 nXDiv(aStart.X() - aRef.X()); + sal_Int32 nXDiv(aStart.X() - aRef.X()); if(!nXDiv) nXDiv = 1; - INT32 nYDiv(aStart.Y() - aRef.Y()); + sal_Int32 nYDiv(aStart.Y() - aRef.Y()); if(!nYDiv) nYDiv = 1; @@ -2021,7 +2031,7 @@ void SdrDragRotate::TakeSdrDragComment(XubString& rStr) const ImpTakeDescriptionStr(STR_DragMethRotate, rStr); rStr.AppendAscii(" ("); XubString aStr; - INT32 nTmpWink(NormAngle360(nWink)); + sal_Int32 nTmpWink(NormAngle360(nWink)); if(bRight && nWink) { @@ -2157,7 +2167,7 @@ void SdrDragShear::TakeSdrDragComment(XubString& rStr) const ImpTakeDescriptionStr(STR_DragMethShear, rStr); rStr.AppendAscii(" ("); - INT32 nTmpWink(nWink); + sal_Int32 nTmpWink(nWink); if(bUpSideDown) nTmpWink += 18000; @@ -2749,7 +2759,7 @@ void SdrDragCrook::TakeSdrDragComment(XubString& rStr) const rStr.AppendAscii(" ("); XubString aStr; - INT32 nVal(nWink); + sal_Int32 nVal(nWink); if(bAtCenter) nVal *= 2; @@ -3344,9 +3354,9 @@ bool SdrDragCrook::EndSdrDrag(bool bCopy) if (bCopy) getSdrDragView().CopyMarkedObj(); - ULONG nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount(); + sal_uLong nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + for (sal_uLong nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=getSdrDragView().GetMarkedObjectList().GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj(); |