convert SvxCaseMap to scoped enum

Change-Id: Iea77ddc21e9b2d5a021c08e323da9ccabf9d46bd
Reviewed-on: https://gerrit.libreoffice.org/34963
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 27 insertions, 25 deletions

diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index f2c298063391..09b990930d82 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -159,7 +159,7 @@ std::vector<SfxPoolItem*>* GlobalEditData::GetDefItems()
         rDefItems[45] = new SfxVoidItem( EE_CHAR_RUBI_DUMMY );
         rDefItems[46] = new SvXMLAttrContainerItem( EE_CHAR_XMLATTRIBS );
         rDefItems[47] = new SvxOverlineItem( LINESTYLE_NONE, EE_CHAR_OVERLINE );
-        rDefItems[48] = new SvxCaseMapItem( SVX_CASEMAP_NOT_MAPPED, EE_CHAR_CASEMAP );
+        rDefItems[48] = new SvxCaseMapItem( SvxCaseMap::NotMapped, EE_CHAR_CASEMAP );
         rDefItems[49] = new SfxGrabBagItem( EE_CHAR_GRABBAG );
         rDefItems[50] = new SvxBackgroundColorItem( Color( COL_AUTO ), EE_CHAR_BKGCOLOR );
         // Features
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index e52a4eea1877..274e31f8f2ab 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -32,7 +32,7 @@ SvxFont::SvxFont()
 {
     nKern = nEsc = 0;
     nPropr = 100;
-    eCaseMap = SVX_CASEMAP_NOT_MAPPED;
+    eCaseMap = SvxCaseMap::NotMapped;
     SetLanguage(LANGUAGE_SYSTEM);
 }
 
@@ -41,7 +41,7 @@ SvxFont::SvxFont( const vcl::Font &rFont )
 {
     nKern = nEsc = 0;
     nPropr = 100;
-    eCaseMap = SVX_CASEMAP_NOT_MAPPED;
+    eCaseMap = SvxCaseMap::NotMapped;
     SetLanguage(LANGUAGE_SYSTEM);
 }
 
@@ -106,19 +106,19 @@ OUString SvxFont::CalcCaseMap(const OUString &rTxt) const
 
     switch( eCaseMap )
     {
-        case SVX_CASEMAP_KAPITAELCHEN:
-        case SVX_CASEMAP_VERSALIEN:
+        case SvxCaseMap::SmallCaps:
+        case SvxCaseMap::Uppercase:
         {
             aTxt = aCharClass.uppercase( aTxt );
             break;
         }
 
-        case SVX_CASEMAP_GEMEINE:
+        case SvxCaseMap::Lowercase:
         {
             aTxt = aCharClass.lowercase( aTxt );
             break;
         }
-        case SVX_CASEMAP_TITEL:
+        case SvxCaseMap::Capitalize:
         {
             // Every beginning of a word is capitalized,  the rest of the word
             // is taken over as is.
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 2a21c0c194f0..c3056134e1c3 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -115,7 +115,7 @@ SfxPoolItem* SvxContourItem::CreateDefault() {return new SvxContourItem(false, 0
 SfxPoolItem* SvxColorItem::CreateDefault() {return new SvxColorItem(0);}
 SfxPoolItem* SvxBackgroundColorItem::CreateDefault() {return new SvxBackgroundColorItem(0);}
 SfxPoolItem* SvxKerningItem::CreateDefault() {return new SvxKerningItem(0, 0);}
-SfxPoolItem* SvxCaseMapItem::CreateDefault() {return new SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, 0);}
+SfxPoolItem* SvxCaseMapItem::CreateDefault() {return new SvxCaseMapItem(SvxCaseMap::NotMapped, 0);}
 SfxPoolItem* SvxEscapementItem::CreateDefault() {return new SvxEscapementItem(0);}
 SfxPoolItem* SvxLanguageItem::CreateDefault() {return new SvxLanguageItem(LANGUAGE_GERMAN, 0);}
 SfxPoolItem* SvxBlinkItem::CreateDefault() {return new SvxBlinkItem(false, 0);}
@@ -2079,7 +2079,7 @@ SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const sal_uInt16 nId ) :
 
 sal_uInt16 SvxCaseMapItem::GetValueCount() const
 {
-    return SVX_CASEMAP_END; // SVX_CASEMAP_KAPITAELCHEN + 1
+    return (sal_uInt16)SvxCaseMap::End; // SvxCaseMap::SmallCaps + 1
 }
 
 
@@ -2091,7 +2091,7 @@ SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const
 
 SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
-    rStrm.WriteUChar( GetValue() );
+    rStrm.WriteUChar( (sal_uInt8)GetValue() );
     return rStrm;
 }
 
@@ -2112,14 +2112,14 @@ bool SvxCaseMapItem::GetPresentation
     OUString&           rText, const IntlWrapper * /*pIntl*/
 )   const
 {
-    rText = GetValueTextByPos( GetValue() );
+    rText = GetValueTextByPos( (sal_uInt16)GetValue() );
     return true;
 }
 
 
 OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
