convert E3dDragConstraint to typed_flags_set

Change-Id: Idd6d3e1ed0248b54247b2d86ce771ac5f5bb7c41

3 files changed, 13 insertions, 13 deletions

diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index 3c4eacbbf344..5097e0ac64a7 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -66,7 +66,7 @@ public:
     E3dDragMethod(
         SdrDragView &rView,
         const SdrMarkList& rMark,
-        E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
+        E3dDragConstraint eConstr = E3dDragConstraint::XYZ,
         bool bFull = false);
 
     virtual void TakeSdrDragComment(OUString& rStr) const override;
@@ -88,7 +88,7 @@ public:
     E3dDragRotate(
         SdrDragView &rView,
         const SdrMarkList& rMark,
-        E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
+        E3dDragConstraint eConstr = E3dDragConstraint::XYZ,
         bool bFull = false);
 
     virtual void MoveSdrDrag(const Point& rPnt) override;
@@ -106,7 +106,7 @@ public:
         SdrDragView &rView,
         const SdrMarkList& rMark,
         SdrHdlKind eDrgHdl = SdrHdlKind::Move,
-        E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
+        E3dDragConstraint eConstr = E3dDragConstraint::XYZ,
         bool bFull = false);
 
     virtual void MoveSdrDrag(const Point& rPnt) override;
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 640170ce9509..eb4d6c2d2a4d 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -112,7 +112,7 @@ void E3dDragMethod::TakeSdrDragComment(OUString& /*rStr*/) const
 
 bool E3dDragMethod::BeginSdrDrag()
 {
-    if(E3DDRAG_CONSTR_Z == meConstraint)
+    if(E3dDragConstraint::Z == meConstraint)
     {
         const sal_uInt32 nCnt(maGrp.size());
         DragStat().Ref1() = maFullBound.Center();
@@ -334,7 +334,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt)
             double fWAngle, fHAngle;
             E3dDragMethodUnit& rCandidate = maGrp[nOb];
 
-            if(E3DDRAG_CONSTR_Z == meConstraint)
+            if(E3dDragConstraint::Z == meConstraint)
             {
                 fWAngle = NormAngle360(GetAngle(rPnt - DragStat().GetRef1()) -
                     rCandidate.mnStartAngle) - rCandidate.mnLastAngle;
@@ -368,21 +368,21 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt)
 
             // Determine transformation
             basegfx::B3DHomMatrix aRotMat;
-            if(E3DDRAG_CONSTR_Y & meConstraint)
+            if(E3dDragConstraint::Y & meConstraint)
             {
                 if(nModifier & KEY_MOD2)
                     aRotMat.rotate(0.0, 0.0, fWAngle);
                 else
                     aRotMat.rotate(0.0, fWAngle, 0.0);
             }
-            else if(E3DDRAG_CONSTR_Z & meConstraint)
+            else if(E3dDragConstraint::Z & meConstraint)
             {
                 if(nModifier & KEY_MOD2)
                     aRotMat.rotate(0.0, fWAngle, 0.0);
                 else
                     aRotMat.rotate(0.0, 0.0, fWAngle);
             }
-            if(E3DDRAG_CONSTR_X & meConstraint)
+            if(E3dDragConstraint::X & meConstraint)
             {
                 aRotMat.rotate(fHAngle, 0.0, 0.0);
             }
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 84548d11bd24..82fde6d555ba 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -1207,7 +1207,7 @@ bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
 
         if(bOwnActionNecessary && GetMarkedObjectCount() > 0)
         {
-            E3dDragConstraint eConstraint = E3DDRAG_CONSTR_XYZ;
+            E3dDragConstraint eConstraint = E3dDragConstraint::XYZ;
             bool bThereAreRootScenes = false;
             bool bThereAre3DObjects = false;
             const size_t nCnt = GetMarkedObjectCount();
@@ -1235,14 +1235,14 @@ bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
                             case SdrHdlKind::Left:
                             case SdrHdlKind::Right:
                             {
-                                eConstraint = E3DDRAG_CONSTR_X;
+                                eConstraint = E3dDragConstraint::X;
                             }
                             break;
 
                             case SdrHdlKind::Upper:
                             case SdrHdlKind::Lower:
                             {
-                                eConstraint = E3DDRAG_CONSTR_Y;
+                                eConstraint = E3dDragConstraint::Y;
                             }
                             break;
 
@@ -1251,7 +1251,7 @@ bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
                             case SdrHdlKind::LowerLeft:
                             case SdrHdlKind::LowerRight:
                             {
-                                eConstraint = E3DDRAG_CONSTR_Z;
+                                eConstraint = E3dDragConstraint::Z;
                             }
                             break;
                             default: break;
@@ -1516,7 +1516,7 @@ void E3dView::ResetCreationActive ()
 
 void E3dView::InitView ()
 {
-    eDragConstraint          = E3DDRAG_CONSTR_XYZ;
+    eDragConstraint          = E3dDragConstraint::XYZ;
     fDefaultScaleX           =
     fDefaultScaleY           =
     fDefaultScaleZ           = 1.0;