convert SvxEscapement to scoped enum

and fix a potential bug with footnotes and superscripts in writer in
ndtxt.cxx, where it was passing bad args to the SvxEscapementItem
constructor

Change-Id: I0d2de34c056e7824f3b456a86d502e10ac93a1c1

6 files changed, 37 insertions, 37 deletions

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index da8a62ab65c7..8b0c40a8922e 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3139,8 +3139,7 @@ bool SwTextNode::GetExpandText( SwTextNode& rDestNd, const SwIndex* pDestIdx,
                             if( !sExpand.isEmpty() )
                             {
                                 ++aDestIdx;     // insert behind
-                                SvxEscapementItem aItem(
-                                        SVX_ESCAPEMENT_SUPERSCRIPT );
+                                SvxEscapementItem aItem( SvxEscapement::Superscript, RES_CHRATR_ESCAPEMENT );
                                 rDestNd.InsertItem(
                                         aItem,
                                         aDestIdx.GetIndex(),
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index a842c8f437a8..1a116fc84c44 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1223,11 +1223,11 @@ HTMLOnOffState HTMLEndPosLst::GetHTMLItemState( const SfxPoolItem& rItem )
         switch( (const SvxEscapement)
                         static_cast<const SvxEscapementItem&>(rItem).GetEnumValue() )
         {
-        case SVX_ESCAPEMENT_SUPERSCRIPT:
-        case SVX_ESCAPEMENT_SUBSCRIPT:
+        case SvxEscapement::Superscript:
+        case SvxEscapement::Subscript:
             eState = HTML_ON_VALUE;
             break;
-        case SVX_ESCAPEMENT_OFF:
+        case SvxEscapement::Off:
             eState = HTML_OFF_VALUE;
             break;
         default:
@@ -2812,8 +2812,8 @@ static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt )
     const sal_Char *pStr = nullptr;
     switch( eEscape )
     {
-    case SVX_ESCAPEMENT_SUPERSCRIPT: pStr = OOO_STRING_SVTOOLS_HTML_superscript; break;
-    case SVX_ESCAPEMENT_SUBSCRIPT: pStr = OOO_STRING_SVTOOLS_HTML_subscript; break;
+    case SvxEscapement::Superscript: pStr = OOO_STRING_SVTOOLS_HTML_superscript; break;
+    case SvxEscapement::Subscript: pStr = OOO_STRING_SVTOOLS_HTML_subscript; break;
     default:
         ;
     }
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 397bead2b84c..206d55089c66 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3915,7 +3915,7 @@ void DocxAttributeOutput::OutputDefaultItem(const SfxPoolItem& rHt)
             bMustWrite = static_cast< const SvxCrossedOutItem& >(rHt).GetStrikeout() != STRIKEOUT_NONE;
             break;
         case RES_CHRATR_ESCAPEMENT:
-            bMustWrite = static_cast< const SvxEscapementItem& >(rHt).GetEscapement() != SVX_ESCAPEMENT_OFF;
+            bMustWrite = static_cast< const SvxEscapementItem& >(rHt).GetEscapement() != SvxEscapement::Off;
             break;
         case RES_CHRATR_FONT:
             bMustWrite = true;
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 8fff09ef6d3e..09883893c315 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -362,10 +362,10 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
             SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>(
                             aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
 
-            if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT )
-                aItem.SetEscapement( SVX_ESCAPEMENT_OFF );
+            if( eEsc == SvxEscapement::Superscript )
+                aItem.SetEscapement( SvxEscapement::Off );
             else
-                aItem.SetEscapement( SVX_ESCAPEMENT_SUPERSCRIPT );
+                aItem.SetEscapement( SvxEscapement::Superscript );
             aNewAttr.Put( aItem );
         }
         break;
@@ -375,10 +375,10 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
             SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>(
                             aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
 
-            if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT )
-                aItem.SetEscapement( SVX_ESCAPEMENT_OFF );
+            if( eEsc == SvxEscapement::Subscript )
+                aItem.SetEscapement( SvxEscapement::Off );
             else
-                aItem.SetEscapement( SVX_ESCAPEMENT_SUBSCRIPT );
+                aItem.SetEscapement( SvxEscapement::Subscript );
             aNewAttr.Put( aItem );
         }
         break;
@@ -726,14 +726,14 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
             case FN_SET_SUPER_SCRIPT:
             case FN_SET_SUB_SCRIPT:
             {
-                sal_uInt16 nEsc;
+                SvxEscapement nEsc;
                 if (nWhich==FN_SET_SUPER_SCRIPT)
-                    nEsc = SVX_ESCAPEMENT_SUPERSCRIPT;
+                    nEsc = SvxEscapement::Superscript;
                 else
-                    nEsc = SVX_ESCAPEMENT_SUBSCRIPT;
+                    nEsc = SvxEscapement::Subscript;
 
                 const SfxPoolItem *pEscItem = &aEditAttr.Get( EE_CHAR_ESCAPEMENT );
-                if( nEsc == static_cast<const SvxEscapementItem*>(pEscItem)->GetEnumValue() )
+                if( nEsc == static_cast<const SvxEscapementItem*>(pEscItem)->GetEscapement() )
                     rSet.Put( SfxBoolItem( nWhich, true ));
                 else
                     rSet.InvalidateItem( nWhich );
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index a894e3b98324..08a2ea217712 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -293,10 +293,10 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
             SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>(
                             aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
 
-            if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT )
-                aItem.SetEscapement( SVX_ESCAPEMENT_OFF );
+            if( eEsc == SvxEscapement::Superscript )
+                aItem.SetEscapement( SvxEscapement::Off );
             else
-                aItem.SetEscapement( SVX_ESCAPEMENT_SUPERSCRIPT );
+                aItem.SetEscapement( SvxEscapement::Superscript );
             aNewAttr.Put( aItem );
         }
         break;
@@ -306,10 +306,10 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
             SvxEscapement eEsc = (SvxEscapement ) static_cast<const SvxEscapementItem&>(
                             aEditAttr.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
 
-            if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT )
-                aItem.SetEscapement( SVX_ESCAPEMENT_OFF );
+            if( eEsc == SvxEscapement::Subscript )
+                aItem.SetEscapement( SvxEscapement::Off );
             else
-                aItem.SetEscapement( SVX_ESCAPEMENT_SUBSCRIPT );
+                aItem.SetEscapement( SvxEscapement::Subscript );
             aNewAttr.Put( aItem );
         }
         break;
