convert SdrMeasureTextVPos to scoped enum

Change-Id: I89cc8bc2cfdd3fe059bb38216a10d36dcfea3953

4 files changed, 49 insertions, 49 deletions

diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 3c8d08dc2a62..4585938afc4a 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -352,7 +352,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
                 RECT_POINT eRP = RP_MM;
                 switch( eVPos )
                 {
-                case SDRMEASURE_ABOVE:
+                case SdrMeasureTextVPos::Above:
                     switch( eHPos )
                     {
                     case SDRMEASURE_TEXTLEFTOUTSIDE:    eRP = RP_LT; break;
@@ -361,7 +361,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
                     case SDRMEASURE_TEXTHAUTO:          eRP = RP_MT; break;
                     }
                     break;
-                case SDRMEASURETEXT_VERTICALCENTERED:
+                case SdrMeasureTextVPos::VerticalCentered:
                     switch( eHPos )
                     {
                     case SDRMEASURE_TEXTLEFTOUTSIDE:    eRP = RP_LM; break;
@@ -370,7 +370,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
                     case SDRMEASURE_TEXTHAUTO:          eRP = RP_MM; break;
                     }
                     break;
-                case SDRMEASURE_BELOW:
+                case SdrMeasureTextVPos::Below:
                     switch( eHPos )
                     {
                     case SDRMEASURE_TEXTLEFTOUTSIDE:    eRP = RP_LB; break;
@@ -379,7 +379,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
                     case SDRMEASURE_TEXTHAUTO:          eRP = RP_MB; break;
                     }
                     break;
-                case SDRMEASURE_TEXTVAUTO:
+                case SdrMeasureTextVPos::Auto:
                     switch( eHPos )
                     {
                     case SDRMEASURE_TEXTLEFTOUTSIDE:    eRP = RP_LM; break;
@@ -399,7 +399,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
                     nState = CTL_STATE::NOHORZ;
                 }
 
-                if( eVPos == SDRMEASURE_TEXTVAUTO )
+                if( eVPos == SdrMeasureTextVPos::Auto )
                 {
                     m_pTsbAutoPosV->SetState( TRISTATE_TRUE );
                     nState |= CTL_STATE::NOVERT;
@@ -525,30 +525,30 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs)
         switch( eRP )
         {
             default:
-            case RP_LT: eVPos = SDRMEASURE_ABOVE;
+            case RP_LT: eVPos = SdrMeasureTextVPos::Above;
                         eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break;
-            case RP_LM: eVPos = SDRMEASURETEXT_VERTICALCENTERED;
+            case RP_LM: eVPos = SdrMeasureTextVPos::VerticalCentered;
                         eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break;
-            case RP_LB: eVPos = SDRMEASURE_BELOW;
+            case RP_LB: eVPos = SdrMeasureTextVPos::Below;
                         eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break;
-            case RP_MT: eVPos = SDRMEASURE_ABOVE;
+            case RP_MT: eVPos = SdrMeasureTextVPos::Above;
                         eHPos = SDRMEASURE_TEXTINSIDE; break;
-            case RP_MM: eVPos = SDRMEASURETEXT_VERTICALCENTERED;
+            case RP_MM: eVPos = SdrMeasureTextVPos::VerticalCentered;
                         eHPos = SDRMEASURE_TEXTINSIDE; break;
-            case RP_MB: eVPos = SDRMEASURE_BELOW;
+            case RP_MB: eVPos = SdrMeasureTextVPos::Below;
                         eHPos = SDRMEASURE_TEXTINSIDE; break;
-            case RP_RT: eVPos = SDRMEASURE_ABOVE;
+            case RP_RT: eVPos = SdrMeasureTextVPos::Above;
                         eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break;
-            case RP_RM: eVPos = SDRMEASURETEXT_VERTICALCENTERED;
+            case RP_RM: eVPos = SdrMeasureTextVPos::VerticalCentered;
                         eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break;
-            case RP_RB: eVPos = SDRMEASURE_BELOW;
+            case RP_RB: eVPos = SdrMeasureTextVPos::Below;
                         eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break;
         }
         if( m_pTsbAutoPosH->GetState() == TRISTATE_TRUE )
             eHPos = SDRMEASURE_TEXTHAUTO;
 
         if( m_pTsbAutoPosV->GetState() == TRISTATE_TRUE )
-            eVPos = SDRMEASURE_TEXTVAUTO;
+            eVPos = SdrMeasureTextVPos::Auto;
 
         if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTVPOS ) != SfxItemState::DONTCARE )
         {
@@ -754,23 +754,23 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p )
         switch( eRP )
         {
             default:
-            case RP_LT: eVPos = SDRMEASURE_ABOVE;
+            case RP_LT: eVPos = SdrMeasureTextVPos::Above;
                         eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break;
-            case RP_LM: eVPos = SDRMEASURETEXT_VERTICALCENTERED;
+            case RP_LM: eVPos = SdrMeasureTextVPos::VerticalCentered;
                         eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break;
-            case RP_LB: eVPos = SDRMEASURE_BELOW;
+            case RP_LB: eVPos = SdrMeasureTextVPos::Below;
                         eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break;
-            case RP_MT: eVPos = SDRMEASURE_ABOVE;
+            case RP_MT: eVPos = SdrMeasureTextVPos::Above;
                         eHPos = SDRMEASURE_TEXTINSIDE; break;
-            case RP_MM: eVPos = SDRMEASURETEXT_VERTICALCENTERED;
+            case RP_MM: eVPos = SdrMeasureTextVPos::VerticalCentered;
                         eHPos = SDRMEASURE_TEXTINSIDE; break;
-            case RP_MB: eVPos = SDRMEASURE_BELOW;
+            case RP_MB: eVPos = SdrMeasureTextVPos::Below;
                         eHPos = SDRMEASURE_TEXTINSIDE; break;
-            case RP_RT: eVPos = SDRMEASURE_ABOVE;
+            case RP_RT: eVPos = SdrMeasureTextVPos::Above;
                         eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break;
-            case RP_RM: eVPos = SDRMEASURETEXT_VERTICALCENTERED;
+            case RP_RM: eVPos = SdrMeasureTextVPos::VerticalCentered;
                         eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break;
-            case RP_RB: eVPos = SDRMEASURE_BELOW;
+            case RP_RB: eVPos = SdrMeasureTextVPos::Below;
                         eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break;
         }
 
