1 files changed, 28 insertions, 28 deletions

diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index da6660341d0c..62b2b81bc059 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -56,14 +56,14 @@ void SdrDragView::ImpClearVars()
     mbDragLimit=false;
     mbMarkedHitMovesAlways=false;
     meDragHdl=HDL_MOVE;
-    mpDragHdl=NULL;
+    mpDragHdl=nullptr;
     mbDragHdl=false;
     mbDragSpecial=false;
-    mpCurrentSdrDragMethod=NULL;
+    mpCurrentSdrDragMethod=nullptr;
     mbDragStripes=false;
     mbMirrRefDragObj=true;
     mbDragWithCopy=false;
-    mpInsPointUndo=NULL;
+    mpInsPointUndo=nullptr;
     mbInsGluePoint=false;
     mbInsObjPointMode=false;
     mbInsGluePointMode=false;
@@ -214,23 +214,23 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
     {
         SetDragWithCopy(false);
         //TODO: aAni.Reset();
-        mpCurrentSdrDragMethod=NULL;
+        mpCurrentSdrDragMethod=nullptr;
         mbDragSpecial=false;
         mbDragLimit=false;
         SdrDragMode eTmpMode=meDragMode;
-        if (eTmpMode==SDRDRAG_MOVE && pHdl!=NULL && pHdl->GetKind()!=HDL_MOVE) {
+        if (eTmpMode==SDRDRAG_MOVE && pHdl!=nullptr && pHdl->GetKind()!=HDL_MOVE) {
             eTmpMode=SDRDRAG_RESIZE;
         }
         mbDragLimit=TakeDragLimit(eTmpMode,maDragLimit);
         mbFramDrag=ImpIsFrameHandles();
         if (!mbFramDrag &&
-            (mpMarkedObj==NULL || !mpMarkedObj->hasSpecialDrag()) &&
-            (pHdl==NULL || pHdl->GetObj()==NULL)) {
+            (mpMarkedObj==nullptr || !mpMarkedObj->hasSpecialDrag()) &&
+            (pHdl==nullptr || pHdl->GetObj()==nullptr)) {
             mbFramDrag=true;
         }
 
         Point aPnt(rPnt);
-        if(pHdl == NULL
+        if(pHdl == nullptr
             || pHdl->GetKind() == HDL_MOVE
             || pHdl->GetKind() == HDL_MIRX
             || pHdl->GetKind() == HDL_TRNS
@@ -250,7 +250,7 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
         maDragStat.NextPoint();
         mpDragWin=pOut;
         mpDragHdl=pHdl;
-        meDragHdl= pHdl==NULL ? HDL_MOVE : pHdl->GetKind();
+        meDragHdl= pHdl==nullptr ? HDL_MOVE : pHdl->GetKind();
         mbDragHdl=meDragHdl==HDL_REF1 || meDragHdl==HDL_REF2 || meDragHdl==HDL_MIRX;
 
         // Expand test for HDL_ANCHOR_TR
@@ -479,7 +479,7 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
                 }
             }
         }
-        if (pForcedMeth!=NULL)
+        if (pForcedMeth!=nullptr)
         {
             delete mpCurrentSdrDragMethod;
             mpCurrentSdrDragMethod = pForcedMeth;
@@ -490,11 +490,11 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
             bRet = mpCurrentSdrDragMethod->BeginSdrDrag();
             if (!bRet)
             {
-                if (pHdl==NULL && dynamic_cast< const SdrDragObjOwn* >(mpCurrentSdrDragMethod) !=  nullptr)
+                if (pHdl==nullptr && dynamic_cast< const SdrDragObjOwn* >(mpCurrentSdrDragMethod) !=  nullptr)
                 {
                     // Obj may not Move SpecialDrag, so try with MoveFrameDrag
                     delete mpCurrentSdrDragMethod;
-                    mpCurrentSdrDragMethod = 0;
+                    mpCurrentSdrDragMethod = nullptr;
                     mbDragSpecial=false;
 
                     if (!IsMoveAllowed())
@@ -509,7 +509,7 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
             if (!bRet)
             {
                 delete mpCurrentSdrDragMethod;
-                mpCurrentSdrDragMethod = 0;
+                mpCurrentSdrDragMethod = nullptr;
                 maDragStat.SetDragMethod(mpCurrentSdrDragMethod);
             }
         }
@@ -555,7 +555,7 @@ bool SdrDragView::EndDragObj(bool bCopy)
             EndUndo();
 
         delete mpCurrentSdrDragMethod;
-        mpCurrentSdrDragMethod = 0;
+        mpCurrentSdrDragMethod = nullptr;
 
         if (bEliminatePolyPoints)
         {
@@ -578,7 +578,7 @@ bool SdrDragView::EndDragObj(bool bCopy)
         }
 
         meDragHdl=HDL_MOVE;
-        mpDragHdl=NULL;
+        mpDragHdl=nullptr;
 
         if (!mbSomeObjChgdFlag)
         {
@@ -607,13 +607,13 @@ void SdrDragView::BrkDragObj()
         mpCurrentSdrDragMethod->CancelSdrDrag();
 
         delete mpCurrentSdrDragMethod;
-        mpCurrentSdrDragMethod = 0;
+        mpCurrentSdrDragMethod = nullptr;
 
         if (mbInsPolyPoint)
         {
             mpInsPointUndo->Undo(); // delete inserted point again
             delete mpInsPointUndo;
-            mpInsPointUndo=NULL;
+            mpInsPointUndo=nullptr;
             SetMarkHandles();
             mbInsPolyPoint=false;
         }
@@ -622,18 +622,18 @@ void SdrDragView::BrkDragObj()
         {
             mpInsPointUndo->Undo(); // delete inserted glue point again
             delete mpInsPointUndo;
-            mpInsPointUndo=NULL;
+            mpInsPointUndo=nullptr;
             SetInsertGluePoint(false);
         }
 
         meDragHdl=HDL_MOVE;
-        mpDragHdl=NULL;
+        mpDragHdl=nullptr;
     }
 }
 
 bool SdrDragView::IsInsObjPointPossible() const
 {
-    return mpMarkedObj!=NULL && mpMarkedObj->IsPolyObj();
+    return mpMarkedObj!=nullptr && mpMarkedObj->IsPolyObj();
 }
 
 bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, bool bNewObj, OutputDevice* pOut)
@@ -692,7 +692,7 @@ bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point
         else
         {
             delete mpInsPointUndo;
-            mpInsPointUndo = NULL;
+            mpInsPointUndo = nullptr;
         }
     }
 