@@ -594,7 +594,8 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet)
 
     SfxItemSet aEditAttr( pOLV->GetAttribs() );
     const SfxPoolItem *pAdjust = nullptr, *pLSpace = nullptr, *pEscItem = nullptr;
-    int eAdjust, nLSpace, nEsc;
+    int eAdjust, nLSpace;
+    SvxEscapement nEsc;
 
     while(nWhich)
     {
@@ -721,9 +722,9 @@ ASK_LINESPACE:
             }
             break;
 
-        case FN_SET_SUPER_SCRIPT:   nEsc = SVX_ESCAPEMENT_SUPERSCRIPT;
+        case FN_SET_SUPER_SCRIPT:   nEsc = SvxEscapement::Superscript;
                                     goto ASK_ESCAPE;
-        case FN_SET_SUB_SCRIPT:     nEsc = SVX_ESCAPEMENT_SUBSCRIPT;
+        case FN_SET_SUB_SCRIPT:     nEsc = SvxEscapement::Subscript;
                                     goto ASK_ESCAPE;
 ASK_ESCAPE:
             {
@@ -731,7 +732,7 @@ ASK_ESCAPE:
                     pEscItem = &aEditAttr.Get( EE_CHAR_ESCAPEMENT );
 
                 if( nEsc == static_cast<const SvxEscapementItem*>(
-                                                pEscItem)->GetEnumValue() )
+                                                pEscItem)->GetEscapement() )
                     bFlag = true;
                 else
                     nSlotId = 0;
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index bbc78e62a899..64d6370f4751 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -86,7 +86,7 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
         case FN_SET_SUB_SCRIPT:
         case FN_SET_SUPER_SCRIPT:
         {
-            SvxEscapement eEscape = SVX_ESCAPEMENT_SUBSCRIPT;
+            SvxEscapement eEscape = SvxEscapement::Subscript;
             switch (eState)
             {
             case STATE_TOGGLE:
@@ -94,11 +94,11 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
                 short nTmpEsc = static_cast<const SvxEscapementItem&>(
                             aSet.Get( RES_CHRATR_ESCAPEMENT )).GetEsc();
                 eEscape = nWhich == FN_SET_SUPER_SCRIPT ?
-                                SVX_ESCAPEMENT_SUPERSCRIPT:
-                                SVX_ESCAPEMENT_SUBSCRIPT;
+                                SvxEscapement::Superscript:
+                                SvxEscapement::Subscript;
                 if( (nWhich == FN_SET_SUB_SCRIPT && nTmpEsc < 0) ||
                             (nWhich == FN_SET_SUPER_SCRIPT && nTmpEsc > 0) )
-                    eEscape = SVX_ESCAPEMENT_OFF;
+                    eEscape = SvxEscapement::Off;
 
                 SfxBindings& rBind = GetView().GetViewFrame()->GetBindings();
                 if( nWhich == FN_SET_SUB_SCRIPT )
@@ -112,17 +112,17 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
             break;
             case STATE_ON:
                 eEscape = nWhich == FN_SET_SUPER_SCRIPT ?
-                                SVX_ESCAPEMENT_SUPERSCRIPT:
-                                SVX_ESCAPEMENT_SUBSCRIPT;
+                                SvxEscapement::Superscript:
+                                SvxEscapement::Subscript;
                 break;
             case STATE_OFF:
-                eEscape = SVX_ESCAPEMENT_OFF;
+                eEscape = SvxEscapement::Off;
                 break;
             }
             SvxEscapementItem aEscape( eEscape, RES_CHRATR_ESCAPEMENT );
-            if(eEscape == SVX_ESCAPEMENT_SUPERSCRIPT)
+            if(eEscape == SvxEscapement::Superscript)
                 aEscape.GetEsc() = DFLT_ESC_AUTO_SUPER;
-            else if(eEscape == SVX_ESCAPEMENT_SUBSCRIPT)
+            else if(eEscape == SvxEscapement::Subscript)
                 aEscape.GetEsc() = DFLT_ESC_AUTO_SUB;
             rSh.SetAttrItem( aEscape );
             rReq.AppendItem( aEscape );