diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-11-03 09:53:54 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-11-03 09:53:54 +0000 |
| commit | ad473b6381795afdfd923a8d1db9dcf218954d87 (patch) | |
| tree | e7b9695913c2e3fffe75785fdae906eb74ef4946 /svx/source/svdraw/svddrgmt.cxx | |
| parent | 5c6754cd321a79597c11e32244d418f5a7b3a6e1 (diff) | |
INTEGRATION: CWS aw019 (1.6.138); FILE MERGED
2004/10/21 15:53:27 aw 1.6.138.2: #i34831#
2004/10/06 16:18:16 aw 1.6.138.1: #i34831#
Diffstat (limited to 'svx/source/svdraw/svddrgmt.cxx')
| -rw-r--r-- | svx/source/svdraw/svddrgmt.cxx | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index ed94640378ca..f21c9d1f87d8 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svddrgmt.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2004-07-12 14:44:04 $ + * last change: $Author: pjunck $ $Date: 2004-11-03 10:53:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -165,7 +165,7 @@ FASTBOOL SdrDragMethod::IsMoveOnly() const return FALSE; } -void SdrDragMethod::DrawXor(ExtOutputDevice& rXOut, FASTBOOL bFull) const +void SdrDragMethod::DrawXor(XOutputDevice& rXOut, FASTBOOL bFull) const { FASTBOOL bGlue=IsDraggingGluePoints(); FASTBOOL bPoints=IsDraggingPoints() || bGlue; @@ -246,7 +246,8 @@ void SdrDragMethod::DrawXor(ExtOutputDevice& rXOut, FASTBOOL bFull) const rXP[4] == rXP[0]) { // Rechteck (Drehsinn links) - aRect = rXP.GetBoundRect(pWin); +//BFS09 aRect = rXP.GetBoundRect(pWin); + aRect = rXP.GetBoundRect(); } else if (nPtAnz == 5 && rXP[0].X() == rXP[1].X() && @@ -256,7 +257,8 @@ void SdrDragMethod::DrawXor(ExtOutputDevice& rXOut, FASTBOOL bFull) const rXP[4] == rXP[0]) { // Rechteck (Drehsinn rechts) - aRect = rXP.GetBoundRect(pWin); +//BFS09 aRect = rXP.GetBoundRect(pWin); + aRect = rXP.GetBoundRect(); } } @@ -266,7 +268,8 @@ void SdrDragMethod::DrawXor(ExtOutputDevice& rXOut, FASTBOOL bFull) const } else { - const Polygon aPoly( XOutCreatePolygon(rXP, pWin) ); +//BFS09 const Polygon aPoly( XOutCreatePolygon(rXP, pWin) ); + const Polygon aPoly( XOutCreatePolygon(rXP) ); pWin->InvertTracking(aPoly, SHOWTRACK_WINDOW); } } @@ -583,7 +586,7 @@ void SdrDragObjOwn::Brk() SdrDragMethod::Brk(); } -void SdrDragObjOwn::DrawXor(ExtOutputDevice& rXOut, FASTBOOL bFull) const +void SdrDragObjOwn::DrawXor(XOutputDevice& rXOut, FASTBOOL bFull) const { SdrPageView* pPV=GetDragPV(); if (pPV!=NULL) { @@ -594,7 +597,8 @@ void SdrDragObjOwn::DrawXor(ExtOutputDevice& rXOut, FASTBOOL bFull) const for (USHORT i=0; i<nAnz; i++) { if (pOut->GetOutDevType() == OUTDEV_WINDOW) { - const Polygon aPolygon( XOutCreatePolygon(rXPP[i], pOut) ); +//BFS09 const Polygon aPolygon( XOutCreatePolygon(rXPP[i], pOut) ); + const Polygon aPolygon( XOutCreatePolygon(rXPP[i]) ); ((Window*) pOut)->InvertTracking(aPolygon, SHOWTRACK_WINDOW); } else @@ -1966,7 +1970,7 @@ FASTBOOL SdrDragCrook::End(FASTBOOL bCopy) return FALSE; } -void SdrDragCrook::DrawXor(ExtOutputDevice& rXOut, FASTBOOL bFull) const +void SdrDragCrook::DrawXor(XOutputDevice& rXOut, FASTBOOL bFull) const { SdrDragMethod::DrawXor(rXOut,bFull); if (FALSE) { @@ -2107,7 +2111,7 @@ FASTBOOL SdrDragDistort::End(FASTBOOL bCopy) return FALSE; } -void SdrDragDistort::DrawXor(ExtOutputDevice& rXOut, FASTBOOL bFull) const +void SdrDragDistort::DrawXor(XOutputDevice& rXOut, FASTBOOL bFull) const { SdrDragMethod::DrawXor(rXOut,bFull); } |