convert IMPSDR_ constants to scoped enum

Change-Id: Id267196397e2aa743d75f03932b3301ad462d800

include/svx/svdmrkv.hxx

@@ -83,9 +83,13 @@ enum SdrViewEditMode {SDREDITMODE_EDIT,           // Also known as arrow or poin
                       SDREDITMODE_CREATE,         // Tool for object creation
                       SDREDITMODE_GLUEPOINTEDIT}; // Glue point editing mode
 
-#define IMPSDR_POINTSDESCRIPTION     0x0001
-#define IMPSDR_GLUEPOINTSDESCRIPTION 0x0002
-
+/** options for ImpTakeDescriptionStr() */
+enum class ImpTakeDescriptionOptions
+{
+    NONE       = 0,
+    POINTS     = 1,
+    GLUEPOINTS = 2,
+};
 
 class ImplMarkingOverlay;
 
@@ -161,7 +165,7 @@ protected:
     SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const;
     SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const;
     bool ImpIsFrameHandles() const;
-    void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal=0, sal_uInt16 nOpt=0) const;
+    void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal=0, ImpTakeDescriptionOptions nOpt=ImpTakeDescriptionOptions::NONE) const;
 
     // Generates a string including degrees symbol, from an angel specification in 1/100deg
     bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark);

svx/source/svdraw/svddrgmt.cxx

@@ -563,11 +563,11 @@ void SdrDragMethod::createSdrDragEntries_GlueDrag()
 
 void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal) const
 {
-    sal_uInt16 nOpt=0;
+    ImpTakeDescriptionOptions nOpt=ImpTakeDescriptionOptions::NONE;
     if (IsDraggingPoints()) {
-        nOpt=IMPSDR_POINTSDESCRIPTION;
+        nOpt=ImpTakeDescriptionOptions::POINTS;
     } else if (IsDraggingGluePoints()) {
-        nOpt=IMPSDR_GLUEPOINTSDESCRIPTION;
+        nOpt=ImpTakeDescriptionOptions::GLUEPOINTS;
     }
     getSdrDragView().ImpTakeDescriptionStr(nStrCacheID,rStr,nVal,nOpt);
 }

svx/source/svdraw/svdmrkv.cxx

@@ -2023,18 +2023,18 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const
 
 
 
-void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal, sal_uInt16 nOpt) const
+void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal, ImpTakeDescriptionOptions nOpt) const
 {
     rStr = ImpGetResStr(nStrCacheID);
     sal_Int32 nPos = rStr.indexOf("%1");
 
     if(nPos != -1)
     {
-        if(nOpt == IMPSDR_POINTSDESCRIPTION)
+        if(nOpt == ImpTakeDescriptionOptions::POINTS)
         {
             rStr = rStr.replaceAt(nPos, 2, GetDescriptionOfMarkedPoints());
         }
-        else if(nOpt == IMPSDR_GLUEPOINTSDESCRIPTION)
+        else if(nOpt == ImpTakeDescriptionOptions::GLUEPOINTS)
         {
             rStr = rStr.replaceAt(nPos, 2, GetDescriptionOfMarkedGluePoints());
         }

svx/source/svdraw/svdview.cxx

@@ -1282,11 +1282,11 @@ OUString SdrView::GetStatusText()
             ImpTakeDescriptionStr(STR_ViewMarked,aStr);
             if (IsGluePointEditMode()) {
                 if (HasMarkedGluePoints()) {
-                    ImpTakeDescriptionStr(STR_ViewMarked,aStr,0,IMPSDR_GLUEPOINTSDESCRIPTION);
+                    ImpTakeDescriptionStr(STR_ViewMarked,aStr,0,ImpTakeDescriptionOptions::GLUEPOINTS);
                 }
             } else {
                 if (HasMarkedPoints()) {
-                    ImpTakeDescriptionStr(STR_ViewMarked,aStr,0,IMPSDR_POINTSDESCRIPTION);
+                    ImpTakeDescriptionStr(STR_ViewMarked,aStr,0,ImpTakeDescriptionOptions::POINTS);
                 }
             }
         } else {