svx: nMarkAnz -> nMarkCount

Change-Id: I7b1357621470694cd7ee23735e88dce91c2c0a57

10 files changed, 160 insertions, 160 deletions

diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 3011caa9b4bc..3541cd018ce1 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -368,12 +368,12 @@ void SdrDragMethod::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, s
 
 void SdrDragMethod::createSdrDragEntries_SolidDrag()
 {
-    const size_t nMarkAnz(getSdrDragView().GetMarkedObjectCount());
+    const size_t nMarkCount(getSdrDragView().GetMarkedObjectCount());
     SdrPageView* pPV = getSdrDragView().GetSdrPageView();
 
     if(pPV)
     {
-        for(size_t a = 0; a < nMarkAnz; ++a)
+        for(size_t a = 0; a < nMarkCount; ++a)
         {
             SdrMark* pM = getSdrDragView().GetSdrMarkByIndex(a);
 
@@ -428,12 +428,12 @@ void SdrDragMethod::createSdrDragEntries_SolidDrag()
 
 void SdrDragMethod::createSdrDragEntries_PolygonDrag()
 {
-    const size_t nMarkAnz(getSdrDragView().GetMarkedObjectCount());
-    bool bNoPolygons(getSdrDragView().IsNoDragXorPolys() || nMarkAnz > getSdrDragView().GetDragXorPolyLimit());
+    const size_t nMarkCount(getSdrDragView().GetMarkedObjectCount());
+    bool bNoPolygons(getSdrDragView().IsNoDragXorPolys() || nMarkCount > getSdrDragView().GetDragXorPolyLimit());
     basegfx::B2DPolyPolygon aResult;
     sal_uInt32 nPointCount(0);
 
-    for(size_t a = 0; !bNoPolygons && a < nMarkAnz; ++a)
+    for(size_t a = 0; !bNoPolygons && a < nMarkCount; ++a)
     {
         SdrMark* pM = getSdrDragView().GetSdrMarkByIndex(a);
 
@@ -475,10 +475,10 @@ void SdrDragMethod::createSdrDragEntries_PolygonDrag()
 
 void SdrDragMethod::createSdrDragEntries_PointDrag()
 {
-    const size_t nMarkAnz(getSdrDragView().GetMarkedObjectCount());
+    const size_t nMarkCount(getSdrDragView().GetMarkedObjectCount());
     std::vector< basegfx::B2DPoint > aPositions;
 
-    for(size_t nm = 0; nm < nMarkAnz; ++nm)
+    for(size_t nm = 0; nm < nMarkCount; ++nm)
     {
         SdrMark* pM = getSdrDragView().GetSdrMarkByIndex(nm);
 
@@ -521,10 +521,10 @@ void SdrDragMethod::createSdrDragEntries_PointDrag()
 
 void SdrDragMethod::createSdrDragEntries_GlueDrag()
 {
-    const size_t nMarkAnz(getSdrDragView().GetMarkedObjectCount());
+    const size_t nMarkCount(getSdrDragView().GetMarkedObjectCount());
     std::vector< basegfx::B2DPoint > aPositions;
 
-    for(size_t nm = 0; nm < nMarkAnz; ++nm)
+    for(size_t nm = 0; nm < nMarkCount; ++nm)
     {
         SdrMark* pM = getSdrDragView().GetSdrMarkByIndex(nm);
 
@@ -1681,9 +1681,9 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
         { // restrict glue points to the BoundRect of the Obj
             aPt1-=DragStat().GetStart();
             const SdrMarkList& rML=GetMarkedObjectList();
-            const size_t nMarkAnz=rML.GetMarkCount();
+            const size_t nMarkCount=rML.GetMarkCount();
 
-            for (size_t nMarkNum=0; nMarkNum<nMarkAnz; ++nMarkNum)
+            for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum)
             {
                 const SdrMark* pM=rML.GetMark(nMarkNum);
                 const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
@@ -3407,9 +3407,9 @@ bool SdrDragCrook::EndSdrDrag(bool bCopy)
                 if (bCopy)
                     getSdrDragView().CopyMarkedObj();
 
-                const size_t nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount();
+                const size_t nMarkCount=getSdrDragView().GetMarkedObjectList().GetMarkCount();
 
-                for (size_t nm=0; nm<nMarkAnz; ++nm)
+                for (size_t nm=0; nm<nMarkCount; ++nm)
                 {
                     SdrMark* pM=getSdrDragView().GetMarkedObjectList().GetMark(nm);
                     SdrObject* pO=pM->GetMarkedSdrObj();
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 714552adb5f7..64a40d145d61 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -472,14 +472,14 @@ void SdrEditView::CheckPossibilities()
     if (bPossibilitiesDirty) {
         ImpResetPossibilityFlags();
         SortMarkedObjects();
-        const size_t nMarkAnz=GetMarkedObjectCount();
-        if (nMarkAnz!=0) {
-            bReverseOrderPossible=nMarkAnz>=2;
+        const size_t nMarkCount=GetMarkedObjectCount();
+        if (nMarkCount!=0) {
+            bReverseOrderPossible=nMarkCount>=2;
 
             size_t nMovableCount=0;
-            bGroupPossible=nMarkAnz>=2;
-            bCombinePossible=nMarkAnz>=2;
-            if (nMarkAnz==1) {
+            bGroupPossible=nMarkCount>=2;
+            bCombinePossible=nMarkCount>=2;
+            if (nMarkCount==1) {
                 // check bCombinePossible more thoroughly
                 // still missing ...
                 const SdrObject* pObj=GetMarkedObjectByIndex(0);
@@ -507,8 +507,8 @@ void SdrEditView::CheckPossibilities()
             bCanConvToContour = true;
 
             // these ones are only allowed when single object is selected
-            bTransparenceAllowed = (nMarkAnz == 1);
-            bGradientAllowed = (nMarkAnz == 1);
+            bTransparenceAllowed = (nMarkCount == 1);
+            bGradientAllowed = (nMarkCount == 1);
             if(bGradientAllowed)
             {
                 // gradient depends on fill style
@@ -534,7 +534,7 @@ void SdrEditView::CheckPossibilities()
             bool bNoMovRotFound=false;
             const SdrPageView* pPV0=NULL;
 
-            for (size_t nm=0; nm<nMarkAnz; ++nm) {
+            for (size_t nm=0; nm<nMarkCount; ++nm) {
                 const SdrMark* pM=GetSdrMarkByIndex(nm);
                 const SdrObject* pObj=pM->GetMarkedSdrObj();
                 const SdrPageView* pPV=pM->GetPageView();
@@ -618,7 +618,7 @@ void SdrEditView::CheckPossibilities()
                 }
             }
 
-            bMoreThanOneNotMovable=nMovableCount<nMarkAnz-1;
+            bMoreThanOneNotMovable=nMovableCount<nMarkCount-1;
             bOneOrMoreMovable=nMovableCount!=0;
             bGrpEnterPossible=bUnGroupPossible;
         }
@@ -635,7 +635,7 @@ void SdrEditView::CheckPossibilities()
         if (bMoveAllowed) {
             // Don't allow moving glued connectors.
             // Currently only implemented for single selection.
-            if (nMarkAnz==1) {
+            if (nMarkCount==1) {
                 SdrObject* pObj=GetMarkedObjectByIndex(0);
                 SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj);
                 if (pEdge!=NULL) {
@@ -692,15 +692,15 @@ void SdrEditView::DeleteMarkedList(const SdrMarkList& rMark)
         const bool bUndo = IsUndoEnabled();
         if( bUndo )
             BegUndo();
-        const size_t nMarkAnz(rMark.GetMarkCount());
+        const size_t nMarkCount(rMark.GetMarkCount());
 
-        if(nMarkAnz)
+        if(nMarkCount)
         {
             std::vector< E3DModifySceneSnapRectUpdater* > aUpdaters;
 
             if( bUndo )
             {
-                for(size_t nm = nMarkAnz; nm > 0;)
+                for(size_t nm = nMarkCount; nm > 0;)
                 {
                     --nm;
                     SdrMark* pM = rMark.GetMark(nm);
@@ -719,7 +719,7 @@ void SdrEditView::DeleteMarkedList(const SdrMarkList& rMark)
 
             std::vector< SdrObject* > aRemoved3DObjects;
 
-            for(size_t nm = nMarkAnz; nm > 0;)
+            for(size_t nm = nMarkCount; nm > 0;)
             {
                 --nm;
                 SdrMark* pM = rMark.GetMark(nm);
@@ -895,8 +895,8 @@ void SdrEditView::CopyMarkedObj()
 
     GetMarkedObjectListWriteAccess().Clear();
     size_t nCloneErrCnt=0;
-    const size_t nMarkAnz=aSourceObjectsForCopy.GetMarkCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm) {
+    const size_t nMarkCount=aSourceObjectsForCopy.GetMarkCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm) {
         SdrMark* pM=aSourceObjectsForCopy.GetMark(nm);
         SdrObject* pO=pM->GetMarkedSdrObj()->Clone();
         if (pO!=NULL) {
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 50392c952144..f40c7e31ce21 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -195,8 +195,8 @@ void SdrEditView::MoveMarkedObj(const Size& rSiz, bool bCopy)
     if (bCopy)
         CopyMarkedObj();
 
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm)
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -228,8 +228,8 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons
     if (bCopy)
         CopyMarkedObj();
 
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm)
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -265,8 +265,8 @@ void SdrEditView::ResizeMultMarkedObj(const Point& rRef,
     if (bCopy)
         CopyMarkedObj();
 
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm)
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -305,8 +305,8 @@ long SdrEditView::GetMarkedObjRotate() const
     //sal_Bool b1st=true;
     //sal_Bool bOk=true;
     //long nAngle=0;
-    //sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
-    //for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) {
+    //sal_uIntPtr nMarkCount=GetMarkedObjectCount();
+    //for (sal_uIntPtr nm=0; nm<nMarkCount && bOk; nm++) {
     //  SdrMark* pM=GetSdrMarkByIndex(nm);
     //  SdrObject* pO=pM->GetMarkedSdrObj();
     //  long nAngle2=pO->GetRotateAngle();
@@ -334,13 +334,13 @@ void SdrEditView::RotateMarkedObj(const Point& rRef, long nAngle, bool bCopy)
 
     double nSin=sin(nAngle*nPi180);
     double nCos=cos(nAngle*nPi180);
-    const size_t nMarkAnz(GetMarkedObjectCount());
+    const size_t nMarkCount(GetMarkedObjectCount());
 
-    if(nMarkAnz)
+    if(nMarkCount)
     {
         std::vector< E3DModifySceneSnapRectUpdater* > aUpdaters;
 
-        for(size_t nm = 0; nm < nMarkAnz; ++nm)
+        for(size_t nm = 0; nm < nMarkCount; ++nm)
         {
             SdrMark* pM = GetSdrMarkByIndex(nm);
             SdrObject* pO = pM->GetMarkedSdrObj();
@@ -394,13 +394,13 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b
     if (bCopy)
         CopyMarkedObj();
 
-    const size_t nMarkAnz(GetMarkedObjectCount());
+    const size_t nMarkCount(GetMarkedObjectCount());
 
-    if(nMarkAnz)
+    if(nMarkCount)
     {
         std::vector< E3DModifySceneSnapRectUpdater* > aUpdaters;
 
-        for(size_t nm = 0; nm < nMarkAnz; ++nm)
+        for(size_t nm = 0; nm < nMarkCount; ++nm)
         {
             SdrMark* pM = GetSdrMarkByIndex(nm);
             SdrObject* pO = pM->GetMarkedSdrObj();
@@ -456,8 +456,8 @@ long SdrEditView::GetMarkedObjShear() const
     bool b1st=true;
     bool bOk=true;
     long nAngle=0;
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz && bOk; ++nm) {
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount && bOk; ++nm) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
         long nAngle2=pO->GetShearAngle();
@@ -488,8 +488,8 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nAngle, bool bVShear, b
         CopyMarkedObj();
 
     double nTan=tan(nAngle*nPi180);
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm)
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -604,8 +604,8 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
     if (bCopy)
         CopyMarkedObj();
 
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm)
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -678,8 +678,8 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto
     if (bCopy)
         CopyMarkedObj();
 
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm)
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pO=pM->GetMarkedSdrObj();
@@ -779,8 +779,8 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool /*bRep
     const bool bUndo = IsUndoEnabled();
 
     // TODO: check if WhichRange is necessary.
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm)
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm)
     {
         const SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -818,8 +818,8 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, bool /*bOnlyH
     long nShrAngle=0;      bool bShrAngleDC=false;
     Rectangle aSnapRect;
     Rectangle aLogicRect;
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm) {
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm) {
         const SdrMark* pM=GetSdrMarkByIndex(nm);
         const SdrObject* pObj=pM->GetMarkedSdrObj();
         if (nm==0) {
@@ -887,7 +887,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, bool /*bOnlyH
     rAttr.Put(SdrHorzShearOneItem());
     rAttr.Put(SdrVertShearOneItem());
 
-    if (nMarkAnz>1) {
+    if (nMarkCount>1) {
         rAttr.Put(SdrResizeXAllItem());
         rAttr.Put(SdrResizeYAllItem());
         rAttr.Put(SdrRotateAllItem());
@@ -925,9 +925,9 @@ SfxItemSet SdrEditView::GetAttrFromMarked(bool bOnlyHardAttr) const
 
 void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, bool bOnlyHardAttr) const
 {
-    const size_t nMarkAnz(GetMarkedObjectCount());
+    const size_t nMarkCount(GetMarkedObjectCount());
 
-    for(size_t a = 0; a < nMarkAnz; ++a)
+    for(size_t a = 0; a < nMarkCount; ++a)
     {
         // #80277# merging was done wrong in the prev version
         const SfxItemSet& rSet = GetMarkedObjectByIndex(a)->GetMergedItemSet();
@@ -1038,7 +1038,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll)
             BegUndo(aStr);
         }
 
-        const size_t nMarkAnz(GetMarkedObjectCount());
+        const size_t nMarkCount(GetMarkedObjectCount());
         std::vector< E3DModifySceneSnapRectUpdater* > aUpdaters;
 
         // create ItemSet without SfxItemState::DONTCARE. Put()
@@ -1060,7 +1060,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll)
             nNewLineWidth = static_cast<const XLineWidthItem&>(aAttr.Get(XATTR_LINEWIDTH)).GetValue();
         }
 
-        for (size_t nm=0; nm<nMarkAnz; ++nm)
+        for (size_t nm=0; nm<nMarkCount; ++nm)
         {
             SdrMark* pM=GetSdrMarkByIndex(nm);
             SdrObject* pObj = pM->GetMarkedSdrObj();
@@ -1194,8 +1194,8 @@ SfxStyleSheet* SdrEditView::GetStyleSheetFromMarked() const
 {
     SfxStyleSheet* pRet=NULL;
     bool b1st=true;
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm) {
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SfxStyleSheet* pSS=pM->GetMarkedSdrObj()->GetStyleSheet();
         if (b1st) pRet=pSS;
@@ -1221,8 +1221,8 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, bool bDontRe
             BegUndo(aStr);
         }
 
-        const size_t nMarkAnz=GetMarkedObjectCount();
-        for (size_t nm=0; nm<nMarkAnz; ++nm)
+        const size_t nMarkCount=GetMarkedObjectCount();
+        for (size_t nm=0; nm<nMarkCount; ++nm)
         {
             SdrMark* pM=GetSdrMarkByIndex(nm);
             if( bUndo )
@@ -1803,9 +1803,9 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, bool
     }
 
     Rectangle aBound;
-    const size_t nMarkAnz=GetMarkedObjectCount();
+    const size_t nMarkCount=GetMarkedObjectCount();
     bool bHasFixed=false;
-    for (size_t nm=0; nm<nMarkAnz; ++nm)
+    for (size_t nm=0; nm<nMarkCount; ++nm)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -1820,7 +1820,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, bool
     }
     if (!bHasFixed)
     {
-        if (nMarkAnz==1)
+        if (nMarkCount==1)
         {   // align single object to page
             const SdrObject* pObj=GetMarkedObjectByIndex(0);
             const SdrPage* pPage=pObj->GetPage();
@@ -1851,7 +1851,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, bool
         }
     }
     Point aCenter(aBound.Center());
-    for (size_t nm=0; nm<nMarkAnz; ++nm)
+    for (size_t nm=0; nm<nMarkCount; ++nm)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 5f7850e4f44d..bb56746f45e9 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -426,8 +426,8 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
 void SdrEditView::ReverseOrderOfMarked()
 {
     SortMarkedObjects();
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    if (nMarkAnz>0)
+    const size_t nMarkCount=GetMarkedObjectCount();
+    if (nMarkCount>0)
     {
         bool bChg=false;
 
@@ -439,7 +439,7 @@ void SdrEditView::ReverseOrderOfMarked()
         do {
             // take into account selection across multiple PageViews
             size_t b=a+1;
-            while (b<nMarkAnz && GetSdrPageViewOfMarkedByIndex(b) == GetSdrPageViewOfMarkedByIndex(a)) ++b;
+            while (b<nMarkCount && GetSdrPageViewOfMarkedByIndex(b) == GetSdrPageViewOfMarkedByIndex(a)) ++b;
             --b;
             SdrObjList* pOL=GetSdrPageViewOfMarkedByIndex(a)->GetObjList();
             size_t c=b;
@@ -465,7 +465,7 @@ void SdrEditView::ReverseOrderOfMarked()
                 bChg=true;
             }
             a=b+1;
-        } while (a<nMarkAnz);
+        } while (a<nMarkCount);
 
         if(bUndo)
             EndUndo();
@@ -1904,11 +1904,11 @@ void SdrEditView::ImpConvertTo(bool bPath, bool bLineToArea)
 {
     if (AreObjectsMarked()) {
         bool bMrkChg = false;
-        const size_t nMarkAnz=GetMarkedObjectCount();
+        const size_t nMarkCount=GetMarkedObjectCount();
         sal_uInt16 nDscrID=0;
         if(bLineToArea)
         {
-            if(nMarkAnz == 1)
+            if(nMarkCount == 1)
                 nDscrID = STR_EditConvToContour;
             else
                 nDscrID = STR_EditConvToContours;
@@ -1918,16 +1918,16 @@ void SdrEditView::ImpConvertTo(bool bPath, bool bLineToArea)
         else
         {
             if (bPath) {
-                if (nMarkAnz==1) nDscrID=STR_EditConvToCurve;
+                if (nMarkCount==1) nDscrID=STR_EditConvToCurve;
                 else nDscrID=STR_EditConvToCurves;
                 BegUndo(ImpGetResStr(nDscrID),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_CONVERTTOPATH);
             } else {
-                if (nMarkAnz==1) nDscrID=STR_EditConvToPoly;
+                if (nMarkCount==1) nDscrID=STR_EditConvToPoly;
                 else nDscrID=STR_EditConvToPolys;
                 BegUndo(ImpGetResStr(nDscrID),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_CONVERTTOPOLY);
             }
         }
-        for (size_t nm=nMarkAnz; nm>0;) {
+        for (size_t nm=nMarkCount; nm>0;) {
             --nm;
             SdrMark* pM=GetSdrMarkByIndex(nm);
             SdrObject* pObj=pM->GetMarkedSdrObj();
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 3b063f1af611..c1b21ba6ac44 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -44,8 +44,8 @@ SdrGlueEditView::~SdrGlueEditView()
 
 void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
 {
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm) {
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
@@ -81,7 +81,7 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, co
             }
         }
     }
-    if (!bConst && nMarkAnz!=0) pMod->SetChanged();
+    if (!bConst && nMarkCount!=0) pMod->SetChanged();
 }
 
 
@@ -227,8 +227,8 @@ void SdrGlueEditView::DeleteMarkedGluePoints()
     if( bUndo )
         BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedGluePoints(),SDRREPFUNC_OBJ_DELETE);
 
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm)
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -259,7 +259,7 @@ void SdrGlueEditView::DeleteMarkedGluePoints()
     if( bUndo )
         EndUndo();
     UnmarkAllGluePoints();
-    if (nMarkAnz!=0)
+    if (nMarkCount!=0)
         pMod->SetChanged();
 }
 
@@ -272,8 +272,8 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints()
     if( bUndo )
         BegUndo();
 
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm)
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -309,7 +309,7 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints()
     if( bUndo )
         EndUndo();
 
-    if (nMarkAnz!=0)
+    if (nMarkCount!=0)
         pMod->SetChanged();
 }
 
@@ -317,8 +317,8 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints()
 
 void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
 {
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm) {
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
@@ -346,7 +346,7 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo
             }
         }
     }
-    if (nMarkAnz!=0) pMod->SetChanged();
+    if (nMarkCount!=0) pMod->SetChanged();
 }
 
 
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 17922d1a6ad4..a32044277aeb 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -598,12 +598,12 @@ const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const
 {
     bool& rNameOk = (bool&)(bGlue ? mbGluePointNameOk : mbPointNameOk);
     OUString& rName = const_cast<OUString&>(bGlue ? maGluePointName : maPointName);
-    const size_t nMarkAnz(GetMarkCount());
+    const size_t nMarkCount(GetMarkCount());
     size_t nMarkPtAnz(0);
     size_t nMarkPtObjAnz(0);
     size_t n1stMarkNum(SAL_MAX_SIZE);
 
-    for(size_t nMarkNum = 0; nMarkNum < nMarkAnz; ++nMarkNum)
+    for(size_t nMarkNum = 0; nMarkNum < nMarkCount; ++nMarkNum)
     {
         const SdrMark* pMark = GetMark(nMarkNum);
         const SdrUShortCont* pPts = bGlue ? pMark->GetMarkedGluePoints() : pMark->GetMarkedPoints();
@@ -851,9 +851,9 @@ namespace sdr
             maAllMarkedObjects.clear();
 
             // GetMarkCount after ForceSort
-            const size_t nMarkAnz(maMarkedObjectList.GetMarkCount());
+            const size_t nMarkCount(maMarkedObjectList.GetMarkCount());
 
-            for(size_t a = 0; a < nMarkAnz; ++a)
+            for(size_t a = 0; a < nMarkCount; ++a)
             {
                 SdrObject* pCandidate = maMarkedObjectList.GetMark(a)->GetMarkedSdrObj();
 
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index cc8badb8e1ac..79e32a466450 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -558,10 +558,10 @@ void SdrMarkView::showMarkHandles()
 
 bool SdrMarkView::ImpIsFrameHandles() const
 {
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    bool bFrmHdl=nMarkAnz>static_cast<size_t>(nFrameHandlesLimit) || bForceFrameHandles;
+    const size_t nMarkCount=GetMarkedObjectCount();
+    bool bFrmHdl=nMarkCount>static_cast<size_t>(nFrameHandlesLimit) || bForceFrameHandles;
     bool bStdDrag=eDragMode==SDRDRAG_MOVE;
-    if (nMarkAnz==1 && bStdDrag && bFrmHdl)
+    if (nMarkCount==1 && bStdDrag && bFrmHdl)
     {
         const SdrObject* pObj=GetMarkedObjectByIndex(0);
         if (pObj->GetObjInventor()==SdrInventor)
@@ -578,7 +578,7 @@ bool SdrMarkView::ImpIsFrameHandles() const
         bFrmHdl=true;
         if (eDragMode==SDRDRAG_ROTATE) {
             // when rotating, use ObjOwn drag, if there's at least 1 PolyObj
-            for (size_t nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; ++nMarkNum) {
+            for (size_t nMarkNum=0; nMarkNum<nMarkCount && bFrmHdl; ++nMarkNum) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrObject* pObj=pM->GetMarkedSdrObj();
                 bFrmHdl=!pObj->IsPolyObj();
@@ -587,7 +587,7 @@ bool SdrMarkView::ImpIsFrameHandles() const
     }
     if (!bFrmHdl) {
         // FrameHandles, if at least 1 Obj can't do SpecialDrag
-        for (size_t nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; ++nMarkNum) {
+        for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bFrmHdl; ++nMarkNum) {
             const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             const SdrObject* pObj=pM->GetMarkedSdrObj();
             bFrmHdl=!pObj->hasSpecialDrag();
@@ -634,11 +634,11 @@ void SdrMarkView::SetMarkHandles()
     // are handles enabled at all? Create only then
     if(!areMarkHandlesHidden())
     {
-        const size_t nMarkAnz=GetMarkedObjectCount();
+        const size_t nMarkCount=GetMarkedObjectCount();
         bool bStdDrag=eDragMode==SDRDRAG_MOVE;
         bool bSingleTextObjMark=false;
 
-        if (nMarkAnz==1)
+        if (nMarkCount==1)
         {
             pMarkedObj=GetMarkedObjectByIndex(0);
             bSingleTextObjMark =
@@ -649,11 +649,11 @@ void SdrMarkView::SetMarkHandles()
 
         bool bFrmHdl=ImpIsFrameHandles();
 
-        if (nMarkAnz>0)
+        if (nMarkCount>0)
         {
             pMarkedPV=GetSdrPageViewOfMarkedByIndex(0);
 
-            for (size_t nMarkNum=0; nMarkNum<nMarkAnz && (pMarkedPV!=NULL || !bFrmHdl); ++nMarkNum)
+            for (size_t nMarkNum=0; nMarkNum<nMarkCount && (pMarkedPV!=NULL || !bFrmHdl); ++nMarkNum)
             {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
 
@@ -761,7 +761,7 @@ void SdrMarkView::SetMarkHandles()
             bool bDone(false);
 
             // moved crop handling to non-frame part and the handle creation to SdrGrafObj
-            if(1 == nMarkAnz && pMarkedObj && SDRDRAG_CROP == eDragMode)
+            if(1 == nMarkCount && pMarkedObj && SDRDRAG_CROP == eDragMode)
             {
                 const SdrGrafObj* pSdrGrafObj = dynamic_cast< const SdrGrafObj* >(pMarkedObj);
 
@@ -774,7 +774,7 @@ void SdrMarkView::SetMarkHandles()
 
             if(!bDone)
             {
-                for (size_t nMarkNum=0; nMarkNum<nMarkAnz; ++nMarkNum)
+                for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum)
                 {
                     const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                     SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -819,7 +819,7 @@ void SdrMarkView::SetMarkHandles()
         }
 
         // GluePoint handles
-        for (size_t nMarkNum=0; nMarkNum<nMarkAnz; ++nMarkNum)
+        for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum)
         {
             const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -932,8 +932,8 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
         case SDRDRAG_TRANSPARENCE:
         {
             // add interactive transparency handle
-            const size_t nMarkAnz = GetMarkedObjectCount();
-            if(nMarkAnz == 1)
+            const size_t nMarkCount = GetMarkedObjectCount();
+            if(nMarkCount == 1)
             {
                 SdrObject* pObj = GetMarkedObjectByIndex(0);
                 SdrModel* pModel = GetModel();
@@ -996,8 +996,8 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
         case SDRDRAG_GRADIENT:
         {
             // add interactive gradient handle
-            const size_t nMarkAnz = GetMarkedObjectCount();
-            if(nMarkAnz == 1)
+            const size_t nMarkCount = GetMarkedObjectCount();
+            if(nMarkCount == 1)
             {
                 SdrObject* pObj = GetMarkedObjectByIndex(0);
                 const SfxItemSet& rSet = pObj->GetMergedItemSet();
@@ -1351,11 +1351,11 @@ bool SdrMarkView::MarkNextObj(bool bPrev)
     }
 
     SortMarkedObjects();
-    const size_t nMarkAnz=GetMarkedObjectCount();
+    const size_t nMarkCount=GetMarkedObjectCount();
     size_t nChgMarkNum = SAL_MAX_SIZE; // number of the MarkEntry we want to replace
     size_t nSearchObjNum = bPrev ? 0 : SAL_MAX_SIZE;
-    if (nMarkAnz!=0) {
-        nChgMarkNum=bPrev ? 0 : nMarkAnz-1;
+    if (nMarkCount!=0) {
+        nChgMarkNum=bPrev ? 0 : nMarkCount-1;
         SdrMark* pM=GetSdrMarkByIndex(nChgMarkNum);
         OSL_ASSERT(pM!=NULL);
         if (pM->GetMarkedSdrObj() != NULL)
@@ -1406,8 +1406,8 @@ bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev)
     size_t nTopMarkHit=0;
     size_t nBtmMarkHit=0;
     // find topmost of the selected objects that is hit by rPnt
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=nMarkAnz; nm>0 && pTopMarkHit==NULL;) {
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=nMarkCount; nm>0 && pTopMarkHit==NULL;) {
         --nm;
         SdrMark* pM=GetSdrMarkByIndex(nm);
         if(CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0))
@@ -1424,7 +1424,7 @@ bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev)
     SdrPageView* pPV=pTopMarkHit->GetPageView();
     // find lowermost of the selected objects that is hit by rPnt
     // and is placed on the same PageView as pTopMarkHit
-    for (size_t nm=0; nm<nMarkAnz && pBtmMarkHit==NULL; ++nm) {
+    for (size_t nm=0; nm<nMarkCount && pBtmMarkHit==NULL; ++nm) {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrPageView* pPV2=pM->GetPageView();
         if (pPV2==pPV && CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pPV2,0,0))
@@ -1834,8 +1834,8 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie
     Point aPt(rPnt);
     sal_uInt16 nTol=(sal_uInt16)nHitTolLog;
     bool bFnd=false;
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) {
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nMarkNum=nMarkCount; nMarkNum>0 && !bFnd;) {
         --nMarkNum;
         SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
         SdrPageView* pPV=pM->GetPageView();
@@ -1850,7 +1850,7 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie
         SdrObject* pBestObj=NULL;
         SdrPageView* pBestPV=NULL;
         sal_uIntPtr nBestDist=ULONG_MAX;
-        for (size_t nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) {
+        for (size_t nMarkNum=nMarkCount; nMarkNum>0 && !bFnd;) {
             --nMarkNum;
             SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             SdrPageView* pPV=pM->GetPageView();
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 3ca60fa8bfd0..1bf0d86227f3 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -35,9 +35,9 @@ bool SdrMarkView::HasMarkablePoints() const
     ForceUndirtyMrkPnt();
     bool bRet=false;
     if (!ImpIsFrameHandles()) {
-        const size_t nMarkAnz=GetMarkedObjectCount();
-        if (nMarkAnz<=static_cast<size_t>(nFrameHandlesLimit)) {
-            for (size_t nMarkNum=0; nMarkNum<nMarkAnz && !bRet; ++nMarkNum) {
+        const size_t nMarkCount=GetMarkedObjectCount();
+        if (nMarkCount<=static_cast<size_t>(nFrameHandlesLimit)) {
+            for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bRet; ++nMarkNum) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrObject* pObj=pM->GetMarkedSdrObj();
                 bRet=pObj->IsPolyObj();
@@ -52,9 +52,9 @@ sal_uIntPtr SdrMarkView::GetMarkablePointCount() const
     ForceUndirtyMrkPnt();
     sal_uIntPtr nCount=0;
     if (!ImpIsFrameHandles()) {
-        const size_t nMarkAnz=GetMarkedObjectCount();
-        if (nMarkAnz<=static_cast<size_t>(nFrameHandlesLimit)) {
-            for (size_t nMarkNum=0; nMarkNum<nMarkAnz; ++nMarkNum) {
+        const size_t nMarkCount=GetMarkedObjectCount();
+        if (nMarkCount<=static_cast<size_t>(nFrameHandlesLimit)) {
+            for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrObject* pObj=pM->GetMarkedSdrObj();
                 if (pObj->IsPolyObj()) {
@@ -71,9 +71,9 @@ bool SdrMarkView::HasMarkedPoints() const
     ForceUndirtyMrkPnt();
     bool bRet=false;
     if (!ImpIsFrameHandles()) {
-        const size_t nMarkAnz=GetMarkedObjectCount();
-        if (nMarkAnz<=static_cast<size_t>(nFrameHandlesLimit)) {
-            for (size_t nMarkNum=0; nMarkNum<nMarkAnz && !bRet; ++nMarkNum) {
+        const size_t nMarkCount=GetMarkedObjectCount();
+        if (nMarkCount<=static_cast<size_t>(nFrameHandlesLimit)) {
+            for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bRet; ++nMarkNum) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrUShortCont* pPts=pM->GetMarkedPoints();
                 bRet=pPts!=NULL && !pPts->empty();
@@ -88,9 +88,9 @@ sal_uIntPtr SdrMarkView::GetMarkedPointCount() const
     ForceUndirtyMrkPnt();
     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) {
+        size_t nMarkCount=GetMarkedObjectCount();
+        if (nMarkCount<=static_cast<size_t>(nFrameHandlesLimit)) {
+            for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) {
                 const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
                 const SdrUShortCont* pPts=pM->GetMarkedPoints();
                 if (pPts!=NULL) nCount+=pPts->size();
@@ -313,8 +313,8 @@ void SdrMarkView::ImpSetPointsRects() const
 void SdrMarkView::UndirtyMrkPnt() const
 {
     bool bChg=false;
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nMarkNum=0; nMarkNum<nMarkAnz; ++nMarkNum) {
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) {
         SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
         const SdrObject* pObj=pM->GetMarkedSdrObj();
         // PolyPoints
@@ -380,8 +380,8 @@ bool SdrMarkView::HasMarkableGluePoints() const
     bool bRet=false;
     if (IsGluePointEditMode()) {
         ForceUndirtyMrkPnt();
-        const size_t nMarkAnz=GetMarkedObjectCount();
-        for (size_t nMarkNum=0; nMarkNum<nMarkAnz && !bRet; ++nMarkNum) {
+        const size_t nMarkCount=GetMarkedObjectCount();
+        for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bRet; ++nMarkNum) {
             const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
             const SdrObject* pObj=pM->GetMarkedSdrObj();
             const SdrGluePointList* pGPL=pObj->GetGluePointList();
@@ -406,8 +406,8 @@ bool SdrMarkView::HasMarkedGluePoints() const
 {
     ForceUndirtyMrkPnt();
     bool bRet=false;
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nMarkNum=0; nMarkNum<nMarkAnz && !bRet; ++nMarkNum) {
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nMarkNum=0; nMarkNum<nMarkCount && !bRet; ++nMarkNum) {
         const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
         const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
         bRet=pPts!=NULL && !pPts->empty();
@@ -421,8 +421,8 @@ bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, bool bUnmark)
     ForceUndirtyMrkPnt();
     bool bChgd=false;
     SortMarkedObjects();
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nMarkNum=0; nMarkNum<nMarkAnz; ++nMarkNum) {
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) {
         SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
         const SdrObject* pObj=pM->GetMarkedSdrObj();
         const SdrGluePointList* pGPL=pObj->GetGluePointList();
@@ -479,14 +479,14 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16
     if (pOut==NULL) pOut=GetFirstOutputDevice();
     if (pOut==NULL) return false;
     SortMarkedObjects();
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    size_t nMarkNum=bBack ? 0 : nMarkAnz;
+    const size_t nMarkCount=GetMarkedObjectCount();
+    size_t nMarkNum=bBack ? 0 : nMarkCount;
     if (bNext) {
         nMarkNum=((SdrMarkView*)this)->TryToFindMarkedObject(pObj0);
         if (nMarkNum==SAL_MAX_SIZE) return false;
         if (!bBack) nMarkNum++;
     }
-    while (bBack ? nMarkNum<nMarkAnz : nMarkNum>0) {
+    while (bBack ? nMarkNum<nMarkCount : nMarkNum>0) {
         if (!bBack) nMarkNum--;
         const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
         SdrObject* pObj=pM->GetMarkedSdrObj();
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 1c4395156da3..603274af647d 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -63,9 +63,9 @@ SdrPolyEditView::~SdrPolyEditView()
 void SdrPolyEditView::ImpCheckPolyPossibilities()
 {
     ImpResetPolyPossibilityFlags();
-    const size_t nMarkAnz(GetMarkedObjectCount());
+    const size_t nMarkCount(GetMarkedObjectCount());
 
-    if(nMarkAnz && !ImpIsFrameHandles())
+    if(nMarkCount && !ImpIsFrameHandles())
     {
         bool b1stSmooth(true);
         bool b1stSegm(true);
@@ -74,7 +74,7 @@ void SdrPolyEditView::ImpCheckPolyPossibilities()
         bool bSegmFuz(false);
         basegfx::B2VectorContinuity eSmooth = basegfx::CONTINUITY_NONE;
 
-        for(size_t nMarkNum = 0; nMarkNum < nMarkAnz; ++nMarkNum)
+        for(size_t nMarkNum = 0; nMarkNum < nMarkCount; ++nMarkNum)
         {
             SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
             CheckPolyPossibilitiesHelper( pM, b1stSmooth, b1stSegm, bCurve, bSmoothFuz, bSegmFuz, eSmooth );
@@ -204,9 +204,9 @@ void SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
         const bool bUndo = IsUndoEnabled();
         if( bUndo )
             BegUndo(ImpGetResStr(STR_EditSetPointsSmooth), GetDescriptionOfMarkedPoints());
-        const size_t nMarkAnz(GetMarkedObjectCount());
+        const size_t nMarkCount(GetMarkedObjectCount());
 
-        for(size_t nMarkNum(nMarkAnz); nMarkNum > 0;)
+        for(size_t nMarkNum(nMarkCount); nMarkNum > 0;)
         {
             --nMarkNum;
             SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
@@ -239,9 +239,9 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
         const bool bUndo = IsUndoEnabled();
         if( bUndo )
             BegUndo(ImpGetResStr(STR_EditSetSegmentsKind), GetDescriptionOfMarkedPoints());
-        const size_t nMarkAnz(GetMarkedObjectCount());
+        const size_t nMarkCount(GetMarkedObjectCount());
 
-        for(size_t nMarkNum=nMarkAnz; nMarkNum > 0;)
+        for(size_t nMarkNum=nMarkCount; nMarkNum > 0;)
         {
             --nMarkNum;
             SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
@@ -300,7 +300,7 @@ void SdrPolyEditView::DeleteMarkedPoints()
     {
         BrkAction();
         SortMarkedObjects();
-        const size_t nMarkAnz=GetMarkedObjectCount();
+        const size_t nMarkCount=GetMarkedObjectCount();
 
         const bool bUndo = IsUndoEnabled();
         if( bUndo )
@@ -309,7 +309,7 @@ void SdrPolyEditView::DeleteMarkedPoints()
             BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_DELETE);
         }
 
-        for (size_t nMarkNum=nMarkAnz; nMarkNum>0;)
+        for (size_t nMarkNum=nMarkCount; nMarkNum>0;)
         {
             --nMarkNum;
             SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -354,13 +354,13 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
     if(HasMarkedPoints())
     {
         SortMarkedObjects();
-        const size_t nMarkAnz(GetMarkedObjectCount());
+        const size_t nMarkCount(GetMarkedObjectCount());
 
         const bool bUndo = IsUndoEnabled();
         if( bUndo )
             BegUndo(ImpGetResStr(STR_EditRipUp), GetDescriptionOfMarkedPoints());
 
-        for(size_t nMarkNum = nMarkAnz; nMarkNum > 0;)
+        for(size_t nMarkNum = nMarkCount; nMarkNum > 0;)
         {
             --nMarkNum;
             SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
@@ -547,8 +547,8 @@ void SdrPolyEditView::CloseMarkedObjects(bool bToggle, bool bOpen)
             BegUndo(ImpGetResStr(STR_EditShut),GetDescriptionOfMarkedPoints());
 
         bool bChg=false;
-        const size_t nMarkAnz=GetMarkedObjectCount();
-        for (size_t nm=0; nm<nMarkAnz; ++nm)
+        const size_t nMarkCount=GetMarkedObjectCount();
+        for (size_t nm=0; nm<nMarkCount; ++nm)
         {
             SdrMark* pM=GetSdrMarkByIndex(nm);
             SdrObject* pO=pM->GetMarkedSdrObj();
@@ -582,8 +582,8 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void*
 {
     const bool bUndo = IsUndoEnabled();
 
-    const size_t nMarkAnz=GetMarkedObjectCount();
-    for (size_t nm=0; nm<nMarkAnz; ++nm)
+    const size_t nMarkCount=GetMarkedObjectCount();
+    for (size_t nm=0; nm<nMarkCount; ++nm)
     {
         SdrMark* pM=GetSdrMarkByIndex(nm);
         SdrObject* pObj=pM->GetMarkedSdrObj();
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 5823a25c9392..26ab01ae14b0 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1305,12 +1305,12 @@ SdrViewContext SdrView::GetContext() const
     if( IsGluePointEditMode() )
         return SDRCONTEXT_GLUEPOINTEDIT;
 
-    const size_t nMarkAnz = GetMarkedObjectCount();
+    const size_t nMarkCount = GetMarkedObjectCount();
 
     if( HasMarkablePoints() && !IsFrameHandles() )
     {
         bool bPath=true;
-        for( size_t nMarkNum = 0; nMarkNum < nMarkAnz && bPath; ++nMarkNum )
+        for( size_t nMarkNum = 0; nMarkNum < nMarkCount && bPath; ++nMarkNum )
             if (!GetMarkedObjectByIndex(nMarkNum)->ISA(SdrPathObj))
                 bPath=false;
 
@@ -1322,7 +1322,7 @@ SdrViewContext SdrView::GetContext() const
     {
         bool bGraf = true, bMedia = true, bTable = true;
 
-        for( size_t nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); ++nMarkNum )
+        for( size_t nMarkNum = 0; nMarkNum < nMarkCount && ( bGraf || bMedia ); ++nMarkNum )
         {
             const SdrObject* pMarkObj = GetMarkedObjectByIndex( nMarkNum );
             DBG_ASSERT( pMarkObj, "SdrView::GetContext(), null pointer in mark list!" );