convert SdrCrookMode to scoped enum

Change-Id: If7c62d6c6f5bfa5f4f4f7bdb1af9384f3fa7cea8

include/svx/svdsnpv.hxx

@@ -79,11 +79,11 @@ namespace o3tl
     template<> struct typed_flags<SdrSnap> : is_typed_flags<SdrSnap, 3> {};
 }
 
-// SDRCROOK_STRETCH is not implemented yet!
-enum SdrCrookMode {
-    SDRCROOK_ROTATE,
-    SDRCROOK_SLANT,
-    SDRCROOK_STRETCH
+// SdrCrookMode::Stretch is not implemented yet!
+enum class SdrCrookMode {
+    Rotate,
+    Slant,
+    Stretch
 };
 
 
@@ -269,7 +269,7 @@ public:
     void SetCrookNoContortion(bool bOn) { bCrookNoContortion=bOn; }
     bool IsCrookNoContortion() const { return bCrookNoContortion; }
 
-    // Crook-Mode. persistent. Default=SDRCROOK_ROTATE. (ni)
+    // Crook-Mode. persistent. Default=SdrCrookMode::Rotate. (ni)
     void SetCrookMode(SdrCrookMode eMode) { eCrookMode=eMode; }
     SdrCrookMode GetCrookMode() const { return eCrookMode; }
 

sd/source/ui/func/fusel.cxx

@@ -1078,7 +1078,7 @@ void FuSelection::Activate()
             if ( mpView->GetDragMode() != eMode )
             {
                 mpView->SetDragMode(eMode);
-                mpView->SetCrookMode(SDRCROOK_ROTATE);
+                mpView->SetCrookMode(SdrCrookMode::Rotate);
             }
         }
         break;
@@ -1090,7 +1090,7 @@ void FuSelection::Activate()
             if ( mpView->GetDragMode() != eMode )
             {
                 mpView->SetDragMode(eMode);
-                mpView->SetCrookMode(SDRCROOK_SLANT);
+                mpView->SetCrookMode(SdrCrookMode::Slant);
             }
         }
         break;
@@ -1102,7 +1102,7 @@ void FuSelection::Activate()
             if ( mpView->GetDragMode() != eMode )
             {
                 mpView->SetDragMode(eMode);
-                mpView->SetCrookMode(SDRCROOK_STRETCH);
+                mpView->SetCrookMode(SdrCrookMode::Stretch);
             }
         }
         break;

svx/source/svdraw/svddrgmt.cxx

@@ -2793,7 +2793,7 @@ SdrDragCrook::SdrDragCrook(SdrDragView& rNewView)
     bAtCenter(false),
     nAngle(0),
     nMarkSize(0),
-    eMode(SDRCROOK_ROTATE)
+    eMode(SdrCrookMode::Rotate)
 {
 }
 
@@ -2994,9 +2994,9 @@ void SdrDragCrook::MovAllPoints(basegfx::B2DPolyPolygon& rTarget)
 
                         switch (eMode)
                         {
-                            case SDRCROOK_ROTATE : CrookRotateXPoint (aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical);           break;
-                            case SDRCROOK_SLANT  : CrookSlantXPoint  (aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical);           break;
-                            case SDRCROOK_STRETCH: CrookStretchXPoint(aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical,aMarkRect); break;
+                            case SdrCrookMode::Rotate : CrookRotateXPoint (aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical);           break;
+                            case SdrCrookMode::Slant  : CrookSlantXPoint  (aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical);           break;
+                            case SdrCrookMode::Stretch: CrookStretchXPoint(aCtr1,nullptr,nullptr,aC,aRad,nSin,nCos,bVertical,aMarkRect); break;
                         } // switch
                     }
 
@@ -3095,9 +3095,9 @@ void SdrDragCrook::MovCrookPoint(Point& rPnt, Point* pC1, Point* pC2)
 
         switch (eMode)
         {
-            case SDRCROOK_ROTATE : CrookRotateXPoint (rPnt,pC1,pC2,aC,aRad,nSin,nCos,bVert);           break;
-            case SDRCROOK_SLANT  : CrookSlantXPoint  (rPnt,pC1,pC2,aC,aRad,nSin,nCos,bVert);           break;
-            case SDRCROOK_STRETCH: CrookStretchXPoint(rPnt,pC1,pC2,aC,aRad,nSin,nCos,bVert,aMarkRect); break;
+            case SdrCrookMode::Rotate : CrookRotateXPoint (rPnt,pC1,pC2,aC,aRad,nSin,nCos,bVert);           break;
+            case SdrCrookMode::Slant  : CrookSlantXPoint  (rPnt,pC1,pC2,aC,aRad,nSin,nCos,bVert);           break;
+            case SdrCrookMode::Stretch: CrookStretchXPoint(rPnt,pC1,pC2,aC,aRad,nSin,nCos,bVert,aMarkRect); break;
         } // switch
     }
 }
