svx: nObjAnz -> nObjCount

Change-Id: I1ae00035c5ae9ac620f01982d6e4fff593f7c054

6 files changed, 30 insertions, 30 deletions

diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index fd3361cb77f2..18830ea6ec56 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -153,13 +153,13 @@ bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const
 
 void SdrEditView::ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID)
 {
-    const size_t nObjAnz(pOL->GetObjCount());
+    const size_t nObjCount(pOL->GetObjCount());
     // make sure OrdNums are correct
     pOL->GetObj(0)->GetOrdNum();
 
     const bool bUndo = GetModel()->IsUndoEnabled();
 
-    for(size_t nObjNum = nObjAnz; nObjNum > 0;)
+    for(size_t nObjNum = nObjCount; nObjNum > 0;)
     {
         nObjNum--;
         SdrObject* pObj = pOL->GetObj(nObjNum);
@@ -223,13 +223,13 @@ void SdrEditView::DeleteLayer(const OUString& rName)
             {
                 // over all pages
                 SdrPage* pPage = (bMaPg) ? pMod->GetMasterPage(nPgNum) : pMod->GetPage(nPgNum);
-                const size_t nObjAnz(pPage->GetObjCount());
+                const size_t nObjCount(pPage->GetObjCount());
 
                 // make sure OrdNums are correct
-                if(nObjAnz)
+                if(nObjCount)
                     pPage->GetObj(0)->GetOrdNum();
 
-                for(size_t nObjNum(nObjAnz); nObjNum > 0;)
+                for(size_t nObjNum(nObjCount); nObjNum > 0;)
                 {
                     nObjNum--;
                     SdrObject* pObj = pPage->GetObj(nObjNum);
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index b1f8464b0076..7ddde618d4c8 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -513,9 +513,9 @@ bool SdrMarkList::InsertPageView(const SdrPageView& rPV)
     bool bChgd(false);
     DeletePageView(rPV); // delete all of them, then append the entire page
     const SdrObjList* pOL = rPV.GetObjList();
-    const size_t nObjAnz(pOL->GetObjCount());
+    const size_t nObjCount(pOL->GetObjCount());
 
-    for(size_t nO = 0; nO < nObjAnz; ++nO)
+    for(size_t nO = 0; nO < nObjCount; ++nO)
     {
         SdrObject* pObj = pOL->GetObj(nO);
         bool bDoIt(rPV.IsObjMarkable(pObj));
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 808f432de194..d6c95ed1fdb9 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -510,8 +510,8 @@ sal_uIntPtr SdrMarkView::GetMarkableObjCount() const
     if(pPV)
     {
         SdrObjList* pOL=pPV->GetObjList();
-        const size_t nObjAnz = pOL->GetObjCount();
-        for (size_t nObjNum=0; nObjNum<nObjAnz; ++nObjNum) {
+        const size_t nObjCount = pOL->GetObjCount();
+        for (size_t nObjNum=0; nObjNum<nObjCount; ++nObjNum) {
             SdrObject* pObj=pOL->GetObj(nObjNum);
             if (IsObjMarkable(pObj,pPV)) {
                 nCount++;
@@ -527,8 +527,8 @@ bool SdrMarkView::HasMarkableObj() const
     if(pPV)
     {
         SdrObjList* pOL=pPV->GetObjList();
-        const size_t nObjAnz = pOL->GetObjCount();
-        for (size_t nObjNum = 0; nObjNum<nObjAnz; ++nObjNum) {
+        const size_t nObjCount = pOL->GetObjCount();
+        for (size_t nObjNum = 0; nObjNum<nObjCount; ++nObjNum) {
             SdrObject* pObj=pOL->GetObj(nObjNum);
             if (IsObjMarkable(pObj,pPV)) {
                 return true;
@@ -1395,10 +1395,10 @@ bool SdrMarkView::MarkNextObj(bool bPrev)
 
     SdrObject* pMarkObj=NULL;
     SdrObjList* pSearchObjList=pPageView->GetObjList();
-    const size_t nObjAnz = pSearchObjList->GetObjCount();
-    if (nObjAnz!=0) {
-        if (nSearchObjNum>nObjAnz) nSearchObjNum=nObjAnz;
-        while (pMarkObj==NULL && ((!bPrev && nSearchObjNum>0) || (bPrev && nSearchObjNum<nObjAnz)))
+    const size_t nObjCount = pSearchObjList->GetObjCount();
+    if (nObjCount!=0) {
+        if (nSearchObjNum>nObjCount) nSearchObjNum=nObjCount;
+        while (pMarkObj==NULL && ((!bPrev && nSearchObjNum>0) || (bPrev && nSearchObjNum<nObjCount)))
         {
             if (!bPrev)
                 nSearchObjNum--;
@@ -1466,7 +1466,7 @@ bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev)
     }
     if (pBtmMarkHit==NULL) { pBtmMarkHit=pTopMarkHit; nBtmMarkHit=nTopMarkHit; }
     SdrObject* pBtmObjHit=pBtmMarkHit->GetMarkedSdrObj();
-    const size_t nObjAnz = pObjList->GetObjCount();
+    const size_t nObjCount = pObjList->GetObjCount();
 
     size_t nSearchBeg = 0;
     E3dScene* pScene = NULL;
@@ -1499,7 +1499,7 @@ bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev)
 
     size_t no=nSearchBeg;
     SdrObject* pFndObj=NULL;
-    while (pFndObj==NULL && ((!bPrev && no>0) || (bPrev && no<nObjAnz))) {
+    while (pFndObj==NULL && ((!bPrev && no>0) || (bPrev && no<nObjCount))) {
         if (!bPrev) no--;
         SdrObject* pObj;
 
@@ -1544,8 +1544,8 @@ bool SdrMarkView::MarkObj(const Rectangle& rRect, bool bUnmark)
     {
         pObjList=pPV->GetObjList();
         Rectangle aFrm1(aR);
-        const size_t nObjAnz = pObjList->GetObjCount();
-        for (size_t nO=0; nO<nObjAnz; ++nO) {
+        const size_t nObjCount = pObjList->GetObjCount();
+        for (size_t nO=0; nO<nObjCount; ++nO) {
             SdrObject* pObj=pObjList->GetObj(nO);
             Rectangle aRect(pObj->GetCurrentBoundRect());
             if (aFrm1.IsInside(aRect)) {
@@ -1698,9 +1698,9 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT
         bool bRemap(pOL->GetOwnerObj() && pOL->GetOwnerObj()->ISA(E3dScene));
         E3dScene* pRemapScene = (bRemap ? static_cast<E3dScene*>(pOL->GetOwnerObj()) : 0L);
 
-        const size_t nObjAnz=pOL->GetObjCount();
-        size_t nObjNum=bBack ? 0 : nObjAnz;
-        while (pRet==NULL && (bBack ? nObjNum<nObjAnz : nObjNum>0)) {
+        const size_t nObjCount=pOL->GetObjCount();
+        size_t nObjNum=bBack ? 0 : nObjCount;
+        while (pRet==NULL && (bBack ? nObjNum<nObjCount : nObjNum>0)) {
             if (!bBack) nObjNum--;
             SdrObject* pObj;
 
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 20adb07fa9b2..a8b6c5188b8d 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -590,8 +590,8 @@ void SdrObject::getMergedHierarchyLayerSet(SetOfByte& rSet) const
     rSet.Set(GetLayer());
     SdrObjList* pOL=GetSubList();
     if (pOL!=NULL) {
-        const size_t nObjAnz = pOL->GetObjCount();
-        for (size_t nObjNum = 0; nObjNum<nObjAnz; ++nObjNum) {
+        const size_t nObjCount = pOL->GetObjCount();
+        for (size_t nObjNum = 0; nObjNum<nObjCount; ++nObjNum) {
             pOL->GetObj(nObjNum)->getMergedHierarchyLayerSet(rSet);
         }
     }
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 515c439f1d1f..945a6a61cd07 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -897,8 +897,8 @@ void SdrPaintView::GlueInvalidate() const
             if(mpPageView)
             {
                 const SdrObjList* pOL=mpPageView->GetObjList();
-                const size_t nObjAnz = pOL->GetObjCount();
-                for (size_t nObjNum=0; nObjNum<nObjAnz; ++nObjNum) {
+                const size_t nObjCount = pOL->GetObjCount();
+                for (size_t nObjNum=0; nObjNum<nObjCount; ++nObjNum) {
                     const SdrObject* pObj=pOL->GetObj(nObjNum);
                     const SdrGluePointList* pGPL=pObj->GetGluePointList();
                     if (pGPL!=NULL && pGPL->GetCount()!=0) {
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 74665329c8a6..b2c85d26e3ff 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -285,9 +285,9 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSave
     {
         // it's a group object!
         pUndoGroup = new SdrUndoGroup(*pObj->GetModel());
-        const size_t nObjAnz(pOL->GetObjCount());
+        const size_t nObjCount(pOL->GetObjCount());
 
-        for(size_t nObjNum = 0; nObjNum < nObjAnz; ++nObjNum)
+        for(size_t nObjNum = 0; nObjNum < nObjCount; ++nObjNum)
         {
             pUndoGroup->AddAction(
                 new SdrUndoAttrObj(*pOL->GetObj(nObjNum), bStyleSheet1));
@@ -612,8 +612,8 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj)
         // If this were 3D scene, we'd only add an Undo for the scene itself
         // (which we do elsewhere).
         pUndoGroup=new SdrUndoGroup(*pObj->GetModel());
-        const size_t nObjAnz = pOL->GetObjCount();
-        for (size_t nObjNum = 0; nObjNum<nObjAnz; ++nObjNum) {
+        const size_t nObjCount = pOL->GetObjCount();
+        for (size_t nObjNum = 0; nObjNum<nObjCount; ++nObjNum) {
             pUndoGroup->AddAction(new SdrUndoGeoObj(*pOL->GetObj(nObjNum)));
         }
     }