diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 15:52:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 15:52:43 +0000 |
| commit | ac0cc46c3c35f3966a802564a8d421cc3a11be08 (patch) | |
| tree | eba58b65b2000dce05434d1f18e13d028cd4f770 /svx/source/svdraw/svddrgmt.cxx | |
| parent | 32474f063edc35b0dac821bf79ae36ef72081e84 (diff) | |
INTEGRATION: CWS aw003 (1.3.36); FILE MERGED
2003/10/23 14:37:36 aw 1.3.36.2: #111111#
Changed GetBoundRect() to GetCurrentBoundRect() and GetLastBoundRect()
2003/10/07 12:21:20 aw 1.3.36.1: #111097#
Diffstat (limited to 'svx/source/svdraw/svddrgmt.cxx')
| -rw-r--r-- | svx/source/svdraw/svddrgmt.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 76fc7678eb4e..7181f6f95b41 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svddrgmt.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: vg $ $Date: 2003-06-06 10:43:42 $ + * last change: $Author: rt $ $Date: 2003-11-24 16:52:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -755,7 +755,7 @@ void SdrDragMove::Mov(const Point& rNoSnapPnt_) const SdrObject* pObj=pM->GetObj(); const SdrPageView* pPV=pM->GetPageView(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); - Rectangle aBound(pObj->GetBoundRect()); + Rectangle aBound(pObj->GetCurrentBoundRect()); for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) { USHORT nId=pPts->GetObject(nPtNum); USHORT nGlueNum=pGPL->FindGluePoint(nId); @@ -1646,8 +1646,9 @@ FASTBOOL SdrDragCrook::Beg() for(sal_uInt16 a(0); a < nPageViewNum; a++) { SdrPageView* pPV = rView.GetPageViewPvNum(a); - OutputDevice* pOut = (pPV->GetWinList())[0].GetOutputDevice(); - Rectangle aPixelSize = pOut->LogicToPixel(aMarkRect); + // OutputDevice* pOut = (pPV->GetWinList())[0].GetOutputDevice(); + OutputDevice& rOut = (pPV->GetWindow(0)->GetOutputDevice()); + Rectangle aPixelSize = rOut.LogicToPixel(aMarkRect); sal_uInt32 nHorDiv(aPixelSize.GetWidth() / DRAG_CROOK_RASTER_DISTANCE); sal_uInt32 nVerDiv(aPixelSize.GetHeight() / DRAG_CROOK_RASTER_DISTANCE); @@ -2019,8 +2020,9 @@ FASTBOOL SdrDragDistort::Beg() for(sal_uInt16 a(0); a < nPageViewNum; a++) { SdrPageView* pPV = rView.GetPageViewPvNum(a); - OutputDevice* pOut = (pPV->GetWinList())[0].GetOutputDevice(); - Rectangle aPixelSize = pOut->LogicToPixel(aMarkRect); + // OutputDevice* pOut = (pPV->GetWinList())[0].GetOutputDevice(); + OutputDevice& rOut = (pPV->GetWindow(0)->GetOutputDevice()); + Rectangle aPixelSize = rOut.LogicToPixel(aMarkRect); sal_uInt32 nHorDiv(aPixelSize.GetWidth() / DRAG_CROOK_RASTER_DISTANCE); sal_uInt32 nVerDiv(aPixelSize.GetHeight() / DRAG_CROOK_RASTER_DISTANCE); |