diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-23 09:16:33 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-23 09:17:03 +0200 |
commit | 0568cd8cf740be45360fd94405fc6a85f2dfb4c2 (patch) | |
tree | ca173f9cdb1eae09d336487a17229ef72ab5e504 /svx | |
parent | b55a9559e6c40060cafa62a824ab0cc0e27dba26 (diff) |
svx: nPolyAnz -> nPolyCount
Change-Id: I811806d7214f7bbf78e20500e7c8310f3f1b0e25
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svddrgmt.cxx | 8 | ||||
-rw-r--r-- | svx/source/svdraw/svdopath.cxx | 10 | ||||
-rw-r--r-- | svx/source/svdraw/svdtrans.cxx | 12 |
3 files changed, 15 insertions, 15 deletions
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 3161e40c9cd2..738e8cbdae3b 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -2993,17 +2993,17 @@ void SdrDragCrook::_MovAllPoints(basegfx::B2DPolyPolygon& rTarget) if (pPV->HasMarkedObjPageView()) { - sal_uInt16 nPolyAnz=aTempPolyPoly.Count(); + sal_uInt16 nPolyCount=aTempPolyPoly.Count(); if (!bContortion && !getSdrDragView().IsNoDragXorPolys()) { sal_uInt16 n1st=0,nLast=0; Point aC(aCenter); - while (n1st<nPolyAnz) + while (n1st<nPolyCount) { nLast=n1st; - while (nLast<nPolyAnz && aTempPolyPoly[nLast].GetPointCount()!=0) nLast++; + while (nLast<nPolyCount && aTempPolyPoly[nLast].GetPointCount()!=0) nLast++; Rectangle aBound(aTempPolyPoly[n1st].GetBoundRect()); sal_uInt16 i; @@ -3063,7 +3063,7 @@ void SdrDragCrook::_MovAllPoints(basegfx::B2DPolyPolygon& rTarget) { sal_uInt16 i,j; - for (j=0; j<nPolyAnz; j++) + for (j=0; j<nPolyCount; j++) { XPolygon& aPol=aTempPolyPoly[j]; sal_uInt16 nPointCount=aPol.GetPointCount(); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 382c6ca8f06a..378df6d6f73d 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -1476,11 +1476,11 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } } - sal_uInt16 nPolyAnz=aPathPolygon.Count(); - if (nPolyAnz!=0) { + sal_uInt16 nPolyCount=aPathPolygon.Count(); + if (nPolyCount!=0) { // delete last point, if necessary if (eCmd==SDRCREATE_FORCEEND) { - XPolygon& rXP=aPathPolygon[nPolyAnz-1]; + XPolygon& rXP=aPathPolygon[nPolyCount-1]; sal_uInt16 nPointCount=rXP.GetPointCount(); if (nPointCount>=2) { if (!rXP.IsControl(nPointCount-2)) { @@ -1494,12 +1494,12 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } } } - for (sal_uInt16 nPolyNum=nPolyAnz; nPolyNum>0;) { + for (sal_uInt16 nPolyNum=nPolyCount; nPolyNum>0;) { nPolyNum--; XPolygon& rXP=aPathPolygon[nPolyNum]; sal_uInt16 nPointCount=rXP.GetPointCount(); // delete polygons with too few points - if (nPolyNum<nPolyAnz-1 || eCmd==SDRCREATE_FORCEEND) { + if (nPolyNum<nPolyCount-1 || eCmd==SDRCREATE_FORCEEND) { if (nPointCount<2) aPathPolygon.Remove(nPolyNum); } } diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index e95b56aa5669..8e517c5ba9c0 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -367,24 +367,24 @@ void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { - sal_uInt16 nPolyAnz=rPoly.Count(); - for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { + sal_uInt16 nPolyCount=rPoly.Count(); + for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyCount; nPolyNum++) { CrookRotatePoly(rPoly[nPolyNum],rCenter,rRad,bVert); } } void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { - sal_uInt16 nPolyAnz=rPoly.Count(); - for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { + sal_uInt16 nPolyCount=rPoly.Count(); + for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyCount; nPolyNum++) { CrookSlantPoly(rPoly[nPolyNum],rCenter,rRad,bVert); } } void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle& rRefRect) { - sal_uInt16 nPolyAnz=rPoly.Count(); - for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { + sal_uInt16 nPolyCount=rPoly.Count(); + for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyCount; nPolyNum++) { CrookStretchPoly(rPoly[nPolyNum],rCenter,rRad,bVert,rRefRect); } } |