@@ -754,22 +754,22 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt)
         maInsPointUndoStr = aStr.replaceFirst("%1", pObj->TakeObjNameSingul() );
 
         SdrGluePointList* pGPL=pObj->ForceGluePointList();
-        if (pGPL!=NULL)
+        if (pGPL!=nullptr)
         {
             sal_uInt16 nGlueIdx=pGPL->Insert(SdrGluePoint());
             SdrGluePoint& rGP=(*pGPL)[nGlueIdx];
             sal_uInt16 nGlueId=rGP.GetId();
             rGP.SetAbsolutePos(rPnt,*pObj);
 
-            SdrHdl* pHdl=NULL;
+            SdrHdl* pHdl=nullptr;
             if (MarkGluePoint(pObj,nGlueId,pPV))
             {
                 pHdl=GetGluePointHdl(pObj,nGlueId);
             }
-            if (pHdl!=NULL && pHdl->GetKind()==HDL_GLUE && pHdl->GetObj()==pObj && pHdl->GetObjHdlNum()==nGlueId)
+            if (pHdl!=nullptr && pHdl->GetKind()==HDL_GLUE && pHdl->GetObj()==pObj && pHdl->GetObjHdlNum()==nGlueId)
             {
                 SetInsertGluePoint(true);
-                bRet=BegDragObj(rPnt,NULL,pHdl,0);
+                bRet=BegDragObj(rPnt,nullptr,pHdl,0);
                 if (bRet)
                 {
                     maDragStat.SetMinMoved();
@@ -779,7 +779,7 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt)
                 {
                     SetInsertGluePoint(false);
                     delete mpInsPointUndo;
-                    mpInsPointUndo=NULL;
+                    mpInsPointUndo=nullptr;
                 }
             }
             else
@@ -792,7 +792,7 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt)
             // no glue points possible for this object (e. g. Edge)
             SetInsertGluePoint(false);
             delete mpInsPointUndo;
-            mpInsPointUndo=NULL;
+            mpInsPointUndo=nullptr;
         }
     }
 
@@ -887,7 +887,7 @@ bool SdrDragView::IsOrthoDesired() const
 void SdrDragView::SetMarkHandles()
 {
     if( mpDragHdl )
-        mpDragHdl = 0;
+        mpDragHdl = nullptr;
 
     SdrExchangeView::SetMarkHandles();
 }