[Libreoffice-commits] core.git: svx/source
Miklos Vajna
vmiklos at collabora.co.uk
Tue Apr 21 01:56:02 PDT 2015
svx/source/svdraw/svddrgmt.cxx | 12 ++++++------
svx/source/svdraw/svdedtv1.cxx | 16 ++++++++--------
svx/source/svdraw/svdglev.cxx | 16 ++++++++--------
svx/source/svdraw/svdoedge.cxx | 14 +++++++-------
svx/source/svdraw/svdopath.cxx | 24 ++++++++++++------------
svx/source/svdraw/svdpoev.cxx | 4 ++--
6 files changed, 43 insertions(+), 43 deletions(-)
New commits:
commit 95fcbd2779757f9be89581bd253b8d49a2afa1e7
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Apr 21 10:13:14 2015 +0200
svx: nPtAnz -> nPointCount
Change-Id: Iec25a45729143cea7a8ff5cf4e03969998f2c355
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 3541cd0..3161e40 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1687,9 +1687,9 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
{
const SdrMark* pM=rML.GetMark(nMarkNum);
const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
- const size_t nPtAnz=pPts==NULL ? 0 : pPts->size();
+ const size_t nPointCount=pPts==NULL ? 0 : pPts->size();
- if (nPtAnz!=0)
+ if (nPointCount!=0)
{
const SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrGluePointList* pGPL=pObj->GetGluePointList();
@@ -3066,16 +3066,16 @@ void SdrDragCrook::_MovAllPoints(basegfx::B2DPolyPolygon& rTarget)
for (j=0; j<nPolyAnz; j++)
{
XPolygon& aPol=aTempPolyPoly[j];
- sal_uInt16 nPtAnz=aPol.GetPointCount();
+ sal_uInt16 nPointCount=aPol.GetPointCount();
i=0;
- while (i<nPtAnz)
+ while (i<nPointCount)
{
Point* pPnt=&aPol[i];
Point* pC1=NULL;
Point* pC2=NULL;
- if (i+1<nPtAnz && aPol.IsControl(i))
+ if (i+1<nPointCount && aPol.IsControl(i))
{ // control point on the left
pC1=pPnt;
i++;
@@ -3084,7 +3084,7 @@ void SdrDragCrook::_MovAllPoints(basegfx::B2DPolyPolygon& rTarget)
i++;
- if (i<nPtAnz && aPol.IsControl(i))
+ if (i<nPointCount && aPol.IsControl(i))
{ // control point on the right
pC2=&aPol[i];
i++;
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index f40c7e3..26e4b32 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -527,11 +527,11 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
if(!bDone && !pPath && pO->IsPolyObj() && 0L != pO->GetPointCount())
{
// for PolyObj's, but NOT for SdrPathObj's, e.g. the measurement object
- sal_uInt32 nPtAnz(pO->GetPointCount());
- XPolygon aXP((sal_uInt16)nPtAnz);
+ sal_uInt32 nPointCount(pO->GetPointCount());
+ XPolygon aXP((sal_uInt16)nPointCount);
sal_uInt32 nPtNum;
- for(nPtNum = 0L; nPtNum < nPtAnz; nPtNum++)
+ for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++)
{
Point aPt(pO->GetPoint(nPtNum));
aXP[(sal_uInt16)nPtNum]=aPt;
@@ -544,7 +544,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
case SDRCROOK_STRETCH: CrookStretchPoly(aXP,rRef,rRad,bVertical,rMarkRect); break;
}
- for(nPtNum = 0L; nPtNum < nPtAnz; nPtNum++)
+ for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++)
{
// broadcasting could be optimized here, but for the
// current two points of the measurement object, it's fine
@@ -641,11 +641,11 @@ void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPol
else if(pO->IsPolyObj())
{
// e. g. for the measurement object
- sal_uInt32 nPtAnz(pO->GetPointCount());
- XPolygon aXP((sal_uInt16)nPtAnz);
+ sal_uInt32 nPointCount(pO->GetPointCount());
+ XPolygon aXP((sal_uInt16)nPointCount);
sal_uInt32 nPtNum;
- for(nPtNum = 0L; nPtNum < nPtAnz; nPtNum++)
+ for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++)
{
Point aPt(pO->GetPoint(nPtNum));
aXP[(sal_uInt16)nPtNum]=aPt;
@@ -653,7 +653,7 @@ void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPol
aXP.Distort(rRef, rDistortedRect);
- for(nPtNum = 0L; nPtNum < nPtAnz; nPtNum++)
+ for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++)
{
// broadcasting could be optimized here, but for the
// current two points of the measurement object it's fine
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index af3d31e..82b2adc 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -49,8 +49,8 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, co
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
- sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->size();
- if (nPtAnz!=0) {
+ sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size();
+ if (nPointCount!=0) {
SdrGluePointList* pGPL=NULL;
if (bConst) {
const SdrGluePointList* pConstGPL=pObj->GetGluePointList();
@@ -233,8 +233,8 @@ void SdrGlueEditView::DeleteMarkedGluePoints()
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
- sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->size();
- if (nPtAnz!=0)
+ sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size();
+ if (nPointCount!=0)
{
SdrGluePointList* pGPL=pObj->ForceGluePointList();
if (pGPL!=NULL)
@@ -279,8 +279,8 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints()
SdrObject* pObj=pM->GetMarkedSdrObj();
SdrUShortCont* pPts=pM->GetMarkedGluePoints();
SdrGluePointList* pGPL=pObj->ForceGluePointList();
- sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->size();
- if (nPtAnz!=0 && pGPL!=NULL)
+ sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size();
+ if (nPointCount!=0 && pGPL!=NULL)
{
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
@@ -322,8 +322,8 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
- sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->size();
- if (nPtAnz!=0) {
+ sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size();
+ if (nPointCount!=0) {
SdrGluePointList* pGPL=pObj->ForceGluePointList();
if (pGPL!=NULL)
{
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 48cc722..6d2e564 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -493,12 +493,12 @@ bool SdrEdgeObj::CheckNodeConnection(bool bTail1) const
{
bool bRet = false;
const SdrObjConnection& rCon=GetConnection(bTail1);
- sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount();
- if (rCon.pObj!=NULL && rCon.pObj->GetPage()==pPage && nPtAnz!=0) {
+ sal_uInt16 nPointCount=pEdgeTrack->GetPointCount();
+ if (rCon.pObj!=NULL && rCon.pObj->GetPage()==pPage && nPointCount!=0) {
const SdrGluePointList* pGPL=rCon.pObj->GetGluePointList();
sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount();
sal_uInt16 nGesAnz=nConAnz+8;
- Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[sal_uInt16(nPtAnz-1)]);
+ Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[sal_uInt16(nPointCount-1)]);
for (sal_uInt16 i=0; i<nGesAnz && !bRet; i++) {
if (i<nConAnz) { // UserDefined
bRet=aTail==(*pGPL)[i].GetAbsolutePos(*rCon.pObj);
@@ -516,15 +516,15 @@ bool SdrEdgeObj::CheckNodeConnection(bool bTail1) const
void SdrEdgeObj::ImpSetTailPoint(bool bTail1, const Point& rPt)
{
- sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount();
- if (nPtAnz==0) {
+ sal_uInt16 nPointCount=pEdgeTrack->GetPointCount();
+ if (nPointCount==0) {
(*pEdgeTrack)[0]=rPt;
(*pEdgeTrack)[1]=rPt;
- } else if (nPtAnz==1) {
+ } else if (nPointCount==1) {
if (!bTail1) (*pEdgeTrack)[1]=rPt;
else { (*pEdgeTrack)[1]=(*pEdgeTrack)[0]; (*pEdgeTrack)[0]=rPt; }
} else {
- if (!bTail1) (*pEdgeTrack)[sal_uInt16(nPtAnz-1)]=rPt;
+ if (!bTail1) (*pEdgeTrack)[sal_uInt16(nPointCount-1)]=rPt;
else (*pEdgeTrack)[0]=rPt;
}
ImpRecalcEdgeTrack();
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 44d92d5..382c6ca 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1451,11 +1451,11 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
nActPoint--;
}
if (pU->IsFormFlag()) {
- sal_uInt16 nPtAnz0=rXPoly.GetPointCount();
+ sal_uInt16 nPointCount0=rXPoly.GetPointCount();
rXPoly.Remove(nActPoint-1,2); // remove last two points and replace by form
rXPoly.Insert(XPOLY_APPEND,pU->GetFormPoly());
- sal_uInt16 nPtAnz1=rXPoly.GetPointCount();
- for (sal_uInt16 i=nPtAnz0+1; i<nPtAnz1-1; i++) { // to make BckAction work
+ sal_uInt16 nPointCount1=rXPoly.GetPointCount();
+ for (sal_uInt16 i=nPointCount0+1; i<nPointCount1-1; i++) { // to make BckAction work
if (!rXPoly.IsControl(i)) rStat.NextPoint();
}
nActPoint=rXPoly.GetPointCount()-1;
@@ -1481,15 +1481,15 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
// delete last point, if necessary
if (eCmd==SDRCREATE_FORCEEND) {
XPolygon& rXP=aPathPolygon[nPolyAnz-1];
- sal_uInt16 nPtAnz=rXP.GetPointCount();
- if (nPtAnz>=2) {
- if (!rXP.IsControl(nPtAnz-2)) {
- if (rXP[nPtAnz-1]==rXP[nPtAnz-2]) {
- rXP.Remove(nPtAnz-1,1);
+ sal_uInt16 nPointCount=rXP.GetPointCount();
+ if (nPointCount>=2) {
+ if (!rXP.IsControl(nPointCount-2)) {
+ if (rXP[nPointCount-1]==rXP[nPointCount-2]) {
+ rXP.Remove(nPointCount-1,1);
}
} else {
- if (rXP[nPtAnz-3]==rXP[nPtAnz-2]) {
- rXP.Remove(nPtAnz-3,3);
+ if (rXP[nPointCount-3]==rXP[nPointCount-2]) {
+ rXP.Remove(nPointCount-3,3);
}
}
}
@@ -1497,10 +1497,10 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
for (sal_uInt16 nPolyNum=nPolyAnz; nPolyNum>0;) {
nPolyNum--;
XPolygon& rXP=aPathPolygon[nPolyNum];
- sal_uInt16 nPtAnz=rXP.GetPointCount();
+ sal_uInt16 nPointCount=rXP.GetPointCount();
// delete polygons with too few points
if (nPolyNum<nPolyAnz-1 || eCmd==SDRCREATE_FORCEEND) {
- if (nPtAnz<2) aPathPolygon.Remove(nPolyNum);
+ if (nPointCount<2) aPathPolygon.Remove(nPolyNum);
}
}
}
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 7a33186..aa6aaf4 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -588,9 +588,9 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void*
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrUShortCont* pPts=pM->GetMarkedPoints();
- sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->size();
+ sal_uIntPtr nPointCount=pPts==NULL ? 0 : pPts->size();
SdrPathObj* pPath=PTR_CAST(SdrPathObj,pObj);
- if (nPtAnz!=0 && pPath!=NULL)
+ if (nPointCount!=0 && pPath!=NULL)
{
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
More information about the Libreoffice-commits
mailing list