-    DBG_ASSERT( nPos < (sal_uInt16)SVX_CASEMAP_END, "enum overflow!" );
+    DBG_ASSERT( nPos < (sal_uInt16)SvxCaseMap::End, "enum overflow!" );
     return EE_RESSTR(RID_SVXITEMS_CASEMAP_BEGIN + nPos);
 }
 
@@ -2128,10 +2128,10 @@ bool SvxCaseMapItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
     sal_Int16 nRet = style::CaseMap::NONE;
     switch( GetValue() )
     {
-        case SVX_CASEMAP_VERSALIEN   :      nRet = style::CaseMap::UPPERCASE; break;
-        case SVX_CASEMAP_GEMEINE     :      nRet = style::CaseMap::LOWERCASE; break;
-        case SVX_CASEMAP_TITEL       :      nRet = style::CaseMap::TITLE    ; break;
-        case SVX_CASEMAP_KAPITAELCHEN:      nRet = style::CaseMap::SMALLCAPS; break;
+        case SvxCaseMap::Uppercase   :      nRet = style::CaseMap::UPPERCASE; break;
+        case SvxCaseMap::Lowercase     :      nRet = style::CaseMap::LOWERCASE; break;
+        case SvxCaseMap::Capitalize       :      nRet = style::CaseMap::TITLE    ; break;
+        case SvxCaseMap::SmallCaps:      nRet = style::CaseMap::SMALLCAPS; break;
         default: break;
     }
     rVal <<= (sal_Int16)(nRet);
@@ -2144,15 +2144,17 @@ bool SvxCaseMapItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
     if(!(rVal >>= nVal))
         return false;
 
+    SvxCaseMap eVal;
     switch( nVal )
     {
-    case style::CaseMap::NONE    :  nVal = SVX_CASEMAP_NOT_MAPPED  ; break;
-    case style::CaseMap::UPPERCASE:  nVal = SVX_CASEMAP_VERSALIEN   ; break;
-    case style::CaseMap::LOWERCASE:  nVal = SVX_CASEMAP_GEMEINE     ; break;
-    case style::CaseMap::TITLE    :  nVal = SVX_CASEMAP_TITEL       ; break;
-    case style::CaseMap::SMALLCAPS:  nVal = SVX_CASEMAP_KAPITAELCHEN; break;
+    case style::CaseMap::NONE    :   eVal = SvxCaseMap::NotMapped; break;
+    case style::CaseMap::UPPERCASE:  eVal = SvxCaseMap::Uppercase;  break;
+    case style::CaseMap::LOWERCASE:  eVal = SvxCaseMap::Lowercase; break;
+    case style::CaseMap::TITLE    :  eVal = SvxCaseMap::Capitalize; break;
+    case style::CaseMap::SMALLCAPS:  eVal = SvxCaseMap::SmallCaps; break;
+    default: return false;
     }
-    SetValue((SvxCaseMap)nVal);
+    SetValue(eVal);
     return true;
 }
 
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 8b8fb4330dac..b2085cacebf5 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -554,11 +554,11 @@ SET_FONTALIGNMENT:
                 {
                     SvxCaseMap eCaseMap;
                     if( !nTokenValue )
-                        eCaseMap = SVX_CASEMAP_NOT_MAPPED;
+                        eCaseMap = SvxCaseMap::NotMapped;
                     else if( RTF_CAPS == nToken )
-                        eCaseMap = SVX_CASEMAP_VERSALIEN;
+                        eCaseMap = SvxCaseMap::Uppercase;
                     else
-                        eCaseMap = SVX_CASEMAP_KAPITAELCHEN;
+                        eCaseMap = SvxCaseMap::SmallCaps;
 
                     pSet->Put( SvxCaseMapItem( eCaseMap, aPlainMap.nCaseMap ));
                 }