@@ -3111,7 +3111,7 @@ void SdrDragCrook::MoveSdrDrag(const Point& rPnt)
         SdrCrookMode eNeuMode=getSdrDragView().GetCrookMode();
         bool bNeuContortion=!bNeuMoveOnly && ((bContortionAllowed && !getSdrDragView().IsCrookNoContortion()) || !bNoContortionAllowed);
         bResize=!getSdrDragView().IsOrtho() && bResizeAllowed && !bNeuMoveOnly;
-        bool bNeuRotate=bRotateAllowed && !bNeuContortion && !bNeuMoveOnly && eNeuMode==SDRCROOK_ROTATE;
+        bool bNeuRotate=bRotateAllowed && !bNeuContortion && !bNeuMoveOnly && eNeuMode==SdrCrookMode::Rotate;
 
         Point aPnt(GetSnapPos(rPnt));
 
@@ -3310,7 +3310,7 @@ void SdrDragCrook::applyCurrentTransformationToSdrObject(SdrObject& rTarget)
         if (bDoCrook)
         {
             const Rectangle aLocalMarkRect(getSdrDragView().GetMarkedObjRect());
-            const bool bLocalRotate(!bContortion && eMode == SDRCROOK_ROTATE && getSdrDragView().IsRotateAllowed());
+            const bool bLocalRotate(!bContortion && eMode == SdrCrookMode::Rotate && getSdrDragView().IsRotateAllowed());
 
             SdrEditView::ImpCrookObj(&rTarget,aCenter,aRad,eMode,bVertical,!bContortion,bLocalRotate,aLocalMarkRect);
         }

svx/source/svdraw/svdedtv1.cxx

@@ -509,9 +509,9 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
     {
         XPolyPolygon aXPP(pPath->GetPathPoly());
         switch (eMode) {
-            case SDRCROOK_ROTATE : CrookRotatePoly (aXPP,rRef,rRad,bVertical);           break;
-            case SDRCROOK_SLANT  : CrookSlantPoly  (aXPP,rRef,rRad,bVertical);           break;
-            case SDRCROOK_STRETCH: CrookStretchPoly(aXPP,rRef,rRad,bVertical,rMarkRect); break;
+            case SdrCrookMode::Rotate : CrookRotatePoly (aXPP,rRef,rRad,bVertical);           break;
+            case SdrCrookMode::Slant  : CrookSlantPoly  (aXPP,rRef,rRad,bVertical);           break;
+            case SdrCrookMode::Stretch: CrookStretchPoly(aXPP,rRef,rRad,bVertical,rMarkRect); break;
         } // switch
         pPath->SetPathPoly(aXPP.getB2DPolyPolygon());
         bDone = true;
@@ -532,9 +532,9 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
 
         switch (eMode)
         {
-            case SDRCROOK_ROTATE : CrookRotatePoly (aXP,rRef,rRad,bVertical);           break;
-            case SDRCROOK_SLANT  : CrookSlantPoly  (aXP,rRef,rRad,bVertical);           break;
-            case SDRCROOK_STRETCH: CrookStretchPoly(aXP,rRef,rRad,bVertical,rMarkRect); break;
+            case SdrCrookMode::Rotate : CrookRotatePoly (aXP,rRef,rRad,bVertical);           break;
+            case SdrCrookMode::Slant  : CrookSlantPoly  (aXP,rRef,rRad,bVertical);           break;
+            case SdrCrookMode::Stretch: CrookStretchPoly(aXP,rRef,rRad,bVertical,rMarkRect); break;
         }
 
         for(nPtNum = 0L; nPtNum < nPointCount; nPtNum++)
@@ -562,9 +562,9 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
 
             switch (eMode)
             {
-                case SDRCROOK_ROTATE : nAngle=CrookRotateXPoint (aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical); bRotOk=bRotate; break;
-                case SDRCROOK_SLANT  : nAngle=CrookSlantXPoint  (aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical);           break;
-                case SDRCROOK_STRETCH: nAngle=CrookStretchXPoint(aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical,rMarkRect); break;
+                case SdrCrookMode::Rotate : nAngle=CrookRotateXPoint (aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical); bRotOk=bRotate; break;
+                case SdrCrookMode::Slant  : nAngle=CrookSlantXPoint  (aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical);           break;
+                case SdrCrookMode::Stretch: nAngle=CrookStretchXPoint(aCtr1,nullptr,nullptr,rRef,rRad,nSin,nCos,bVertical,rMarkRect); break;
             }
         }
 
@@ -583,7 +583,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
     Rectangle aMarkRect(GetMarkedObjRect());
     const bool bUndo = IsUndoEnabled();
 
-    bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed();
+    bool bRotate=bNoContortion && eMode==SdrCrookMode::Rotate && IsRotateAllowed();
 
     if( bUndo )
     {

svx/source/svdraw/svdsnpv.cxx

@@ -181,7 +181,7 @@ SdrSnapView::SdrSnapView(SdrModel* pModel1, OutputDevice* pOut)
     , nMagnSizPix(4)
     , nSnapAngle(1500)
     , nEliminatePolyPointLimitAngle(0)
-    , eCrookMode(SDRCROOK_ROTATE)
+    , eCrookMode(SdrCrookMode::Rotate)
     , bSnapEnab(true)
     , bGridSnap(true)
     , bBordSnap(true)