svx: prefix remaining members of SdrDragView

Change-Id: Iac5d80ef4e433c95277237692bda02fa75a24c61

include/svx/svddrgmt.hxx

@@ -157,16 +157,16 @@ protected:
 
     // old call forwarders to the SdrDragView
     void               ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal=0) const;
-    SdrHdl*            GetDragHdl() const              { return getSdrDragView().pDragHdl; }
-    SdrHdlKind         GetDragHdlKind() const          { return getSdrDragView().eDragHdl; }
+    SdrHdl*            GetDragHdl() const              { return getSdrDragView().mpDragHdl; }
+    SdrHdlKind         GetDragHdlKind() const          { return getSdrDragView().meDragHdl; }
     SdrDragStat&       DragStat()                      { return getSdrDragView().aDragStat; }
     const SdrDragStat& DragStat() const                { return getSdrDragView().aDragStat; }
     Point&             Ref1() const                    { return mrSdrDragView.aRef1; }
     Point&             Ref2() const                    { return mrSdrDragView.aRef2; }
     const SdrHdlList&  GetHdlList() const              { return getSdrDragView().GetHdlList(); }
     void               AddUndo(SdrUndoAction* pUndo)   { getSdrDragView().AddUndo(pUndo); }
-    bool               IsDragLimit()                   { return getSdrDragView().bDragLimit; }
-    const Rectangle&   GetDragLimitRect()              { return getSdrDragView().aDragLimit; }
+    bool               IsDragLimit()                   { return getSdrDragView().mbDragLimit; }
+    const Rectangle&   GetDragLimitRect()              { return getSdrDragView().maDragLimit; }
     const SdrMarkList& GetMarkedObjectList()                   { return getSdrDragView().GetMarkedObjectList(); }
     Point              GetSnapPos(const Point& rPt) const { return getSdrDragView().GetSnapPos(rPt,getSdrDragView().pMarkedPV); }
     SdrSnap            SnapPos(Point& rPt) const       { return getSdrDragView().SnapPos(rPt,getSdrDragView().pMarkedPV); }
@@ -217,8 +217,8 @@ public:
 
 inline const Rectangle& SdrDragMethod::GetMarkedRect() const
 {
-    return getSdrDragView().eDragHdl==HDL_POLY ? getSdrDragView().GetMarkedPointsRect() :
-           getSdrDragView().eDragHdl==HDL_GLUE ? getSdrDragView().GetMarkedGluePointsRect() :
+    return getSdrDragView().meDragHdl==HDL_POLY ? getSdrDragView().GetMarkedPointsRect() :
+           getSdrDragView().meDragHdl==HDL_GLUE ? getSdrDragView().GetMarkedGluePointsRect() :
            getSdrDragView().GetMarkedObjRect();
 }
 

svx/source/engine3d/view3d.cxx

@@ -1229,13 +1229,13 @@ bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
             }
             if( bThereAre3DObjects )
             {
-                eDragHdl = ( pHdl == NULL ? HDL_MOVE : pHdl->GetKind() );
+                meDragHdl = ( pHdl == NULL ? HDL_MOVE : pHdl->GetKind() );
                 switch ( eDragMode )
                 {
                     case SDRDRAG_ROTATE:
                     case SDRDRAG_SHEAR:
                     {
-                        switch ( eDragHdl )
+                        switch ( meDragHdl )
                         {
                             case HDL_LEFT:
                             case HDL_RIGHT:
@@ -1272,7 +1272,7 @@ bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
                     {
                         if(!bThereAreRootScenes)
                         {
-                            pForcedMeth = new E3dDragMove(*this, GetMarkedObjectList(), eDragHdl, eConstraint, IsSolidDragging());
+                            pForcedMeth = new E3dDragMove(*this, GetMarkedObjectList(), meDragHdl, eConstraint, IsSolidDragging());
                         }
                     }
                     break;

svx/source/svdraw/svddrgmt.cxx

@@ -575,7 +575,7 @@ void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr
 SdrObject* SdrDragMethod::GetDragObj() const
 {
     SdrObject* pObj=NULL;
-    if (getSdrDragView().pDragHdl!=NULL) pObj=getSdrDragView().pDragHdl->GetObj();
+    if (getSdrDragView().mpDragHdl!=NULL) pObj=getSdrDragView().mpDragHdl->GetObj();
     if (pObj==NULL) pObj=getSdrDragView().pMarkedObj;
     return pObj;
 }
@@ -583,7 +583,7 @@ SdrObject* SdrDragMethod::GetDragObj() const
 SdrPageView* SdrDragMethod::GetDragPV() const
 {
     SdrPageView* pPV=NULL;
-    if (getSdrDragView().pDragHdl!=NULL) pPV=getSdrDragView().pDragHdl->GetPageView();
+    if (getSdrDragView().mpDragHdl!=NULL) pPV=getSdrDragView().mpDragHdl->GetPageView();
     if (pPV==NULL) pPV=getSdrDragView().pMarkedPV;
     return pPV;
 }

svx/source/svdraw/svdview.cxx

@@ -1067,7 +1067,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
         bool bCorner=pHdl!=NULL && pHdl->IsCornerHdl();
         bool bVertex=pHdl!=NULL && pHdl->IsVertexHdl();
         bool bMov=eHdl==HDL_MOVE;
-        if (bMov && (eDragMode==SDRDRAG_MOVE || eDragMode==SDRDRAG_RESIZE || bMarkedHitMovesAlways)) {
+        if (bMov && (eDragMode==SDRDRAG_MOVE || eDragMode==SDRDRAG_RESIZE || mbMarkedHitMovesAlways)) {
             if (!IsMoveAllowed()) return Pointer(PointerStyle::Arrow); // because double click or drag & drop is possible
             return Pointer(PointerStyle::Move);
         }
@@ -1189,7 +1189,7 @@ OUString SdrView::GetStatusText()
     {
         if (bInsPolyPoint || IsInsertGluePoint())
         {
-            aStr=aInsPointUndoStr;
+            aStr=maInsPointUndoStr;
         }
         else
         {