diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-08 10:54:51 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-08 12:31:52 +0100 |
commit | 3e9c65a714d9ec5136dc141adc101f34ff7092f6 (patch) | |
tree | 980f5a5e4b2122383c5aeb24278630c7acfd38d6 /svx/source | |
parent | 4870d2f7b8a642ee4152a4bb1022a9d099afe304 (diff) |
svx: nAnz -> nCount
Change-Id: I88bff880a5fb27b259b66984a0637fe7d2ab51f6
Diffstat (limited to 'svx/source')
26 files changed, 196 insertions, 196 deletions
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 12793c18bff2..8cf6c022f701 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -863,7 +863,7 @@ bool SdrAngleItem::GetPresentation( if(nValue) { sal_Unicode aUnicodeNull('0'); - sal_Int32 nAnz(2); + sal_Int32 nCount(2); const IntlWrapper* pMyIntlWrapper = NULL; if(!pIntlWrapper) @@ -871,9 +871,9 @@ bool SdrAngleItem::GetPresentation( Application::GetSettings().GetLanguageTag() ); if(pIntlWrapper->getLocaleData()->isNumLeadingZero()) - nAnz++; + nCount++; - while(aText.getLength() < nAnz) + while(aText.getLength() < nCount) aText.insert(0, aUnicodeNull); sal_Int32 nLen = aText.getLength(); diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 24bbb8b69e58..8dccf7e78ced 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -601,18 +601,18 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) if (pAktCreate!=NULL) { - sal_uIntPtr nAnz=aDragStat.GetPointAnz(); + sal_uIntPtr nCount=aDragStat.GetPointAnz(); - if (nAnz<=1 && eCmd==SDRCREATE_FORCEEND) + if (nCount<=1 && eCmd==SDRCREATE_FORCEEND) { BrkCreateObj(); // objects with only a single point don't exist (at least today) return false; // sal_False = event not interpreted } - bool bPntsEq=nAnz>1; + bool bPntsEq=nCount>1; sal_uIntPtr i=1; Point aP0=aDragStat.GetPoint(0); - while (bPntsEq && i<nAnz) { bPntsEq=aP0==aDragStat.GetPoint(i); i++; } + while (bPntsEq && i<nCount) { bPntsEq=aP0==aDragStat.GetPoint(i); i++; } if (pAktCreate->EndCreate(aDragStat,eCmd)) { @@ -684,8 +684,8 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) else { // more points if (eCmd==SDRCREATE_FORCEEND || // nothing there -- force ending - nAnz==0 || // no existing points (should never happen) - (nAnz<=1 && !aDragStat.IsMinMoved())) { // MinMove not met + nCount==0 || // no existing points (should never happen) + (nCount<=1 && !aDragStat.IsMinMoved())) { // MinMove not met BrkCreateObj(); } else diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 4f1a758d40b6..50392c952144 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -72,8 +72,8 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, bool bCopy) { DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() with an empty Rect does not make sense."); if (rRect.IsEmpty()) return; - const size_t nAnz=GetMarkedObjectCount(); - if (nAnz==0) return; + const size_t nCount=GetMarkedObjectCount(); + if (nCount==0) return; Rectangle aR0(GetMarkedObjRect()); DBG_ASSERT(!aR0.IsEmpty(),"SetMarkedObjRect(): GetMarkedObjRect() is empty."); if (aR0.IsEmpty()) return; @@ -97,7 +97,7 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, bool bCopy) if (bCopy) CopyMarkedObj(); - for (size_t nm=0; nm<nAnz; ++nm) + for (size_t nm=0; nm<nCount; ++nm) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -1752,9 +1752,9 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) bool SdrEditView::IsAlignPossible() const { // at least two selected objects, at least one of them movable ForcePossibilities(); - const size_t nAnz=GetMarkedObjectCount(); - if (nAnz==0) return false; // nothing selected! - if (nAnz==1) return bMoveAllowed; // align single object to page + const size_t nCount=GetMarkedObjectCount(); + if (nCount==0) return false; // nothing selected! + if (nCount==1) return bMoveAllowed; // align single object to page return bOneOrMoreMovable; // otherwise: MarkCount>=2 } diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 9c82ab455019..06256965200f 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -540,7 +540,7 @@ bool SdrObjEditView::SdrBeginTextEdit( bTextEditDontDelete=bDontDeleteOutliner && pGivenOutliner!=NULL; bTextEditOnlyOneView=bOnlyOneView; bTextEditNewObj=bIsNewObj; - const sal_uInt32 nWinAnz(PaintWindowCount()); + const sal_uInt32 nWinCount(PaintWindowCount()); sal_uInt32 i; bool bBrk(false); // break, when no object given @@ -552,7 +552,7 @@ bool SdrObjEditView::SdrBeginTextEdit( if(!bBrk && !pWin) { - for(i = 0L; i < nWinAnz && !pWin; i++) + for(i = 0L; i < nWinCount && !pWin; i++) { SdrPaintWindow* pPaintWindow = GetPaintWindow(i); @@ -697,7 +697,7 @@ bool SdrObjEditView::SdrBeginTextEdit( // register all windows as OutlinerViews with the Outliner if(!bOnlyOneView) { - for(i = 0L; i < nWinAnz; i++) + for(i = 0L; i < nWinCount; i++) { SdrPaintWindow* pPaintWindow = GetPaintWindow(i); OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); @@ -1086,8 +1086,8 @@ OutlinerView* SdrObjEditView::ImpFindOutlinerView(vcl::Window* pWin) const if (pWin==NULL) return NULL; if (pTextEditOutliner==NULL) return NULL; OutlinerView* pNewView=NULL; - sal_uIntPtr nWinAnz=pTextEditOutliner->GetViewCount(); - for (sal_uIntPtr i=0; i<nWinAnz && pNewView==NULL; i++) { + sal_uIntPtr nWinCount=pTextEditOutliner->GetViewCount(); + for (sal_uIntPtr i=0; i<nWinCount && pNewView==NULL; i++) { OutlinerView* pView=pTextEditOutliner->GetView(i); if (pView->GetWindow()==pWin) pNewView=pView; } diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index b0991ab9a9ff..d441a8e6f9d0 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -1189,14 +1189,14 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMapModeAction& rAct) void ImpSdrGDIMetaFileImport::MapScaling() { - const size_t nAnz(maTmpList.size()); + const size_t nCount(maTmpList.size()); const MapMode& rMap = maVD.GetMapMode(); Point aMapOrg( rMap.GetOrigin() ); bool bMov2(aMapOrg.X() != 0 || aMapOrg.Y() != 0); if(bMov2) { - for(size_t i = mnMapScalingOfs; i < nAnz; i++) + for(size_t i = mnMapScalingOfs; i < nCount; i++) { SdrObject* pObj = maTmpList[i]; @@ -1204,7 +1204,7 @@ void ImpSdrGDIMetaFileImport::MapScaling() } } - mnMapScalingOfs = nAnz; + mnMapScalingOfs = nCount; } diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index c19a3ccd507b..bc69407a219a 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -267,8 +267,8 @@ bool SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrO void SdrGluePointList::Clear() { - sal_uInt16 nAnz=GetCount(); - for (sal_uInt16 i=0; i<nAnz; i++) { + sal_uInt16 nCount=GetCount(); + for (sal_uInt16 i=0; i<nCount; i++) { delete GetObject(i); } aList.clear(); @@ -277,8 +277,8 @@ void SdrGluePointList::Clear() void SdrGluePointList::operator=(const SdrGluePointList& rSrcList) { if (GetCount()!=0) Clear(); - sal_uInt16 nAnz=rSrcList.GetCount(); - for (sal_uInt16 i=0; i<nAnz; i++) { + sal_uInt16 nCount=rSrcList.GetCount(); + for (sal_uInt16 i=0; i<nCount; i++) { Insert(rSrcList[i]); } } @@ -289,17 +289,17 @@ sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP) { SdrGluePoint* pGP=new SdrGluePoint(rGP); sal_uInt16 nId=pGP->GetId(); - sal_uInt16 nAnz=GetCount(); - sal_uInt16 nInsPos=nAnz; - sal_uInt16 nLastId=nAnz!=0 ? GetObject(nAnz-1)->GetId() : 0; - DBG_ASSERT(nLastId>=nAnz,"SdrGluePointList::Insert(): nLastId<nAnz"); - bool bHole = nLastId>nAnz; + sal_uInt16 nCount=GetCount(); + sal_uInt16 nInsPos=nCount; + sal_uInt16 nLastId=nCount!=0 ? GetObject(nCount-1)->GetId() : 0; + DBG_ASSERT(nLastId>=nCount,"SdrGluePointList::Insert(): nLastId<nCount"); + bool bHole = nLastId>nCount; if (nId<=nLastId) { if (!bHole || nId==0) { nId=nLastId+1; } else { bool bBrk = false; - for (sal_uInt16 nNum=0; nNum<nAnz && !bBrk; nNum++) { + for (sal_uInt16 nNum=0; nNum<nCount && !bBrk; nNum++) { const SdrGluePoint* pGP2=GetObject(nNum); sal_uInt16 nTmpId=pGP2->GetId(); if (nTmpId==nId) { @@ -320,8 +320,8 @@ sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP) void SdrGluePointList::Invalidate(vcl::Window& rWin, const SdrObject* pObj) const { - sal_uInt16 nAnz=GetCount(); - for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nCount=GetCount(); + for (sal_uInt16 nNum=0; nNum<nCount; nNum++) { GetObject(nNum)->Invalidate(rWin,pObj); } } @@ -330,9 +330,9 @@ sal_uInt16 SdrGluePointList::FindGluePoint(sal_uInt16 nId) const { // TODO: Implement a better search algorithm // List should be sorted at all times! - sal_uInt16 nAnz=GetCount(); + sal_uInt16 nCount=GetCount(); sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND; - for (sal_uInt16 nNum=0; nNum<nAnz && nRet==SDRGLUEPOINT_NOTFOUND; nNum++) { + for (sal_uInt16 nNum=0; nNum<nCount && nRet==SDRGLUEPOINT_NOTFOUND; nNum++) { const SdrGluePoint* pGP=GetObject(nNum); if (pGP->GetId()==nId) nRet=nNum; } @@ -341,10 +341,10 @@ sal_uInt16 SdrGluePointList::FindGluePoint(sal_uInt16 nId) const sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack, bool bNext, sal_uInt16 nId0) const { - sal_uInt16 nAnz=GetCount(); + sal_uInt16 nCount=GetCount(); sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND; - sal_uInt16 nNum=bBack ? 0 : nAnz; - while ((bBack ? nNum<nAnz : nNum>0) && nRet==SDRGLUEPOINT_NOTFOUND) { + sal_uInt16 nNum=bBack ? 0 : nCount; + while ((bBack ? nNum<nCount : nNum>0) && nRet==SDRGLUEPOINT_NOTFOUND) { if (!bBack) nNum--; const SdrGluePoint* pGP=GetObject(nNum); if (bNext) { @@ -359,16 +359,16 @@ sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut void SdrGluePointList::SetReallyAbsolute(bool bOn, const SdrObject& rObj) { - sal_uInt16 nAnz=GetCount(); - for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nCount=GetCount(); + for (sal_uInt16 nNum=0; nNum<nCount; nNum++) { GetObject(nNum)->SetReallyAbsolute(bOn,rObj); } } void SdrGluePointList::Rotate(const Point& rRef, long nAngle, double sn, double cs, const SdrObject* pObj) { - sal_uInt16 nAnz=GetCount(); - for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nCount=GetCount(); + for (sal_uInt16 nNum=0; nNum<nCount; nNum++) { GetObject(nNum)->Rotate(rRef,nAngle,sn,cs,pObj); } } @@ -382,16 +382,16 @@ void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, const SdrO void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, long nAngle, const SdrObject* pObj) { - sal_uInt16 nAnz=GetCount(); - for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nCount=GetCount(); + for (sal_uInt16 nNum=0; nNum<nCount; nNum++) { GetObject(nNum)->Mirror(rRef1,rRef2,nAngle,pObj); } } void SdrGluePointList::Shear(const Point& rRef, long nAngle, double tn, bool bVShear, const SdrObject* pObj) { - sal_uInt16 nAnz=GetCount(); - for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nCount=GetCount(); + for (sal_uInt16 nNum=0; nNum<nCount; nNum++) { GetObject(nNum)->Shear(rRef,nAngle,tn,bVShear,pObj); } } diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index a7ddf84d4157..66e3bc1a938c 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -2166,9 +2166,9 @@ void SdrHdlList::AddHdl(SdrHdl* pHdl, bool bAtBegin) SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, bool bBack, bool bNext, SdrHdl* pHdl0) const { SdrHdl* pRet=NULL; - const size_t nAnz=GetHdlCount(); - size_t nNum=bBack ? 0 : nAnz; - while ((bBack ? nNum<nAnz : nNum>0) && pRet==NULL) + const size_t nCount=GetHdlCount(); + size_t nNum=bBack ? 0 : nCount; + while ((bBack ? nNum<nCount : nNum>0) && pRet==NULL) { if (!bBack) nNum--; diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx index 2c366e7b4e89..0aa9fb1261a3 100644 --- a/svx/source/svdraw/svdhlpln.cxx +++ b/svx/source/svdraw/svdhlpln.cxx @@ -76,8 +76,8 @@ Rectangle SdrHelpLine::GetBoundRect(const OutputDevice& rOut) const void SdrHelpLineList::Clear() { - sal_uInt16 nAnz=GetCount(); - for (sal_uInt16 i=0; i<nAnz; i++) { + sal_uInt16 nCount=GetCount(); + for (sal_uInt16 i=0; i<nCount; i++) { delete GetObject(i); } aList.clear(); @@ -86,8 +86,8 @@ void SdrHelpLineList::Clear() void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList) { Clear(); - sal_uInt16 nAnz=rSrcList.GetCount(); - for (sal_uInt16 i=0; i<nAnz; i++) { + sal_uInt16 nCount=rSrcList.GetCount(); + for (sal_uInt16 i=0; i<nCount; i++) { Insert(rSrcList[i]); } } @@ -95,10 +95,10 @@ void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList) bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const { bool bEqual = false; - sal_uInt16 nAnz=GetCount(); - if (nAnz==rSrcList.GetCount()) { + sal_uInt16 nCount=GetCount(); + if (nCount==rSrcList.GetCount()) { bEqual = true; - for (sal_uInt16 i=0; i<nAnz && bEqual; i++) { + for (sal_uInt16 i=0; i<nCount && bEqual; i++) { if (*GetObject(i)!=*rSrcList.GetObject(i)) { bEqual = false; } @@ -109,8 +109,8 @@ bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const sal_uInt16 SdrHelpLineList::HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const { - sal_uInt16 nAnz=GetCount(); - for (sal_uInt16 i=nAnz; i>0;) { + sal_uInt16 nCount=GetCount(); + for (sal_uInt16 i=nCount; i>0;) { i--; if (GetObject(i)->IsHit(rPnt,nTolLog,rOut)) return i; } diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 4a141bf9b416..581fc860206a 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -277,8 +277,8 @@ void _SdrItemBrowserControl::ImpCtor() void _SdrItemBrowserControl::Clear() { - sal_uIntPtr nAnz=aList.size(); - for (sal_uIntPtr nNum=0; nNum<nAnz; nNum++) { + sal_uIntPtr nCount=aList.size(); + for (sal_uIntPtr nNum=0; nNum<nCount; nNum++) { delete ImpGetEntry(nNum); } aList.clear(); @@ -466,9 +466,9 @@ void _SdrItemBrowserControl::ImpRestoreWhich() { if (nLastWhich!=0) { bool bFnd = false; - sal_uIntPtr nAnz=aList.size(); + sal_uIntPtr nCount=aList.size(); sal_uIntPtr nNum; - for (nNum=0; nNum<nAnz && !bFnd; nNum++) { + for (nNum=0; nNum<nCount && !bFnd; nNum++) { ImpItemListRow* pEntry=ImpGetEntry(nNum); if (!pEntry->bComment) { sal_uInt16 nWh=pEntry->nWhichId; @@ -837,10 +837,10 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI if (eKind!=SDREDGE_ORTHOLINES && eKind!=SDREDGE_BEZIER) return true; } if (ImpGetItem(*pSet,SDRATTR_EDGELINEDELTAANZ,pItem)) { - sal_uInt16 nAnz=static_cast<const SdrEdgeLineDeltaAnzItem*>(pItem)->GetValue(); - if (nAnz==0) return true; - if (nAnz==1 && nWhich>SDRATTR_EDGELINE1DELTA) return true; - if (nAnz==2 && nWhich>SDRATTR_EDGELINE2DELTA) return true; + sal_uInt16 nCount=static_cast<const SdrEdgeLineDeltaAnzItem*>(pItem)->GetValue(); + if (nCount==0) return true; + if (nCount==1 && nWhich>SDRATTR_EDGELINE1DELTA) return true; + if (nCount==2 && nWhich>SDRATTR_EDGELINE2DELTA) return true; } } break; diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 11a193ef9585..3b71ed1f3454 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -175,8 +175,8 @@ const SdrLayerAdmin& SdrLayerAdmin::operator=(const SdrLayerAdmin& rSrcLayerAdmi ClearLayer(); pParent=rSrcLayerAdmin.pParent; sal_uInt16 i; - sal_uInt16 nAnz=rSrcLayerAdmin.GetLayerCount(); - for (i=0; i<nAnz; i++) { + sal_uInt16 nCount=rSrcLayerAdmin.GetLayerCount(); + for (i=0; i<nCount; i++) { aLayer.push_back(new SdrLayer(*rSrcLayerAdmin.GetLayer(i))); } return *this; @@ -188,9 +188,9 @@ bool SdrLayerAdmin::operator==(const SdrLayerAdmin& rCmpLayerAdmin) const aLayer.size()!=rCmpLayerAdmin.aLayer.size()) return false; bool bOk = true; - sal_uInt16 nAnz=GetLayerCount(); + sal_uInt16 nCount=GetLayerCount(); sal_uInt16 i=0; - while (bOk && i<nAnz) { + while (bOk && i<nCount) { bOk=*GetLayer(i)==*rCmpLayerAdmin.GetLayer(i); i++; } @@ -201,9 +201,9 @@ void SdrLayerAdmin::SetModel(SdrModel* pNewModel) { if (pNewModel!=pModel) { pModel=pNewModel; - sal_uInt16 nAnz=GetLayerCount(); + sal_uInt16 nCount=GetLayerCount(); sal_uInt16 i; - for (i=0; i<nAnz; i++) { + for (i=0; i<nCount; i++) { GetLayer(i)->SetModel(pNewModel); } } diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 01129c692591..17922d1a6ad4 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -254,10 +254,10 @@ void SdrMarkList::ImpForceSort() if(!mbSorted) { mbSorted = true; - size_t nAnz = maList.size(); + size_t nCount = maList.size(); // remove invalid - if(nAnz > 0 ) + if(nCount > 0 ) { for(std::vector<SdrMark*>::iterator it = maList.begin(); it != maList.end(); ) { @@ -270,10 +270,10 @@ void SdrMarkList::ImpForceSort() else ++it; } - nAnz = maList.size(); + nCount = maList.size(); } - if(nAnz > 1) + if(nCount > 1) { std::sort(maList.begin(), maList.end(), ImpSdrMarkListSorter); @@ -373,9 +373,9 @@ size_t SdrMarkList::FindObject(const SdrObject* pObj) const void SdrMarkList::InsertEntry(const SdrMark& rMark, bool bChkSort) { SetNameDirty(); - const size_t nAnz(maList.size()); + const size_t nCount(maList.size()); - if(!bChkSort || !mbSorted || nAnz == 0) + if(!bChkSort || !mbSorted || nCount == 0) { if(!bChkSort) mbSorted = false; @@ -384,7 +384,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool bChkSort) } else { - SdrMark* pLast = GetMark(nAnz - 1); + SdrMark* pLast = GetMark(nCount - 1); const SdrObject* pLastObj = pLast->GetMarkedSdrObj(); const SdrObject* pNeuObj = rMark.GetMarkedSdrObj(); @@ -459,7 +459,7 @@ void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, size_t nNum) void SdrMarkList::Merge(const SdrMarkList& rSrcList, bool bReverse) { - const size_t nAnz(rSrcList.maList.size()); + const size_t nCount(rSrcList.maList.size()); if(rSrcList.mbSorted) { @@ -469,7 +469,7 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, bool bReverse) if(!bReverse) { - for(size_t i = 0; i < nAnz; ++i) + for(size_t i = 0; i < nCount; ++i) { SdrMark* pM = rSrcList.maList[i]; InsertEntry(*pM); @@ -477,7 +477,7 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, bool bReverse) } else { - for(size_t i = nAnz; i > 0;) + for(size_t i = nCount; i > 0;) { --i; SdrMark* pM = rSrcList.maList[i]; @@ -534,9 +534,9 @@ bool SdrMarkList::InsertPageView(const SdrPageView& rPV) const OUString& SdrMarkList::GetMarkDescription() const { - const size_t nAnz(GetMarkCount()); + const size_t nCount(GetMarkCount()); - if(mbNameOk && 1L == nAnz) + if(mbNameOk && 1L == nCount) { // if it's a single selection, cache only text frame const SdrObject* pObj = GetMark(0)->GetMarkedSdrObj(); @@ -553,11 +553,11 @@ const OUString& SdrMarkList::GetMarkDescription() const SdrMark* pMark = GetMark(0); OUString aNam; - if(!nAnz) + if(!nCount) { const_cast<SdrMarkList*>(this)->maMarkName = ImpGetResStr(STR_ObjNameNoObj); } - else if(1L == nAnz) + else if(1L == nCount) { if(pMark->GetMarkedSdrObj()) { @@ -584,7 +584,7 @@ const OUString& SdrMarkList::GetMarkDescription() const } } - aNam = OUString::number( nAnz ) + " " + aNam; + aNam = OUString::number( nCount ) + " " + aNam; } const_cast<SdrMarkList*>(this)->maMarkName = aNam; @@ -607,16 +607,16 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const { const SdrMark* pMark = GetMark(nMarkNum); const SdrUShortCont* pPts = bGlue ? pMark->GetMarkedGluePoints() : pMark->GetMarkedPoints(); - const size_t nAnz(pPts ? pPts->size() : 0); + const size_t nCount(pPts ? pPts->size() : 0); - if(nAnz) + if(nCount) { if(n1stMarkNum == SAL_MAX_SIZE) { n1stMarkNum = nMarkNum; } - nMarkPtAnz += nAnz; + nMarkPtAnz += nCount; nMarkPtObjAnz++; } diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 3413d3020e68..3ca60fa8bfd0 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -50,7 +50,7 @@ bool SdrMarkView::HasMarkablePoints() const sal_uIntPtr SdrMarkView::GetMarkablePointCount() const { ForceUndirtyMrkPnt(); - sal_uIntPtr nAnz=0; + sal_uIntPtr nCount=0; if (!ImpIsFrameHandles()) { const size_t nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz<=static_cast<size_t>(nFrameHandlesLimit)) { @@ -58,12 +58,12 @@ sal_uIntPtr SdrMarkView::GetMarkablePointCount() const const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); if (pObj->IsPolyObj()) { - nAnz+=pObj->GetPointCount(); + nCount+=pObj->GetPointCount(); } } } } - return nAnz; + return nCount; } bool SdrMarkView::HasMarkedPoints() const @@ -86,18 +86,18 @@ bool SdrMarkView::HasMarkedPoints() const sal_uIntPtr SdrMarkView::GetMarkedPointCount() const { ForceUndirtyMrkPnt(); - sal_uIntPtr nAnz=0; + sal_uIntPtr nCount=0; if (!ImpIsFrameHandles()) { size_t nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz<=static_cast<size_t>(nFrameHandlesLimit)) { for (size_t nMarkNum=0; nMarkNum<nMarkAnz; ++nMarkNum) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedPoints(); - if (pPts!=NULL) nAnz+=pPts->size(); + if (pPts!=NULL) nCount+=pPts->size(); } } } - return nAnz; + return nCount; } bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const @@ -153,8 +153,8 @@ bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark) { if (!bUnmark) { - sal_uInt32 nAnz(pObj->GetPlusHdlCount(*pHdl)); - for (sal_uInt32 i=0; i<nAnz; i++) + sal_uInt32 nCount(pObj->GetPlusHdlCount(*pHdl)); + for (sal_uInt32 i=0; i<nCount; i++) { SdrHdl* pPlusHdl=pObj->GetPlusHdl(*pHdl,i); if (pPlusHdl!=NULL) diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 3ff4238eabb8..269514b16697 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1286,8 +1286,8 @@ SdrHdl* SdrObject::GetPlusHdl(const SdrHdl& /*rHdl*/, sal_uInt32 /*nPlNum*/) con void SdrObject::AddToHdlList(SdrHdlList& rHdlList) const { - sal_uInt32 nAnz=GetHdlCount(); - for (sal_uInt32 i=0L; i<nAnz; i++) { + sal_uInt32 nCount=GetHdlCount(); + for (sal_uInt32 i=0L; i<nCount; i++) { SdrHdl* pHdl=GetHdl(i); if (pHdl!=NULL) { rHdlList.AddHdl(pHdl); @@ -1886,8 +1886,8 @@ void SdrObject::BurnInStyleSheetAttributes() SdrObjUserData* SdrObject::ImpGetMacroUserData() const { SdrObjUserData* pData=NULL; - sal_uInt16 nAnz=GetUserDataCount(); - for (sal_uInt16 nNum=nAnz; nNum>0 && pData==NULL;) { + sal_uInt16 nCount=GetUserDataCount(); + for (sal_uInt16 nNum=nCount; nNum>0 && pData==NULL;) { nNum--; pData=GetUserData(nNum); if (!pData->HasMacro(this)) pData=NULL; @@ -2865,10 +2865,10 @@ void SdrObject::AppendUserData(SdrObjUserData* pData) void SdrObject::DeleteUserData(sal_uInt16 nNum) { - sal_uInt16 nAnz=GetUserDataCount(); - if (nNum<nAnz) { + sal_uInt16 nCount=GetUserDataCount(); + if (nNum<nCount) { pPlusData->pUserDataList->DeleteUserData(nNum); - if (nAnz==1) { + if (nCount==1) { delete pPlusData->pUserDataList; pPlusData->pUserDataList=NULL; } diff --git a/svx/source/svdraw/svdobjplusdata.cxx b/svx/source/svdraw/svdobjplusdata.cxx index b9d7da8423cc..cc8fd35ba039 100644 --- a/svx/source/svdraw/svdobjplusdata.cxx +++ b/svx/source/svdraw/svdobjplusdata.cxx @@ -34,10 +34,10 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const { SdrObjPlusData* pNeuPlusData=new SdrObjPlusData; if (pUserDataList!=NULL) { - sal_uInt16 nAnz=pUserDataList->GetUserDataCount(); - if (nAnz!=0) { + sal_uInt16 nCount=pUserDataList->GetUserDataCount(); + if (nCount!=0) { pNeuPlusData->pUserDataList=new SdrObjUserDataList; - for (sal_uInt16 i=0; i<nAnz; i++) { + for (sal_uInt16 i=0; i<nCount; i++) { SdrObjUserData* pNeuUserData=pUserDataList->GetUserData(i)->Clone(pObj1); if (pNeuUserData!=NULL) { pNeuPlusData->pUserDataList->AppendUserData(pNeuUserData); diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index d556b6493fac..8c37b809ae1d 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -271,9 +271,9 @@ basegfx::B2DPolyPolygon SdrCaptionObj::TakeXorPoly() const sal_uInt32 SdrCaptionObj::GetHdlCount() const { - sal_uInt32 nAnz1(SdrRectObj::GetHdlCount()); + sal_uInt32 nCount1(SdrRectObj::GetHdlCount()); // Currently only dragging the tail's end is implemented. - return nAnz1 + 1L; + return nCount1 + 1L; } SdrHdl* SdrCaptionObj::GetHdl(sal_uInt32 nHdlNum) const diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index d2122907422f..f0a3591f6b32 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -781,16 +781,16 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& if (bAuto2) rCon2.bAutoVertex=true; sal_uInt16 nBestAuto1=0; sal_uInt16 nBestAuto2=0; - sal_uInt16 nAnz1=bAuto1 ? 4 : 1; - sal_uInt16 nAnz2=bAuto2 ? 4 : 1; - for (sal_uInt16 nNum1=0; nNum1<nAnz1; nNum1++) { + sal_uInt16 nCount1=bAuto1 ? 4 : 1; + sal_uInt16 nCount2=bAuto2 ? 4 : 1; + for (sal_uInt16 nNum1=0; nNum1<nCount1; nNum1++) { if (bAuto1) rCon1.nConId=nNum1; if (bCon1 && rCon1.TakeGluePoint(aGP1,true)) { aPt1=aGP1.GetPos(); nEsc1=aGP1.GetEscDir(); if (nEsc1==SDRESC_SMART) nEsc1=ImpCalcEscAngle(rCon1.pObj,aPt1-rCon1.aObjOfs); } - for (sal_uInt16 nNum2=0; nNum2<nAnz2; nNum2++) { + for (sal_uInt16 nNum2=0; nNum2<nCount2; nNum2++) { if (bAuto2) rCon2.nConId=nNum2; if (bCon2 && rCon2.TakeGluePoint(aGP2,true)) { aPt2=aGP2.GetPos(); @@ -2389,9 +2389,9 @@ sal_uInt32 SdrEdgeObj::GetSnapPointCount() const Point SdrEdgeObj::GetSnapPoint(sal_uInt32 i) const { ((SdrEdgeObj*)this)->ImpUndirtyEdgeTrack(); - sal_uInt16 nAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nCount=pEdgeTrack->GetPointCount(); if (i==0) return (*pEdgeTrack)[0]; - else return (*pEdgeTrack)[nAnz-1]; + else return (*pEdgeTrack)[nCount-1]; } bool SdrEdgeObj::IsPolyObj() const @@ -2407,22 +2407,22 @@ sal_uInt32 SdrEdgeObj::GetPointCount() const Point SdrEdgeObj::GetPoint(sal_uInt32 i) const { ((SdrEdgeObj*)this)->ImpUndirtyEdgeTrack(); - sal_uInt16 nAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nCount=pEdgeTrack->GetPointCount(); if (0L == i) return (*pEdgeTrack)[0]; else - return (*pEdgeTrack)[nAnz-1]; + return (*pEdgeTrack)[nCount-1]; } void SdrEdgeObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i) { // TODO: Need an implementation to connect differently. ImpUndirtyEdgeTrack(); - sal_uInt16 nAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nCount=pEdgeTrack->GetPointCount(); if (0L == i) (*pEdgeTrack)[0]=rPnt; if (1L == i) - (*pEdgeTrack)[nAnz-1]=rPnt; + (*pEdgeTrack)[nCount-1]=rPnt; SetEdgeTrackDirty(); SetRectsDirty(); } diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 6ba01a3b1874..a02fed98cdb7 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -373,10 +373,10 @@ XPolygon ImpPathCreateUser::GetCirclePoly() const } else { XPolygon aXP(aCircCenter,nCircRadius,nCircRadius, sal_uInt16(NormAngle360(nCircStAngle+nCircRelAngle+5)/10),sal_uInt16((nCircStAngle+5)/10),false); - sal_uInt16 nAnz=aXP.GetPointCount(); - for (sal_uInt16 nNum=nAnz/2; nNum>0;) { + sal_uInt16 nCount=aXP.GetPointCount(); + for (sal_uInt16 nNum=nCount/2; nNum>0;) { nNum--; // reverse XPoly's order of points - sal_uInt16 n2=nAnz-nNum-1; + sal_uInt16 n2=nCount-nNum-1; Point aPt(aXP[nNum]); aXP[nNum]=aXP[n2]; aXP[n2]=aPt; diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index fb062df6d974..b2bb10a99412 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -148,8 +148,8 @@ void SdrTextObj::SetTextLink(const OUString& rFileName, const OUString& rFilterN void SdrTextObj::ReleaseTextLink() { ImpLinkAbmeldung(); - sal_uInt16 nAnz=GetUserDataCount(); - for (sal_uInt16 nNum=nAnz; nNum>0;) { + sal_uInt16 nCount=GetUserDataCount(); + for (sal_uInt16 nNum=nCount; nNum>0;) { nNum--; SdrObjUserData* pData=GetUserData(nNum); if (pData->GetInventor()==SdrInventor && pData->GetId()==SDRUSERDATA_OBJTEXTLINK) { @@ -248,8 +248,8 @@ bool SdrTextObj::LoadText(const OUString& rFileName, const OUString& /*rFilterNa ImpSdrObjTextLinkUserData* SdrTextObj::GetLinkUserData() const { - sal_uInt16 nAnz=GetUserDataCount(); - for (sal_uInt16 nNum=nAnz; nNum>0;) { + sal_uInt16 nCount=GetUserDataCount(); + for (sal_uInt16 nNum=nCount; nNum>0;) { nNum--; SdrObjUserData * pData=GetUserData(nNum); if (pData->GetInventor() == SdrInventor diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 51204177543e..757b517560d6 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -136,9 +136,9 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) bObjOrdNumsDirty=false; bRectsDirty =false; size_t nCloneErrCnt = 0; - const size_t nAnz = rSrcList.GetObjCount(); + const size_t nCount = rSrcList.GetObjCount(); SdrInsertReason aReason(SDRREASON_COPY); - for (size_t no=0; no<nAnz; ++no) { + for (size_t no=0; no<nCount; ++no) { SdrObject* pSO=rSrcList.GetObj(no); SdrObject* pDO = pSO->Clone(); @@ -161,7 +161,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) // BOOL SdrExchangeView::Paste(const SdrModel& rMod,...) // void SdrEditView::CopyMarked() if (nCloneErrCnt==0) { - for (size_t no=0; no<nAnz; ++no) { + for (size_t no=0; no<nCount; ++no) { const SdrObject* pSrcOb=rSrcList.GetObj(no); const SdrEdgeObj* pSrcEdge=PTR_CAST(SdrEdgeObj,pSrcOb); if (pSrcEdge!=NULL) { @@ -262,8 +262,8 @@ void SdrObjList::SetPage(SdrPage* pNewPage) { if (pPage!=pNewPage) { pPage=pNewPage; - const size_t nAnz = GetObjCount(); - for (size_t no=0; no<nAnz; ++no) { + const size_t nCount = GetObjCount(); + for (size_t no=0; no<nCount; ++no) { SdrObject* pObj=GetObj(no); pObj->SetPage(pPage); } @@ -279,8 +279,8 @@ void SdrObjList::SetModel(SdrModel* pNewModel) { if (pModel!=pNewModel) { pModel=pNewModel; - const size_t nAnz = GetObjCount(); - for (size_t i=0; i<nAnz; ++i) { + const size_t nCount = GetObjCount(); + for (size_t i=0; i<nCount; ++i) { SdrObject* pObj=GetObj(i); pObj->SetModel(pModel); } @@ -289,8 +289,8 @@ void SdrObjList::SetModel(SdrModel* pNewModel) void SdrObjList::RecalcObjOrdNums() { - const size_t nAnz = GetObjCount(); - for (size_t no=0; no<nAnz; ++no) { + const size_t nCount = GetObjCount(); + for (size_t no=0; no<nCount; ++no) { SdrObject* pObj=GetObj(no); pObj->SetOrdNum(no); } @@ -301,8 +301,8 @@ void SdrObjList::RecalcRects() { aOutRect=Rectangle(); aSnapRect=aOutRect; - const size_t nAnz = GetObjCount(); - for (size_t i=0; i<nAnz; ++i) { + const size_t nCount = GetObjCount(); + for (size_t i=0; i<nCount; ++i) { SdrObject* pObj=GetObj(i); if (i==0) { aOutRect=pObj->GetCurrentBoundRect(); @@ -335,11 +335,11 @@ void SdrObjList::NbcInsertObject(SdrObject* pObj, size_t nPos, const SdrInsertRe DBG_ASSERT(pObj!=NULL,"SdrObjList::NbcInsertObject(NULL)"); if (pObj!=NULL) { DBG_ASSERT(!pObj->IsInserted(),"ZObjekt already has the status Inserted."); - const size_t nAnz = GetObjCount(); - if (nPos>nAnz) nPos=nAnz; + const size_t nCount = GetObjCount(); + if (nPos>nCount) nPos=nCount; InsertObjectIntoContainer(*pObj,nPos); - if (nPos<nAnz) bObjOrdNumsDirty=true; + if (nPos<nCount) bObjOrdNumsDirty=true; pObj->SetOrdNum(nPos); pObj->SetObjList(this); pObj->SetPage(pPage); @@ -406,7 +406,7 @@ SdrObject* SdrObjList::NbcRemoveObject(size_t nObjNum) return NULL; } - const size_t nAnz = GetObjCount(); + const size_t nCount = GetObjCount(); SdrObject* pObj=maList[nObjNum]; RemoveObjectFromContainer(nObjNum); @@ -420,7 +420,7 @@ SdrObject* SdrObjList::NbcRemoveObject(size_t nObjNum) pObj->SetObjList(NULL); pObj->SetPage(NULL); if (!bObjOrdNumsDirty) { // optimizing for the case that the last object has to be removed - if (nObjNum+1!=nAnz) { + if (nObjNum+1!=nCount) { bObjOrdNumsDirty=true; } } @@ -437,7 +437,7 @@ SdrObject* SdrObjList::RemoveObject(size_t nObjNum) return NULL; } - const size_t nAnz = GetObjCount(); + const size_t nCount = GetObjCount(); SdrObject* pObj=maList[nObjNum]; RemoveObjectFromContainer(nObjNum); @@ -461,7 +461,7 @@ SdrObject* SdrObjList::RemoveObject(size_t nObjNum) pObj->SetObjList(NULL); pObj->SetPage(NULL); if (!bObjOrdNumsDirty) { // optimization for the case that the last object is removed - if (nObjNum+1!=nAnz) { + if (nObjNum+1!=nCount) { bObjOrdNumsDirty=true; } } @@ -627,15 +627,15 @@ const Rectangle& SdrObjList::GetAllObjBoundRect() const void SdrObjList::NbcReformatAllTextObjects() { - size_t nAnz=GetObjCount(); + size_t nCount=GetObjCount(); size_t nNum=0; - while (nNum<nAnz) + while (nNum<nCount) { SdrObject* pObj = GetObj(nNum); pObj->NbcReformatText(); - nAnz=GetObjCount(); // ReformatText may delete an object + nCount=GetObjCount(); // ReformatText may delete an object nNum++; } @@ -705,9 +705,9 @@ bool SdrObjList::IsReadOnly() const size_t SdrObjList::CountAllObjects() const { - const size_t nAnz=GetObjCount(); - size_t nCnt=nAnz; - for (size_t nNum=0; nNum<nAnz; nNum++) { + const size_t nCount=GetObjCount(); + size_t nCnt=nCount; + for (size_t nNum=0; nNum<nCount; nNum++) { SdrObjList* pSubOL=GetObj(nNum)->GetSubList(); if (pSubOL!=NULL) { nCnt+=pSubOL->CountAllObjects(); @@ -743,8 +743,8 @@ void SdrObjList::UnGroupObj( size_t nObjNum ) size_t nInsertPos( pUngroupGroup->GetOrdNum() ); SdrObject* pObj; - const size_t nAnz = pSrcLst->GetObjCount(); - for( size_t i=0; i<nAnz; ++i ) + const size_t nCount = pSrcLst->GetObjCount(); + for( size_t i=0; i<nCount; ++i ) { pObj = pSrcLst->RemoveObject(0); SdrInsertReason aReason(SDRREASON_VIEWCALL, pUngroupGroup); @@ -1031,8 +1031,8 @@ void SdrObjList::dumpAsXml(xmlTextWriterPtr pWriter) const void SdrPageGridFrameList::Clear() { - sal_uInt16 nAnz=GetCount(); - for (sal_uInt16 i=0; i<nAnz; i++) { + sal_uInt16 nCount=GetCount(); + for (sal_uInt16 i=0; i<nCount; i++) { delete GetObject(i); } aList.clear(); diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 67189471eedc..29b3b5f2bdac 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -922,13 +922,13 @@ void SdrPageView::LeaveAllGroup() sal_uInt16 SdrPageView::GetEnteredLevel() const { - sal_uInt16 nAnz=0; + sal_uInt16 nCount=0; SdrObject* pGrp=GetAktGroup(); while (pGrp!=NULL) { - nAnz++; + nCount++; pGrp=pGrp->GetUpGroup(); } - return nAnz; + return nCount; } void SdrPageView::CheckAktGroup() diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 00a61b109137..d87e109d2673 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -300,8 +300,8 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const if (bHlplVisible && bHlplSnap && !IsDragHelpLine()) { const SdrHelpLineList& rHLL=pPV->GetHelpLines(); - sal_uInt16 nAnz=rHLL.GetCount(); - for (sal_uInt16 i=nAnz; i>0;) { + sal_uInt16 nCount=rHLL.GetCount(); + for (sal_uInt16 i=nCount; i>0;) { i--; const SdrHelpLine& rHL=rHLL[i]; const Point& rPos=rHL.GetPos(); @@ -360,8 +360,8 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const if (aRect.IsInside(rPnt)) { if (bOPntSnap && nMaxPointSnapCount>0) { - sal_uInt32 nAnz(pO->GetSnapPointCount()); - for (sal_uInt32 i(0L); i < nAnz && nMaxPointSnapCount > 0L; i++) + sal_uInt32 nCount(pO->GetSnapPointCount()); + for (sal_uInt32 i(0L); i < nCount && nMaxPointSnapCount > 0L; i++) { Point aP(pO->GetSnapPoint(i)); dx1=x-aP.X(); diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index 4de3f7033571..d2a70835d72d 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -61,40 +61,40 @@ void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, con void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - sal_uInt16 nAnz=rPoly.GetSize(); - for (sal_uInt16 i=0; i<nAnz; i++) { + sal_uInt16 nCount=rPoly.GetSize(); + for (sal_uInt16 i=0; i<nCount; i++) { ResizePoint(rPoly[i],rRef,xFact,yFact); } } void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - sal_uInt16 nAnz=rPoly.GetPointCount(); - for (sal_uInt16 i=0; i<nAnz; i++) { + sal_uInt16 nCount=rPoly.GetPointCount(); + for (sal_uInt16 i=0; i<nCount; i++) { ResizePoint(rPoly[i],rRef,xFact,yFact); } } void RotatePoly(Polygon& rPoly, const Point& rRef, double sn, double cs) { - sal_uInt16 nAnz=rPoly.GetSize(); - for (sal_uInt16 i=0; i<nAnz; i++) { + sal_uInt16 nCount=rPoly.GetSize(); + for (sal_uInt16 i=0; i<nCount; i++) { RotatePoint(rPoly[i],rRef,sn,cs); } } void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs) { - sal_uInt16 nAnz=rPoly.GetPointCount(); - for (sal_uInt16 i=0; i<nAnz; i++) { + sal_uInt16 nCount=rPoly.GetPointCount(); + for (sal_uInt16 i=0; i<nCount; i++) { RotatePoint(rPoly[i],rRef,sn,cs); } } void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs) { - sal_uInt16 nAnz=rPoly.Count(); - for (sal_uInt16 i=0; i<nAnz; i++) { + sal_uInt16 nCount=rPoly.Count(); + for (sal_uInt16 i=0; i<nCount; i++) { RotateXPoly(rPoly[i],rRef,sn,cs); } } @@ -135,32 +135,32 @@ void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2) void MirrorPoly(Polygon& rPoly, const Point& rRef1, const Point& rRef2) { - sal_uInt16 nAnz=rPoly.GetSize(); - for (sal_uInt16 i=0; i<nAnz; i++) { + sal_uInt16 nCount=rPoly.GetSize(); + for (sal_uInt16 i=0; i<nCount; i++) { MirrorPoint(rPoly[i],rRef1,rRef2); } } void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2) { - sal_uInt16 nAnz=rPoly.GetPointCount(); - for (sal_uInt16 i=0; i<nAnz; i++) { + sal_uInt16 nCount=rPoly.GetPointCount(); + for (sal_uInt16 i=0; i<nCount; i++) { MirrorPoint(rPoly[i],rRef1,rRef2); } } void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, bool bVShear) { - sal_uInt16 nAnz=rPoly.GetSize(); - for (sal_uInt16 i=0; i<nAnz; i++) { + sal_uInt16 nCount=rPoly.GetSize(); + for (sal_uInt16 i=0; i<nCount; i++) { ShearPoint(rPoly[i],rRef,tn,bVShear); } } void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear) { - sal_uInt16 nAnz=rPoly.GetPointCount(); - for (sal_uInt16 i=0; i<nAnz; i++) { + sal_uInt16 nCount=rPoly.GetPointCount(); + for (sal_uInt16 i=0; i<nCount; i++) { ShearPoint(rPoly[i],rRef,tn,bVShear); } } @@ -858,12 +858,12 @@ void SdrFormatter::TakeStr(long nVal, OUString& rStr) const if(nC > 0 && aStr.getLength() <= nC ) { // decimal separator necessary - sal_Int32 nAnz(nC - aStr.getLength()); + sal_Int32 nCount(nC - aStr.getLength()); - if(nAnz >= 0 && rLoc.isNumLeadingZero()) - nAnz++; + if(nCount >= 0 && rLoc.isNumLeadingZero()) + nCount++; - for(sal_Int32 i=0; i<nAnz; i++) + for(sal_Int32 i=0; i<nCount; i++) aStr.insert(0, aNullCode); // remove superfluous decimal points diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index b901845b5614..12bf4203b9d4 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1204,8 +1204,8 @@ void SdrUndoObjSetText::SdrRepeat(SdrView& rView) rView.BegUndo(aStr); } - const size_t nAnz=rML.GetMarkCount(); - for (size_t nm=0; nm<nAnz; ++nm) + const size_t nCount=rML.GetMarkCount(); + for (size_t nm=0; nm<nCount; ++nm) { SdrObject* pObj2=rML.GetMark(nm)->GetMarkedSdrObj(); SdrTextObj* pTextObj=PTR_CAST(SdrTextObj,pObj2); diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 8f18aa72f497..7cdbc20de8f0 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -851,11 +851,11 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) bRet=MarkNextObj(aLogicPos,nHitTolLog,rVEvt.bMarkPrev); } else { SortMarkedObjects(); - const size_t nAnz0=GetMarkedObjectCount(); + const size_t nCount0=GetMarkedObjectCount(); bRet=MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark); SortMarkedObjects(); - const size_t nAnz1=GetMarkedObjectCount(); - bUnmark=nAnz1<nAnz0; + const size_t nCount1=GetMarkedObjectCount(); + bUnmark=nCount1<nCount0; } if (!bUnmark) { BegDragObj(aLogicPos,NULL,(SdrHdl*)NULL,nMinMovLog); diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 90671611bc83..98e87f75e20c 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -201,8 +201,8 @@ static vcl::Window* ImpGetViewWin(SdrView* pView) { if( pView ) { - const sal_uInt32 nAnz(pView->PaintWindowCount()); - for(sal_uInt32 nNum(0L); nNum < nAnz; nNum++) + const sal_uInt32 nCount(pView->PaintWindowCount()); + for(sal_uInt32 nNum(0L); nNum < nCount; nNum++) { OutputDevice* pOut = &(pView->GetPaintWindow(nNum)->GetOutputDevice()); diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx index 4d4ef9caaad5..da4abd4c1b13 100644 --- a/svx/source/xoutdev/_xpoly.cxx +++ b/svx/source/xoutdev/_xpoly.cxx @@ -906,11 +906,11 @@ ImpXPolyPolygon::~ImpXPolyPolygon() bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const { - size_t nAnz = aXPolyList.size(); + size_t nCount = aXPolyList.size(); const XPolygonList& rCmpList = rImpXPolyPoly.aXPolyList; - if ( nAnz != rCmpList.size() ) return false; + if ( nCount != rCmpList.size() ) return false; bool bEq=true; - for ( size_t i = nAnz; i > 0 && bEq; ) + for ( size_t i = nCount; i > 0 && bEq; ) { i--; bEq = ( *aXPolyList[ i ] == *rCmpList[ i ] ); |