@@ -784,7 +784,7 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p )
 
         if( m_pTsbAutoPosV->GetState() == TRISTATE_TRUE )
         {
-            eVPos = SDRMEASURE_TEXTVAUTO;
+            eVPos = SdrMeasureTextVPos::Auto;
             nState |= CTL_STATE::NOVERT;
         }
 
diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx
index 1df4cbc274de..8ae30065135a 100644
--- a/include/svx/sxmtpitm.hxx
+++ b/include/svx/sxmtpitm.hxx
@@ -24,7 +24,7 @@
 #include <svx/svxdllapi.h>
 
 enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE};
-enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_BREAKEDLINE,SDRMEASURE_BELOW,SDRMEASURETEXT_VERTICALCENTERED};
+enum class SdrMeasureTextVPos { Auto, Above, BreakedLine, Below, VerticalCentered };
 
 
 // class SdrMeasureTextHPosItem
@@ -50,7 +50,7 @@ public:
 
 class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem {
 public:
-    SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {}
+    SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SdrMeasureTextVPos::Auto): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {}
     SdrMeasureTextVPosItem(SvStream& rIn)                               : SfxEnumItem(SDRATTR_MEASURETEXTVPOS,rIn)    {}
     virtual SfxPoolItem*   Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem*   Create(SvStream& rIn, sal_uInt16 nVer) const override;
diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
index 3cccfca79db4..7713c860f163 100644
--- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
@@ -90,23 +90,23 @@ namespace sdr
 
             switch(static_cast<const SdrMeasureTextVPosItem&>(rItemSet.Get(SDRATTR_MEASURETEXTVPOS)).GetValue())
             {
-                case SDRMEASURE_ABOVE :
+                case SdrMeasureTextVPos::Above :
                 {
                     aMTPVer = drawinglayer::primitive2d::MEASURETEXTPOSITION_NEGATIVE;
                     break;
                 }
-                case SDRMEASURETEXT_BREAKEDLINE :
-                case SDRMEASURETEXT_VERTICALCENTERED :
+                case SdrMeasureTextVPos::BreakedLine :
+                case SdrMeasureTextVPos::VerticalCentered :
                 {
                     aMTPVer = drawinglayer::primitive2d::MEASURETEXTPOSITION_CENTERED;
                     break;
                 }
-                case SDRMEASURE_BELOW :
+                case SdrMeasureTextVPos::Below :
                 {
                     aMTPVer = drawinglayer::primitive2d::MEASURETEXTPOSITION_POSITIVE;
                     break;
                 }
-                default : // SDRMEASURE_TEXTVAUTO
+                default : // SdrMeasureTextVPos::Auto
                 {
                     break;
                 }
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 8e69c8d998b2..ec82869df556 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -412,9 +412,9 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
 
     rPol.eUsedTextHPos=rRec.eWantTextHPos;
     rPol.eUsedTextVPos=rRec.eWantTextVPos;
-    if (rPol.eUsedTextVPos==SDRMEASURE_TEXTVAUTO) rPol.eUsedTextVPos=SDRMEASURE_ABOVE;
-    bool bBrkLine=rPol.eUsedTextVPos==SDRMEASURETEXT_BREAKEDLINE;
-    if (rPol.eUsedTextVPos==SDRMEASURETEXT_VERTICALCENTERED)
+    if (rPol.eUsedTextVPos==SdrMeasureTextVPos::Auto) rPol.eUsedTextVPos=SdrMeasureTextVPos::Above;
+    bool bBrkLine=rPol.eUsedTextVPos==SdrMeasureTextVPos::BreakedLine;
+    if (rPol.eUsedTextVPos==SdrMeasureTextVPos::VerticalCentered)
     {
         OutlinerParaObject* pOutlinerParaObject = SdrTextObj::GetOutlinerParaObject();
         if (pOutlinerParaObject!=nullptr && pOutlinerParaObject->GetTextObject().GetParagraphCount()==1)
@@ -675,9 +675,9 @@ void SdrMeasureObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
             default: aTextPos.X()=aPt1b.X(); aTextSize2.Width()=nLen;
         }
         switch (eMV) {
-            case SDRMEASURETEXT_VERTICALCENTERED:
-            case SDRMEASURETEXT_BREAKEDLINE: aTextPos.Y()=aPt1b.Y()-aTextSize2.Height()/2; break;
-            case SDRMEASURE_BELOW: {
+            case SdrMeasureTextVPos::VerticalCentered:
+            case SdrMeasureTextVPos::BreakedLine: aTextPos.Y()=aPt1b.Y()-aTextSize2.Height()/2; break;
+            case SdrMeasureTextVPos::Below: {
                 if (!bUpsideDown) aTextPos.Y()=aPt1b.Y()+nLWdt;
                 else aTextPos.Y()=aPt1b.Y()-aTextSize2.Height()-nLWdt;
             } break;
@@ -697,9 +697,9 @@ void SdrMeasureObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
             default: aTextPos.X()=aPt1b.X(); aTextSize2.Height()=nLen;
         }
         switch (eMV) {
-            case SDRMEASURETEXT_VERTICALCENTERED:
-            case SDRMEASURETEXT_BREAKEDLINE: aTextPos.Y()=aPt1b.Y()+aTextSize2.Width()/2; break;
-            case SDRMEASURE_BELOW: {
+            case SdrMeasureTextVPos::VerticalCentered:
+            case SdrMeasureTextVPos::BreakedLine: aTextPos.Y()=aPt1b.Y()+aTextSize2.Width()/2; break;
+            case SdrMeasureTextVPos::Below: {
                 if (!bBelowRefEdge) aTextPos.Y()=aPt1b.Y()+aTextSize2.Width()+nLWdt;
                 else aTextPos.Y()=aPt1b.Y()-nLWdt;
             } break;
@@ -1333,21 +1333,21 @@ sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const
         if (eMH==SDRMEASURE_TEXTLEFTOUTSIDE) eTH=SDRTEXTHORZADJUST_RIGHT;
         if (eMH==SDRMEASURE_TEXTRIGHTOUTSIDE) eTH=SDRTEXTHORZADJUST_LEFT;
         // at eMH==SDRMEASURE_TEXTINSIDE we can anchor horizontally
-        if (eMV==SDRMEASURE_ABOVE) eTV=SDRTEXTVERTADJUST_BOTTOM;
-        if (eMV==SDRMEASURE_BELOW) eTV=SDRTEXTVERTADJUST_TOP;
-        if (eMV==SDRMEASURETEXT_BREAKEDLINE || eMV==SDRMEASURETEXT_VERTICALCENTERED) eTV=SDRTEXTVERTADJUST_CENTER;
+        if (eMV==SdrMeasureTextVPos::Above) eTV=SDRTEXTVERTADJUST_BOTTOM;
+        if (eMV==SdrMeasureTextVPos::Below) eTV=SDRTEXTVERTADJUST_TOP;
+        if (eMV==SdrMeasureTextVPos::BreakedLine || eMV==SdrMeasureTextVPos::VerticalCentered) eTV=SDRTEXTVERTADJUST_CENTER;
     } else {
         if (eMH==SDRMEASURE_TEXTLEFTOUTSIDE) eTV=SDRTEXTVERTADJUST_BOTTOM;
         if (eMH==SDRMEASURE_TEXTRIGHTOUTSIDE) eTV=SDRTEXTVERTADJUST_TOP;
         // at eMH==SDRMEASURE_TEXTINSIDE we can anchor vertically
         if (!bBelowRefEdge) {
-            if (eMV==SDRMEASURE_ABOVE) eTH=SDRTEXTHORZADJUST_LEFT;
-            if (eMV==SDRMEASURE_BELOW) eTH=SDRTEXTHORZADJUST_RIGHT;
+            if (eMV==SdrMeasureTextVPos::Above) eTH=SDRTEXTHORZADJUST_LEFT;
+            if (eMV==SdrMeasureTextVPos::Below) eTH=SDRTEXTHORZADJUST_RIGHT;
         } else {
-            if (eMV==SDRMEASURE_ABOVE) eTH=SDRTEXTHORZADJUST_RIGHT;
-            if (eMV==SDRMEASURE_BELOW) eTH=SDRTEXTHORZADJUST_LEFT;
+            if (eMV==SdrMeasureTextVPos::Above) eTH=SDRTEXTHORZADJUST_RIGHT;
+            if (eMV==SdrMeasureTextVPos::Below) eTH=SDRTEXTHORZADJUST_LEFT;
         }
-        if (eMV==SDRMEASURETEXT_BREAKEDLINE || eMV==SDRMEASURETEXT_VERTICALCENTERED) eTH=SDRTEXTHORZADJUST_CENTER;
+        if (eMV==SdrMeasureTextVPos::BreakedLine || eMV==SdrMeasureTextVPos::VerticalCentered) eTH=SDRTEXTHORZADJUST_CENTER;
     }
 
     EVAnchorMode eRet=ANCHOR_BOTTOM_HCENTER;