1 files changed, 17 insertions, 17 deletions

diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 3541cd018ce1..a1ae7ca6f7b1 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1687,9 +1687,9 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
             {
                 const SdrMark* pM=rML.GetMark(nMarkNum);
                 const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
-                const size_t nPtAnz=pPts==NULL ? 0 : pPts->size();
+                const size_t nPointCount=pPts==NULL ? 0 : pPts->size();
 
-                if (nPtAnz!=0)
+                if (nPointCount!=0)
                 {
                     const SdrObject* pObj=pM->GetMarkedSdrObj();
                     const SdrGluePointList* pGPL=pObj->GetGluePointList();
@@ -1808,7 +1808,7 @@ void SdrDragResize::TakeSdrDragComment(OUString& rStr) const
             if(!bEqual)
                 rStr += "x=";
 
-            getSdrDragView().GetModel()->TakePercentStr(aXFact, aStr);
+            SdrModel::TakePercentStr(aXFact, aStr);
             rStr += aStr;
         }
 
@@ -1818,7 +1818,7 @@ void SdrDragResize::TakeSdrDragComment(OUString& rStr) const
                 rStr += " ";
 
             rStr += "y=";
-            getSdrDragView().GetModel()->TakePercentStr(aYFact, aStr);
+            SdrModel::TakePercentStr(aYFact, aStr);
             rStr += aStr;
         }
 
@@ -2134,7 +2134,7 @@ void SdrDragRotate::TakeSdrDragComment(OUString& rStr) const
     }
 
     OUString aStr;
-    getSdrDragView().GetModel()->TakeAngleStr(nTmpAngle, aStr);
+    SdrModel::TakeAngleStr(nTmpAngle, aStr);
     rStr += aStr + ")";
 
     if(getSdrDragView().IsDragWithCopy())
@@ -2270,7 +2270,7 @@ void SdrDragShear::TakeSdrDragComment(OUString& rStr) const
     nTmpAngle = NormAngle180(nTmpAngle);
 
     OUString aStr;
-    getSdrDragView().GetModel()->TakeAngleStr(nTmpAngle, aStr);
+    SdrModel::TakeAngleStr(nTmpAngle, aStr);
     rStr += aStr + ")";
 
     if(getSdrDragView().IsDragWithCopy())
@@ -2856,7 +2856,7 @@ void SdrDragCrook::TakeSdrDragComment(OUString& rStr) const
 
         nVal = std::abs(nVal);
         OUString aStr;
-        getSdrDragView().GetModel()->TakeAngleStr(nVal, aStr);
+        SdrModel::TakeAngleStr(nVal, aStr);
         rStr += aStr + ")";
     }
 
@@ -2993,17 +2993,17 @@ void SdrDragCrook::_MovAllPoints(basegfx::B2DPolyPolygon& rTarget)
 
         if (pPV->HasMarkedObjPageView())
         {
-            sal_uInt16 nPolyAnz=aTempPolyPoly.Count();
+            sal_uInt16 nPolyCount=aTempPolyPoly.Count();
 
             if (!bContortion && !getSdrDragView().IsNoDragXorPolys())
             {
                 sal_uInt16 n1st=0,nLast=0;
                 Point aC(aCenter);
 
-                while (n1st<nPolyAnz)
+                while (n1st<nPolyCount)
                 {
                     nLast=n1st;
-                    while (nLast<nPolyAnz && aTempPolyPoly[nLast].GetPointCount()!=0) nLast++;
+                    while (nLast<nPolyCount && aTempPolyPoly[nLast].GetPointCount()!=0) nLast++;
                     Rectangle aBound(aTempPolyPoly[n1st].GetBoundRect());
                     sal_uInt16 i;
 
@@ -3063,19 +3063,19 @@ void SdrDragCrook::_MovAllPoints(basegfx::B2DPolyPolygon& rTarget)
             {
                 sal_uInt16 i,j;
 
-                for (j=0; j<nPolyAnz; j++)
+                for (j=0; j<nPolyCount; j++)
                 {
                     XPolygon& aPol=aTempPolyPoly[j];
-                    sal_uInt16 nPtAnz=aPol.GetPointCount();
+                    sal_uInt16 nPointCount=aPol.GetPointCount();
                     i=0;
 
-                    while (i<nPtAnz)
+                    while (i<nPointCount)
                     {
                         Point* pPnt=&aPol[i];
                         Point* pC1=NULL;
                         Point* pC2=NULL;
 
-                        if (i+1<nPtAnz && aPol.IsControl(i))
+                        if (i+1<nPointCount && aPol.IsControl(i))
                         { // control point on the left
                             pC1=pPnt;
                             i++;
@@ -3084,7 +3084,7 @@ void SdrDragCrook::_MovAllPoints(basegfx::B2DPolyPolygon& rTarget)
 
                         i++;
 
-                        if (i<nPtAnz && aPol.IsControl(i))
+                        if (i<nPointCount && aPol.IsControl(i))
                         { // control point on the right
                             pC2=&aPol[i];
                             i++;
@@ -3356,7 +3356,7 @@ void SdrDragCrook::applyCurrentTransformationToSdrObject(SdrObject& rTarget)
             const Rectangle aLocalMarkRect(getSdrDragView().GetMarkedObjRect());
             const bool bLocalRotate(!bContortion && eMode == SDRCROOK_ROTATE && getSdrDragView().IsRotateAllowed(false));
 
-            getSdrDragView().ImpCrookObj(&rTarget,aCenter,aRad,eMode,bVertical,!bContortion,bLocalRotate,aLocalMarkRect);
+            SdrEditView::ImpCrookObj(&rTarget,aCenter,aRad,eMode,bVertical,!bContortion,bLocalRotate,aLocalMarkRect);
         }
     }
 }
@@ -3595,7 +3595,7 @@ void SdrDragDistort::applyCurrentTransformationToSdrObject(SdrObject& rTarget)
 
     if (bDoDistort)
     {
-        getSdrDragView().ImpDistortObj(&rTarget, aMarkRect, aDistortedRect, !bContortion);
+        SdrEditView::ImpDistortObj(&rTarget, aMarkRect, aDistortedRect, !bContortion);
     }
 }