From 990082f37c31380d9fedd62c5dac1b5bff4c9636 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Sun, 29 May 2016 20:23:09 +0200
Subject: Convert FontRelief to scoped enum

Change-Id: I545c83d742db27f1a004b66e5eb1ef768f62e011
Reviewed-on: https://gerrit.libreoffice.org/25626
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
---
 sw/source/core/bastyp/init.cxx               |  2 +-
 sw/source/filter/ww8/docxattributeoutput.cxx |  6 +++---
 sw/source/filter/ww8/rtfattributeoutput.cxx  |  4 ++--
 sw/source/filter/ww8/ww8atr.cxx              |  4 ++--
 sw/source/filter/ww8/ww8par6.cxx             | 10 +++++-----
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'sw')

diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 6441245fc443..fd3b63135752 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -507,7 +507,7 @@ void InitCore()
     aAttrTab[ RES_CHRATR_EMPHASIS_MARK - POOLATTR_BEGIN ] = new SvxEmphasisMarkItem( FontEmphasisMark::NONE, RES_CHRATR_EMPHASIS_MARK );
     aAttrTab[ RES_CHRATR_TWO_LINES - POOLATTR_BEGIN ] =     new SvxTwoLinesItem( false, 0, 0, RES_CHRATR_TWO_LINES );
     aAttrTab[ RES_CHRATR_SCALEW - POOLATTR_BEGIN ] =        new SvxCharScaleWidthItem( 100, RES_CHRATR_SCALEW );
-    aAttrTab[ RES_CHRATR_RELIEF - POOLATTR_BEGIN ] =        new SvxCharReliefItem( RELIEF_NONE, RES_CHRATR_RELIEF );
+    aAttrTab[ RES_CHRATR_RELIEF - POOLATTR_BEGIN ] =        new SvxCharReliefItem( FontRelief::NONE, RES_CHRATR_RELIEF );
     aAttrTab[ RES_CHRATR_HIDDEN - POOLATTR_BEGIN ] =        new SvxCharHiddenItem( false, RES_CHRATR_HIDDEN );
     aAttrTab[ RES_CHRATR_OVERLINE- POOLATTR_BEGIN ] =       new SvxOverlineItem( LINESTYLE_NONE, RES_CHRATR_OVERLINE );
     aAttrTab[ RES_CHRATR_BOX - POOLATTR_BEGIN ] =           new SvxBoxItem( RES_CHRATR_BOX );
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1678188120aa..59d375ec6407 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3992,7 +3992,7 @@ void DocxAttributeOutput::OutputDefaultItem(const SfxPoolItem& rHt)
             bMustWrite = static_cast< const SvxCharScaleWidthItem& >(rHt).GetValue() != 100;
             break;
         case RES_CHRATR_RELIEF:
-            bMustWrite = static_cast< const SvxCharReliefItem& >(rHt).GetValue() != RELIEF_NONE;
+            bMustWrite = static_cast< const SvxCharReliefItem& >(rHt).GetValue() != FontRelief::NONE;
             break;
         case RES_CHRATR_HIDDEN:
             bMustWrite = static_cast< const SvxCharHiddenItem& >(rHt).GetValue();
@@ -6545,10 +6545,10 @@ void DocxAttributeOutput::CharRelief( const SvxCharReliefItem& rRelief )
 {
     switch ( rRelief.GetValue() )
     {
-        case RELIEF_EMBOSSED:
+        case FontRelief::Embossed:
             m_pSerializer->singleElementNS( XML_w, XML_emboss, FSEND );
             break;
-        case RELIEF_ENGRAVED:
+        case FontRelief::Engraved:
             m_pSerializer->singleElementNS( XML_w, XML_imprint, FSEND );
             break;
         default:
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index e0ee720cc0b0..59b6bb5abc54 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2582,10 +2582,10 @@ void RtfAttributeOutput::CharRelief(const SvxCharReliefItem& rRelief)
     const sal_Char* pStr;
     switch (rRelief.GetValue())
     {
-    case RELIEF_EMBOSSED:
+    case FontRelief::Embossed:
         pStr = OOO_STRING_SVTOOLS_RTF_EMBO;
         break;
-    case RELIEF_ENGRAVED:
+    case FontRelief::Engraved:
         pStr = OOO_STRING_SVTOOLS_RTF_IMPR;
         break;
     default:
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index ebd51df6be9e..a987d145e4d1 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1387,8 +1387,8 @@ void WW8AttributeOutput::CharRelief( const SvxCharReliefItem& rRelief )
     sal_uInt16 nId;
     switch ( rRelief.GetValue() )
     {
-        case RELIEF_EMBOSSED:   nId = NS_sprm::LN_CFEmboss;     break;
-        case RELIEF_ENGRAVED:   nId = NS_sprm::LN_CFImprint;    break;
+        case FontRelief::Embossed:   nId = NS_sprm::LN_CFEmboss;     break;
+        case FontRelief::Engraved:   nId = NS_sprm::LN_CFImprint;    break;
         default:                nId = 0;                        break;
     }
 
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 06d3ebca1808..c50d6d789674 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4491,13 +4491,13 @@ void SwWW8ImplReader::Read_Relief( sal_uInt16 nId, const sal_uInt8* pData, short
 
             const SvxCharReliefItem* pOld = static_cast<const SvxCharReliefItem*>(
                                             GetFormatAttr( RES_CHRATR_RELIEF ));
-            FontRelief nNewValue = 0x854 == nId ? RELIEF_ENGRAVED
-                                        : ( 0x858 == nId ? RELIEF_EMBOSSED
-                                                         : RELIEF_NONE );
+            FontRelief nNewValue = 0x854 == nId ? FontRelief::Engraved
+                                        : ( 0x858 == nId ? FontRelief::Embossed
+                                                         : FontRelief::NONE );
             if( pOld->GetValue() == nNewValue )
             {
-                if( RELIEF_NONE != nNewValue )
-                    nNewValue = RELIEF_NONE;
+                if( FontRelief::NONE != nNewValue )
+                    nNewValue = FontRelief::NONE;
             }
             NewAttr( SvxCharReliefItem( nNewValue, RES_CHRATR_RELIEF ));
         }
-- 
cgit