summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2007-05-09 12:32:59 +0000
committerKurt Zenker <kz@openoffice.org>2007-05-09 12:32:59 +0000
commit03835164614bedf63bb06598284d57ccd7466206 (patch)
tree2098776d9c3736cae93211316682f8c8c7224c75
parent3321189f2caef1aef9e097f5ad5201f3b8f55cba (diff)
INTEGRATION: CWS aw048 (1.37.54); FILE MERGED
2007/04/17 16:09:33 aw 1.37.54.2: RESYNC: (1.37-1.39); FILE MERGED 2007/04/13 16:47:47 aw 1.37.54.1: #i74631# adapted XPolygon to use Polygon methods where B2DPolygon conversions are needed. Changes for explicit Polygon and XPolygon constructors, some XPolygon usages removed
-rw-r--r--svx/source/svdraw/svdopath.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 903442ae9ca3..40e6a0872147 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: svdopath.cxx,v $
*
- * $Revision: 1.40 $
+ * $Revision: 1.41 $
*
- * last change: $Author: ihi $ $Date: 2007-04-16 13:42:05 $
+ * last change: $Author: kz $ $Date: 2007-05-09 13:32:59 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -161,7 +161,7 @@ struct ImpSdrPathDragData : public SdrDragStatUserData
// ##
BOOL mbMultiPointDrag;
- const XPolyPolygon& mrOrig;
+ const XPolyPolygon maOrig;
XPolyPolygon maMove;
Container maHandles;
@@ -174,7 +174,7 @@ public:
ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, BOOL bMuPoDr, const SdrDragStat& rDrag)
: aXP(5),
mbMultiPointDrag(bMuPoDr),
- mrOrig(rPO.GetPathPoly()),
+ maOrig(rPO.GetPathPoly()),
maHandles(0)
{
if(mbMultiPointDrag)
@@ -195,7 +195,7 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl
}
}
- maMove = mrOrig;
+ maMove = maOrig;
bValid = TRUE;
}
else
@@ -655,7 +655,7 @@ FASTBOOL ImpPathForDragAndCreate::MovDrag(SdrDragStat& rDrag) const
SdrHdl* pHandle = (SdrHdl*)pID->maHandles.GetObject(a);
const sal_uInt16 nPolyIndex((sal_uInt16)pHandle->GetPolyNum());
const sal_uInt16 nPointIndex((sal_uInt16)pHandle->GetPointNum());
- const XPolygon& rOrig = pID->mrOrig[nPolyIndex];
+ const XPolygon& rOrig = pID->maOrig[nPolyIndex];
XPolygon& rMove = pID->maMove[nPolyIndex];
const sal_uInt16 nPointCount(rOrig.GetPointCount());
BOOL bClosed(rOrig[0] == rOrig[nPointCount-1]);