convert XFormTextShadow to scoped enum

Change-Id: I1ff9d2f4aec60f050d9dde8e4c0e991169f585cd

7 files changed, 18 insertions, 18 deletions

diff --git a/include/svx/xenum.hxx b/include/svx/xenum.hxx
index 7aa59e0d8620..586521948c8b 100644
--- a/include/svx/xenum.hxx
+++ b/include/svx/xenum.hxx
@@ -24,8 +24,8 @@
 enum XFormTextStyle     { XFT_ROTATE, XFT_UPRIGHT, XFT_SLANTX, XFT_SLANTY,
                           XFT_NONE };
 enum XFormTextAdjust    { XFT_LEFT, XFT_RIGHT, XFT_AUTOSIZE, XFT_CENTER };
-enum XFormTextShadow    { XFTSHADOW_NONE, XFTSHADOW_NORMAL, XFTSHADOW_SLANT};
-enum class XBitmapType  { Import, N8x8 };
+enum class XFormTextShadow  { NONE, Normal, Slant};
+enum class XBitmapType      { Import, N8x8 };
 
 
 #endif // INCLUDED_SVX_XENUM_HXX
diff --git a/include/svx/xftshit.hxx b/include/svx/xftshit.hxx
index ddd255607943..384bc306d51c 100644
--- a/include/svx/xftshit.hxx
+++ b/include/svx/xftshit.hxx
@@ -35,7 +35,7 @@ class SVX_DLLPUBLIC XFormTextShadowItem : public SfxEnumItem
 public:
                             static SfxPoolItem* CreateDefault();
 
-                            XFormTextShadowItem(XFormTextShadow = XFTSHADOW_NONE);
+                            XFormTextShadowItem(XFormTextShadow = XFormTextShadow::NONE);
                             XFormTextShadowItem(SvStream& rIn);
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = nullptr) const override;
     virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const override;
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 775bd6e7ad85..7a427197ead6 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -471,7 +471,7 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
 
         m_pTbxShadow->Enable();
 
-        if ( pItem->GetValue() == XFTSHADOW_NONE )
+        if ( pItem->GetValue() == XFormTextShadow::NONE )
         {
             nId = nShadowOffId;
             m_pFbShadowX->Hide();
@@ -488,7 +488,7 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
             m_pMtrFldShadowY->Enable();
             m_pShadowColorLB->Enable();
 
-            if ( pItem->GetValue() == XFTSHADOW_NORMAL )
+            if ( pItem->GetValue() == XFormTextShadow::Normal )
             {
                 nId = nShadowNormalId;
                 const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
@@ -708,7 +708,7 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectShadowHdl_Impl, ToolBox *, void)
     }
     else if (nId != nLastShadowTbxId)
     {
-        XFormTextShadow eShadow = XFTSHADOW_NONE;
+        XFormTextShadow eShadow = XFormTextShadow::NONE;
 
         if (nLastShadowTbxId == nShadowNormalId)
         {
@@ -722,8 +722,8 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectShadowHdl_Impl, ToolBox *, void)
         }
         nLastShadowTbxId = nId;
 
-        if ( nId == nShadowNormalId)     eShadow = XFTSHADOW_NORMAL;
-        else if (nId == nShadowSlantId) eShadow = XFTSHADOW_SLANT;
+        if ( nId == nShadowNormalId)     eShadow = XFormTextShadow::Normal;
+        else if (nId == nShadowSlantId) eShadow = XFormTextShadow::Slant;
 
         XFormTextShadowItem aItem(eShadow);
         GetBindings().GetDispatcher()->ExecuteList(SID_FORMTEXT_SHADOW,
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index ac34ebc32817..549103cb567e 100644
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx
@@ -159,7 +159,7 @@ namespace drawinglayer
             Color                                   maFormTextShdwColor;    // shadow color
 
             // outline attributes; used when getFormTextOutline() is true and (for
-            // shadow) when getFormTextShadow() != XFTSHADOW_NONE
+            // shadow) when getFormTextShadow() != XFormTextShadow::NONE
             SdrFormTextOutlineAttribute             maOutline;
             SdrFormTextOutlineAttribute             maShadowOutline;
 
@@ -195,7 +195,7 @@ namespace drawinglayer
                             aLineAttribute, aStrokeAttribute, nTransparence);
                     }
 
-                    if(XFTSHADOW_NONE != getFormTextShadow())
+                    if(XFormTextShadow::NONE != getFormTextShadow())
                     {
                         // also need to prepare attributes for shadow outlines
                         const LineAttribute aLineAttribute(impGetLineAttribute(true, rSet));
@@ -215,7 +215,7 @@ namespace drawinglayer
                 mnFormTextShdwTransp(0),
                 meFormTextStyle(XFT_NONE),
                 meFormTextAdjust(XFT_CENTER),
-                meFormTextShadow(XFTSHADOW_NONE),
+                meFormTextShadow(XFormTextShadow::NONE),
                 maFormTextShdwColor(),
                 maOutline(),
                 maShadowOutline(),
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index b007ba0a9877..925cdbbc9187 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -737,7 +737,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
                 rIndent=2;
                 if (ImpGetItem(*pSet,XATTR_FORMTXTSHADOW,pItem)) {
                     XFormTextShadow eShadow=static_cast<const XFormTextShadowItem*>(pItem)->GetValue();
-                    if (eShadow==XFTSHADOW_NONE) return true;
+                    if (eShadow==XFormTextShadow::NONE) return true;
                 }
             }
         } break;
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index a1f1b2fcc6f8..9a83d2766abd 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -380,17 +380,17 @@ namespace
                         }
 
                         // eventually create shadow primitives from aDecomposition and add to rDecomposition
-                        const bool bShadow(XFTSHADOW_NONE != maSdrFormTextAttribute.getFormTextShadow());
+                        const bool bShadow(XFormTextShadow::NONE != maSdrFormTextAttribute.getFormTextShadow());
 
                         if(bShadow)
                         {
-                            if(XFTSHADOW_NORMAL == maSdrFormTextAttribute.getFormTextShadow())
+                            if(XFormTextShadow::Normal == maSdrFormTextAttribute.getFormTextShadow())
                             {
                                 aNewShadowTransform.translate(
                                     maSdrFormTextAttribute.getFormTextShdwXVal(),
                                     -maSdrFormTextAttribute.getFormTextShdwYVal());
                             }
-                            else // XFTSHADOW_SLANT
+                            else // XFormTextShadow::Slant
                             {
                                 double fScaleValue(maSdrFormTextAttribute.getFormTextShdwYVal() / 100.0);
                                 double fShearValue(-maSdrFormTextAttribute.getFormTextShdwXVal() * F_PI1800);
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 00e2968ccf74..e22ba0bddebb 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -688,9 +688,9 @@ static SvXMLEnumMapEntry const pXML_Fontwork_Adjust_Enum[] =
 
 static SvXMLEnumMapEntry const pXML_Fontwork_Shadow_Enum[] =
 {
-    { XML_NORMAL,       0 }, //XFTSHADOW_NORMAL,
-    { XML_SLANT,        1 }, //XFTSHADOW_SLANT,
-    { XML_NONE,         2 }, //XFTSHADOW_NONE
+    { XML_NORMAL,       0 }, //XFormTextShadow::Normal,
+    { XML_SLANT,        1 }, //XFormTextShadow::Slant,
+    { XML_NONE,         2 }, //XFormTextShadow::NONE
     { XML_TOKEN_INVALID,0 }
 };