diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-07-25 11:54:39 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-07-25 11:54:39 +0000 |
| commit | b6bff7c2fd832c8f460ae91e1dd53f06ed68a8bd (patch) | |
| tree | 7931e76965ad4a4a31e9b576a59e9a80ffe704a8 /svx/source/svdraw/svddrgmt.cxx | |
| parent | 48045f21a20bd009716c591f38bd9ec36dc7096c (diff) | |
INTEGRATION: CWS aw035 (1.10.44); FILE MERGED
2006/07/18 11:47:52 aw 1.10.44.2: #i58950# moved constructor to cxx, added virtual destructor
2006/07/12 15:29:52 aw 1.10.44.1: #126320# SdrMark::GetObj() -> SdrMark::GetSdrObjectFromSdrMark() for unique identification
Diffstat (limited to 'svx/source/svdraw/svddrgmt.cxx')
| -rw-r--r-- | svx/source/svdraw/svddrgmt.cxx | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index a5caf5cbd80d..e79f3999bb18 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svddrgmt.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2006-06-19 16:35:05 $ + * last change: $Author: rt $ $Date: 2006-07-25 12:54:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -89,6 +89,18 @@ SdrPageView* SdrDragMethod::GetDragPV() const return pPV; } +// #i58950# also moved constructor implementation to cxx +SdrDragMethod::SdrDragMethod(SdrDragView& rNewView) +: rView(rNewView), + bMoveOnly(FALSE) +{ +} + +// #i58950# virtual destructor was missing +SdrDragMethod::~SdrDragMethod() +{ +} + void SdrDragMethod::Draw() const { rView.DrawDragObj(rView.pDragWin,TRUE); @@ -739,7 +751,7 @@ void SdrDragMove::Mov(const Point& rNoSnapPnt_) const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); if (nPtAnz!=0) { - const SdrObject* pObj=pM->GetObj(); + const SdrObject* pObj=pM->GetMarkedSdrObj(); //const SdrPageView* pPV=pM->GetPageView(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); Rectangle aBound(pObj->GetCurrentBoundRect()); @@ -1490,7 +1502,7 @@ void SdrDragGradient::Mov(const Point& rPnt) } // new state - pIAOHandle->FromIAOToItem(rView.GetMarkedObjectList().GetMark(0)->GetObj(), FALSE, FALSE); + pIAOHandle->FromIAOToItem(rView.GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj(), FALSE, FALSE); } } @@ -1501,7 +1513,7 @@ FASTBOOL SdrDragGradient::End(FASTBOOL /*bCopy*/) Ref2() = pIAOHandle->Get2ndPos(); // new state - pIAOHandle->FromIAOToItem(rView.GetMarkedObjectList().GetMark(0)->GetObj(), TRUE, TRUE); + pIAOHandle->FromIAOToItem(rView.GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj(), TRUE, TRUE); return TRUE; } @@ -1517,7 +1529,7 @@ void SdrDragGradient::Brk() pIAOHandle->GetColorHdl2()->SetPos(DragStat().Ref2()); // new state - pIAOHandle->FromIAOToItem(rView.GetMarkedObjectList().GetMark(0)->GetObj(), TRUE, FALSE); + pIAOHandle->FromIAOToItem(rView.GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj(), TRUE, FALSE); } Pointer SdrDragGradient::GetPointer() const @@ -1925,7 +1937,7 @@ FASTBOOL SdrDragCrook::End(FASTBOOL bCopy) ULONG nMarkAnz=rView.GetMarkedObjectList().GetMarkCount(); for (ULONG nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=rView.GetMarkedObjectList().GetMark(nm); - SdrObject* pO=pM->GetObj(); + SdrObject* pO=pM->GetMarkedSdrObj(); Point aCtr0(pO->GetSnapRect().Center()); Point aCtr1(aCtr0); if (bVertical) ResizePoint(aCtr1,aCenter-pM->GetPageView()->GetOffset(),aFact1,aFact); |