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>

29 files changed, 112 insertions, 108 deletions

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 2fa3116c4942..53e5e08200c8 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1528,10 +1528,11 @@ void SvxCharEffectsPage::UpdatePreview_Impl()
     sal_Int32 nCapsPos = m_pEffectsLB->GetSelectEntryPos();
     if ( nCapsPos != LISTBOX_ENTRY_NOTFOUND )
     {
-        rFont.SetCaseMap( (SvxCaseMap)nCapsPos );
-        rCJKFont.SetCaseMap( (SvxCaseMap)nCapsPos );
+        SvxCaseMap eCaps = (SvxCaseMap)nCapsPos;
+        rFont.SetCaseMap( eCaps );
+        rCJKFont.SetCaseMap( eCaps );
         // #i78474# small caps do not exist in CTL fonts
-        rCTLFont.SetCaseMap( static_cast<SvxCaseMap>( nCapsPos == SVX_CASEMAP_KAPITAELCHEN ? SVX_CASEMAP_NOT_MAPPED : (SvxCaseMap)nCapsPos) );
+        rCTLFont.SetCaseMap( eCaps == SvxCaseMap::SmallCaps ? SvxCaseMap::NotMapped : eCaps );
     }
 
     bool bWordLine = m_pIndividualWordsBtn->IsChecked();
@@ -1545,7 +1546,7 @@ void SvxCharEffectsPage::UpdatePreview_Impl()
 
 void SvxCharEffectsPage::SetCaseMap_Impl( SvxCaseMap eCaseMap )
 {
-    if ( SVX_CASEMAP_END > eCaseMap )
+    if ( SvxCaseMap::End > eCaseMap )
         m_pEffectsLB->SelectEntryPos(
             sal::static_int_cast< sal_Int32 >( eCaseMap ) );
     else
@@ -1919,7 +1920,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
         // this is for consistency only. Here it would be allowed to call SelectHdl_Impl directly ...
 
     // Effects
-    SvxCaseMap eCaseMap = SVX_CASEMAP_END;
+    SvxCaseMap eCaseMap = SvxCaseMap::End;
     nWhich = GetWhich( SID_ATTR_CHAR_CASEMAP );
     eState = rSet->GetItemState( nWhich );
     switch ( eState )
@@ -2290,7 +2291,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
     // Effects
     nWhich = GetWhich( SID_ATTR_CHAR_CASEMAP );
     pOld = GetOldItem( *rSet, SID_ATTR_CHAR_CASEMAP );
-    SvxCaseMap eCaseMap = SVX_CASEMAP_NOT_MAPPED;
+    SvxCaseMap eCaseMap = SvxCaseMap::NotMapped;
     bool bChecked = false;
     sal_Int32 nCapsPos = m_pEffectsLB->GetSelectEntryPos();
     if ( nCapsPos != LISTBOX_ENTRY_NOTFOUND )
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 ));
                 }
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 8ce2ab3b7c16..9578f132f18f 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -505,7 +505,7 @@ namespace pcr
         *pCounter++ = new SvxPostureItem(aDefaultVCLFont.GetItalic(), CFID_CJK_POSTURE);
         *pCounter++ = new SvxLanguageItem(Application::GetSettings().GetUILanguageTag().getLanguageType(), CFID_CJK_LANGUAGE);
 
-        *pCounter++ = new SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, CFID_CASEMAP);
+        *pCounter++ = new SvxCaseMapItem(SvxCaseMap::NotMapped, CFID_CASEMAP);
         *pCounter++ = new SvxContourItem(false, CFID_CONTOUR);
         *pCounter++ = new SvxShadowedItem(false, CFID_SHADOWED);
 
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 502888e46f51..b3a9cd19a08a 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2585,7 +2585,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObj
     if ( nFontAttributes & 0x40 )
         rSet.Put( SvxShadowedItem( (nFontAttributes & 0x40) != 0, EE_CHAR_SHADOW ) );
 //    if ( nFontAttributes & 0x02 )
-//        rSet.Put( SvxCaseMapItem( nFontAttributes & 0x02 ? SVX_CASEMAP_KAPITAELCHEN : SVX_CASEMAP_NOT_MAPPED ) );
+//        rSet.Put( SvxCaseMapItem( nFontAttributes & 0x02 ? SvxCaseMap::SmallCaps : SvxCaseMap::NotMapped ) );
     if ( nFontAttributes & 0x01 )
         rSet.Put( SvxCrossedOutItem( (nFontAttributes & 0x01) ? STRIKEOUT_SINGLE : STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ) );
     if ( IsProperty( DFF_Prop_fillColor ) )
diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx
index 4977b11694a0..e651a1e4222e 100644
--- a/include/editeng/cmapitem.hxx
+++ b/include/editeng/cmapitem.hxx
@@ -37,7 +37,7 @@ class EDITENG_DLLPUBLIC SvxCaseMapItem : public SfxEnumItem<SvxCaseMap>
 public:
     static SfxPoolItem* CreateDefault();
 
-    SvxCaseMapItem( const SvxCaseMap eMap /*= SVX_CASEMAP_NOT_MAPPED*/,
+    SvxCaseMapItem( const SvxCaseMap eMap /*= SvxCaseMap::NotMapped*/,
                     const sal_uInt16 nId );
 
     // "pure virtual Methods" from SfxPoolItem + SfxEnumItem
diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx
index 12b1f4ba5901..1735267a0bf3 100644
--- a/include/editeng/svxenum.hxx
+++ b/include/editeng/svxenum.hxx
@@ -21,14 +21,14 @@
 
 #include <com/sun/star/style/NumberingType.hpp>
 
-enum SvxCaseMap
+enum class SvxCaseMap
 {
-    SVX_CASEMAP_NOT_MAPPED,
-    SVX_CASEMAP_VERSALIEN,
-    SVX_CASEMAP_GEMEINE,
-    SVX_CASEMAP_TITEL,
-    SVX_CASEMAP_KAPITAELCHEN,
-    SVX_CASEMAP_END
+    NotMapped,
+    Uppercase,
+    Lowercase,
+    Capitalize,
+    SmallCaps,
+    End
 };
 
 enum class SvxEscapement
diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx
index 80dcf3744a23..2034bd6363df 100644
--- a/include/editeng/svxfont.hxx
+++ b/include/editeng/svxfont.hxx
@@ -65,8 +65,8 @@ public:
     void    SetCaseMap( const SvxCaseMap eNew ) { eCaseMap = eNew; }
 
     // Is-Methods:
-    bool IsCaseMap() const { return SVX_CASEMAP_NOT_MAPPED != eCaseMap; }
-    bool IsCapital() const { return SVX_CASEMAP_KAPITAELCHEN == eCaseMap; }
+    bool IsCaseMap() const { return SvxCaseMap::NotMapped != eCaseMap; }
+    bool IsCapital() const { return SvxCaseMap::SmallCaps == eCaseMap; }
     bool IsKern() const { return 0 != nKern; }
     bool IsEsc() const { return 0 != nEsc; }
 
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index f01a96256695..92ab7a0a5b42 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -664,7 +664,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
 
         new SvxColorItem(ITEMID_COLOR),
         new SvxKerningItem(0,ITEMID_KERNING),
-        new SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED,ITEMID_CASEMAP),
+        new SvxCaseMapItem(SvxCaseMap::NotMapped,ITEMID_CASEMAP),
         new SvxEscapementItem(ITEMID_ESCAPEMENT),
         new SvxFontListItem(pFontList.get(),ITEMID_FONTLIST),
         new SvxAutoKernItem(false,ITEMID_AUTOKERN),
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 3afd771c6292..52a0dbe2631d 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -212,7 +212,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     rISet.Put(SvxUnderlineItem(LINESTYLE_NONE, EE_CHAR_UNDERLINE));
     rISet.Put(SvxOverlineItem(LINESTYLE_NONE, EE_CHAR_OVERLINE));
     rISet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ));
-    rISet.Put(SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, EE_CHAR_CASEMAP ));
+    rISet.Put(SvxCaseMapItem(SvxCaseMap::NotMapped, EE_CHAR_CASEMAP ));
     rISet.Put(SvxEmphasisMarkItem(FontEmphasisMark::NONE, EE_CHAR_EMPHASISMARK));
     rISet.Put(SvxCharReliefItem(FontRelief::NONE, EE_CHAR_RELIEF));
     rISet.Put(SvxColorItem(Color(COL_AUTO), EE_CHAR_COLOR ));
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index d16e2fb76106..9bb4a7bad92f 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -242,7 +242,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
                 rSet.Put( SvxUnderlineItem(LINESTYLE_NONE, EE_CHAR_UNDERLINE ) );
                 rSet.Put( SvxOverlineItem(LINESTYLE_NONE, EE_CHAR_OVERLINE ) );
                 rSet.Put( SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ) );
-                rSet.Put( SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, EE_CHAR_CASEMAP ) );
+                rSet.Put( SvxCaseMapItem(SvxCaseMap::NotMapped, EE_CHAR_CASEMAP ) );
                 rSet.Put( SvxShadowedItem(false, EE_CHAR_SHADOW ) );
                 rSet.Put( SvxContourItem(false, EE_CHAR_OUTLINE ) );
                 rSet.Put( SvxEmphasisMarkItem(FontEmphasisMark::NONE, EE_CHAR_EMPHASISMARK ) );
@@ -357,7 +357,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
         rTitleSet.Put(SvxUnderlineItem(LINESTYLE_NONE, EE_CHAR_UNDERLINE ));
         rTitleSet.Put(SvxOverlineItem(LINESTYLE_NONE, EE_CHAR_OVERLINE ));
         rTitleSet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ));
-        rTitleSet.Put(SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, EE_CHAR_CASEMAP ));
+        rTitleSet.Put(SvxCaseMapItem(SvxCaseMap::NotMapped, EE_CHAR_CASEMAP ));
         rTitleSet.Put(SvxShadowedItem(false, EE_CHAR_SHADOW ));
         rTitleSet.Put(SvxContourItem(false, EE_CHAR_OUTLINE ));
         rTitleSet.Put( SvxEmphasisMarkItem(FontEmphasisMark::NONE, EE_CHAR_EMPHASISMARK ) );
@@ -403,7 +403,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
         rSubtitleSet.Put(SvxUnderlineItem(LINESTYLE_NONE, EE_CHAR_UNDERLINE ));
         rSubtitleSet.Put(SvxOverlineItem(LINESTYLE_NONE, EE_CHAR_OVERLINE ));
         rSubtitleSet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ));
-        rSubtitleSet.Put(SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, EE_CHAR_CASEMAP ));
+        rSubtitleSet.Put(SvxCaseMapItem(SvxCaseMap::NotMapped, EE_CHAR_CASEMAP ));
         rSubtitleSet.Put(SvxShadowedItem(false, EE_CHAR_SHADOW ));
         rSubtitleSet.Put(SvxContourItem(false, EE_CHAR_OUTLINE ));
         rSubtitleSet.Put( SvxEmphasisMarkItem(FontEmphasisMark::NONE, EE_CHAR_EMPHASISMARK ) );
@@ -452,7 +452,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
         rNotesSet.Put( SvxUnderlineItem(LINESTYLE_NONE, EE_CHAR_UNDERLINE ) );
         rNotesSet.Put( SvxOverlineItem(LINESTYLE_NONE, EE_CHAR_OVERLINE ) );
         rNotesSet.Put( SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ) );
-        rNotesSet.Put( SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, EE_CHAR_CASEMAP ) );
+        rNotesSet.Put( SvxCaseMapItem(SvxCaseMap::NotMapped, EE_CHAR_CASEMAP ) );
         rNotesSet.Put( SvxShadowedItem(false, EE_CHAR_SHADOW ) );
         rNotesSet.Put( SvxContourItem(false, EE_CHAR_OUTLINE ) );
         rNotesSet.Put( SvxEmphasisMarkItem(FontEmphasisMark::NONE, EE_CHAR_EMPHASISMARK ) );
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 0890aaef54e2..86cbb294f2ad 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -1016,7 +1016,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack
         rFont.SetCaseMap( eCaseMap );
         rCJKFont.SetCaseMap( eCaseMap );
         // #i78474# small caps do not exist in CTL fonts
-        rCTLFont.SetCaseMap( eCaseMap == SVX_CASEMAP_KAPITAELCHEN ? SVX_CASEMAP_NOT_MAPPED : eCaseMap );
+        rCTLFont.SetCaseMap( eCaseMap == SvxCaseMap::SmallCaps ? SvxCaseMap::NotMapped : eCaseMap );
     }
 
     // Outline
@@ -1258,7 +1258,7 @@ void SvxFontPrevWindow::Init(const SfxItemSet& rSet)
         rFont.SetCaseMap( eCaseMap );
         rCJKFont.SetCaseMap( eCaseMap );
         // #i78474# small caps do not exist in CTL fonts
-        rCTLFont.SetCaseMap( eCaseMap == SVX_CASEMAP_KAPITAELCHEN ? SVX_CASEMAP_NOT_MAPPED : eCaseMap );
+        rCTLFont.SetCaseMap( eCaseMap == SvxCaseMap::SmallCaps ? SvxCaseMap::NotMapped : eCaseMap );
     }
 
     // Outline
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 59764a4c93c3..493b4fc590c8 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -460,7 +460,7 @@ void InitCore()
 {
     SfxPoolItem* pItem;
 
-    aAttrTab[ RES_CHRATR_CASEMAP- POOLATTR_BEGIN ] =        new SvxCaseMapItem( SVX_CASEMAP_NOT_MAPPED, RES_CHRATR_CASEMAP);
+    aAttrTab[ RES_CHRATR_CASEMAP- POOLATTR_BEGIN ] =        new SvxCaseMapItem( SvxCaseMap::NotMapped, RES_CHRATR_CASEMAP);
     aAttrTab[ RES_CHRATR_CHARSETCOLOR- POOLATTR_BEGIN ] =   new SvxCharSetColorItem(RES_CHRATR_CHARSETCOLOR);
     aAttrTab[ RES_CHRATR_COLOR- POOLATTR_BEGIN ] =          new SvxColorItem(RES_CHRATR_COLOR);
     aAttrTab[ RES_CHRATR_CONTOUR- POOLATTR_BEGIN ] =        new SvxContourItem( false, RES_CHRATR_CONTOUR );
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 7da1a12a2553..b84ed8fb634e 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -1226,7 +1226,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
             Color aCol( COL_CYAN );
             aSet.Put( SvxColorItem( aCol, RES_CHRATR_COLOR ) );
             aSet.Put( SvxUnderlineItem( LINESTYLE_DOTTED, RES_CHRATR_UNDERLINE ) );
-            aSet.Put( SvxCaseMapItem( SVX_CASEMAP_KAPITAELCHEN, RES_CHRATR_CASEMAP ) );
+            aSet.Put( SvxCaseMapItem( SvxCaseMap::SmallCaps, RES_CHRATR_CASEMAP ) );
         }
         break;
 
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 3236982f3693..462ee043c8c1 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -67,7 +67,7 @@ bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt )
            rPor.IsHolePortion() ||
           ( rPor.IsMultiPortion() && ! static_cast<const SwMultiPortion&>(rPor).IsBidi() ) ||
            rFnt.GetEscapement() < 0 || rFnt.IsWordLineMode() ||
-           SVX_CASEMAP_KAPITAELCHEN == rFnt.GetCaseMap();
+           SvxCaseMap::SmallCaps == rFnt.GetCaseMap();
 }
 
 void SwTextPainter::CtorInitTextPainter( SwTextFrame *pNewFrame, SwTextPaintInfo *pNewInf )
@@ -590,7 +590,7 @@ void SwTextPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
             aIter.Seek( nTmpIdx );
 
             if ( aIter.GetFnt()->GetEscapement() < 0 || m_pFont->IsWordLineMode() ||
-                 SVX_CASEMAP_KAPITAELCHEN == m_pFont->GetCaseMap() )
+                 SvxCaseMap::SmallCaps == m_pFont->GetCaseMap() )
                 break;
 
             if ( !aIter.GetFnt()->GetEscapement() )
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index b3dbcb661c0c..4b8ef213bf53 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2403,7 +2403,7 @@ sal_Int32 SwFont::GetTextBreak( SwDrawTextInfo& rInf, long nTextWidth )
         {
             const OUString aSnippet(rInf.GetText().copy(rInf.GetIdx(), nLn));
             aTmpText = m_aSub[m_nActual].CalcCaseMap( aSnippet );
-            const bool bTitle = SVX_CASEMAP_TITEL == m_aSub[m_nActual].GetCaseMap() &&
+            const bool bTitle = SvxCaseMap::Capitalize == m_aSub[m_nActual].GetCaseMap() &&
                                 g_pBreakIt->GetBreakIter().is();
 
             // Uaaaaahhhh!!! In title case mode, we would get wrong results
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index 8b62ddc95234..4713bfc61119 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -66,7 +66,7 @@ sal_Int32 sw_CalcCaseMap( const SwFont& rFnt,
     OSL_ENSURE( nEnd <= rOrigString.getLength(), "sw_CalcCaseMap: Wrong parameters" );
 
     // special case for title case:
-    const bool bTitle = SVX_CASEMAP_TITEL == rFnt.GetCaseMap() &&
+    const bool bTitle = SvxCaseMap::Capitalize == rFnt.GetCaseMap() &&
                         g_pBreakIt->GetBreakIter().is();
     for ( sal_Int32 i = nOfst; i < nEnd; ++i )
     {
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index a430ce238964..09ec5740028c 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2359,19 +2359,19 @@ static Writer& OutCSS1_SvxCaseMap( Writer& rWrt, const SfxPoolItem& rHt )
 
     switch( static_cast<const SvxCaseMapItem&>(rHt).GetCaseMap() )
     {
-    case SVX_CASEMAP_NOT_MAPPED:
+    case SvxCaseMap::NotMapped:
         rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_font_variant, sCSS1_PV_normal );
         break;
-    case SVX_CASEMAP_KAPITAELCHEN:
+    case SvxCaseMap::SmallCaps:
         rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_font_variant, sCSS1_PV_small_caps );
         break;
-    case SVX_CASEMAP_VERSALIEN:
+    case SvxCaseMap::Uppercase:
         rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_text_transform, sCSS1_PV_uppercase );
         break;
-    case SVX_CASEMAP_GEMEINE:
+    case SvxCaseMap::Lowercase:
         rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_text_transform, sCSS1_PV_lowercase );
         break;
-    case SVX_CASEMAP_TITEL:
+    case SvxCaseMap::Capitalize:
         rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_text_transform, sCSS1_PV_capitalize );
         break;
     default:
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 1ba6d9e71d8e..e74a629157f7 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -102,16 +102,16 @@ static CSS1PropertyEnum const aFontStyleTable[] =
 
 static CSS1PropertyEnum const aFontVariantTable[] =
 {
-    { "normal",      SVX_CASEMAP_NOT_MAPPED      },
-    { "small-caps",  SVX_CASEMAP_KAPITAELCHEN    },
+    { "normal",      (sal_uInt16)SvxCaseMap::NotMapped      },
+    { "small-caps",  (sal_uInt16)SvxCaseMap::SmallCaps    },
     { nullptr,                    0                   }
 };
 
 static CSS1PropertyEnum const aTextTransformTable[] =
 {
-    { "uppercase",  SVX_CASEMAP_VERSALIEN },
-    { "lowercase",  SVX_CASEMAP_GEMEINE   },
-    { "capitalize", SVX_CASEMAP_TITEL     },
+    { "uppercase",  (sal_uInt16)SvxCaseMap::Uppercase },
+    { "lowercase",  (sal_uInt16)SvxCaseMap::Lowercase   },
+    { "capitalize", (sal_uInt16)SvxCaseMap::Capitalize     },
     { nullptr,                   0                     }
 };
 
@@ -1215,7 +1215,7 @@ static void ParseCSS1_font_style( const CSS1Expression *pExpr,
     bool bPosture = false;
     bool bCaseMap = false;
     FontItalic eItalic = ITALIC_NONE;
-    SvxCaseMap eCaseMap = SVX_CASEMAP_NOT_MAPPED;
+    SvxCaseMap eCaseMap = SvxCaseMap::NotMapped;
 
     // normal | italic || small-caps | oblique || small-caps | small-caps
     // (wobei nor noch normal | italic und oblique zulaessig sind
@@ -1236,7 +1236,7 @@ static void ParseCSS1_font_style( const CSS1Expression *pExpr,
                 if( !bCaseMap && ITALIC_NONE==eItalic )
                 {
                     // fuer 'normal' muessen wir auch die case-map aussch.
-                    eCaseMap = SVX_CASEMAP_NOT_MAPPED;
+                    eCaseMap = SvxCaseMap::NotMapped;
                     bCaseMap = true;
                 }
                 bPosture = true;
@@ -1244,7 +1244,7 @@ static void ParseCSS1_font_style( const CSS1Expression *pExpr,
             else if( !bCaseMap &&
                      rValue.equalsIgnoreAsciiCase( "small-caps" ) )
             {
-                eCaseMap = SVX_CASEMAP_KAPITAELCHEN;
+                eCaseMap = SvxCaseMap::SmallCaps;
                 bCaseMap = true;
             }
         }
@@ -1736,7 +1736,7 @@ static void ParseCSS1_font( const CSS1Expression *pExpr,
     OSL_ENSURE( pExpr, "no expression" );
 
     FontItalic eItalic = ITALIC_NONE;
-    SvxCaseMap eCaseMap = SVX_CASEMAP_NOT_MAPPED;
+    SvxCaseMap eCaseMap = SvxCaseMap::NotMapped;
     FontWeight eWeight = WEIGHT_NORMAL;
 
     // [ <font-style> || <font-variant> || <font-weight> ] ?
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index ec873a5a351d..14fc18c160e4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3920,7 +3920,7 @@ void DocxAttributeOutput::OutputDefaultItem(const SfxPoolItem& rHt)
     switch (rHt.Which())
     {
         case RES_CHRATR_CASEMAP:
-            bMustWrite = static_cast< const SvxCaseMapItem& >(rHt).GetCaseMap() != SVX_CASEMAP_NOT_MAPPED;
+            bMustWrite = static_cast< const SvxCaseMapItem& >(rHt).GetCaseMap() != SvxCaseMap::NotMapped;
             break;
         case RES_CHRATR_COLOR:
             bMustWrite = static_cast< const SvxColorItem& >(rHt).GetValue().GetColor() != COL_AUTO;
@@ -6223,10 +6223,10 @@ void DocxAttributeOutput::CharCaseMap( const SvxCaseMapItem& rCaseMap )
 {
     switch ( rCaseMap.GetValue() )
     {
-        case SVX_CASEMAP_KAPITAELCHEN:
+        case SvxCaseMap::SmallCaps:
             m_pSerializer->singleElementNS( XML_w, XML_smallCaps, FSEND );
             break;
-        case SVX_CASEMAP_VERSALIEN:
+        case SvxCaseMap::Uppercase:
             m_pSerializer->singleElementNS( XML_w, XML_caps, FSEND );
             break;
         default: // Something that ooxml does not support
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index b7aa4193a351..b56eeefc696a 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2164,10 +2164,10 @@ void RtfAttributeOutput::CharCaseMap(const SvxCaseMapItem& rCaseMap)
 {
     switch (rCaseMap.GetValue())
     {
-    case SVX_CASEMAP_KAPITAELCHEN:
+    case SvxCaseMap::SmallCaps:
         m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SCAPS);
         break;
-    case SVX_CASEMAP_VERSALIEN:
+    case SvxCaseMap::Uppercase:
         m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CAPS);
         break;
     default: // Something that rtf does not support
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index aa4f13a8fa12..cdfde537b037 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1650,7 +1650,7 @@ OUString SwWW8AttrIter::GetSnippet(const OUString &rStr, sal_Int32 nAktPos,
     m_rExport.m_aCurrentCharPropStarts.push( nAktPos );
     const SfxPoolItem &rItem = GetItem(RES_CHRATR_CASEMAP);
 
-    if (SVX_CASEMAP_TITEL == static_cast<const SvxCaseMapItem&>(rItem).GetValue())
+    if (SvxCaseMap::Capitalize == static_cast<const SvxCaseMapItem&>(rItem).GetValue())
     {
         sal_uInt16 nScriptType = i18n::ScriptType::LATIN;
         if (g_pBreakIt->GetBreakIter().is())
@@ -1672,7 +1672,7 @@ OUString SwWW8AttrIter::GetSnippet(const OUString &rStr, sal_Int32 nAktPos,
         }
 
         SvxFont aFontHelper;
-        aFontHelper.SetCaseMap(SVX_CASEMAP_TITEL);
+        aFontHelper.SetCaseMap(SvxCaseMap::Capitalize);
         aFontHelper.SetLanguage(nLanguage);
         aSnippet = aFontHelper.CalcCaseMap(aSnippet);
 
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 5793aca424cb..bc00c9bfeca6 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1148,16 +1148,16 @@ void WW8AttributeOutput::CharCrossedOut( const SvxCrossedOutItem& rCrossed )
 
 void WW8AttributeOutput::CharCaseMap( const SvxCaseMapItem& rCaseMap )
 {
-    sal_uInt16 eSt = rCaseMap.GetValue();
+    SvxCaseMap eSt = rCaseMap.GetValue();
     switch ( eSt )
     {
-        case SVX_CASEMAP_KAPITAELCHEN:
+        case SvxCaseMap::SmallCaps:
             OutputWW8Attribute( 5, true );
             return;
-        case SVX_CASEMAP_VERSALIEN:
+        case SvxCaseMap::Uppercase:
             OutputWW8Attribute( 6, true );
             return;
-        case SVX_CASEMAP_TITEL:
+        case SvxCaseMap::Capitalize:
             // no such feature in word
             break;
         default:
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index e29362b396e5..dbe11d3d7e75 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3142,12 +3142,12 @@ void SwWW8ImplReader::SetToggleAttr(sal_uInt8 nAttrId, bool bOn)
             NewAttr( SvxShadowedItem( bOn, RES_CHRATR_SHADOWED ) );
             break;
         case 5:
-            NewAttr( SvxCaseMapItem( bOn ? SVX_CASEMAP_KAPITAELCHEN
-                                              : SVX_CASEMAP_NOT_MAPPED, RES_CHRATR_CASEMAP ) );
+            NewAttr( SvxCaseMapItem( bOn ? SvxCaseMap::SmallCaps
+                                              : SvxCaseMap::NotMapped, RES_CHRATR_CASEMAP ) );
             break;
         case 6:
-            NewAttr( SvxCaseMapItem( bOn ? SVX_CASEMAP_VERSALIEN
-                                             : SVX_CASEMAP_NOT_MAPPED, RES_CHRATR_CASEMAP ) );
+            NewAttr( SvxCaseMapItem( bOn ? SvxCaseMap::Uppercase
+                                             : SvxCaseMap::NotMapped, RES_CHRATR_CASEMAP ) );
             break;
         case 7:
             NewAttr(SvxCharHiddenItem(bOn, RES_CHRATR_HIDDEN));
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 7a24b7d2a6d4..b9e222bc8c52 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1522,16 +1522,16 @@ struct CharAttr
 // Edit corresponds to Paste-attributes
 static CharAttr aRedlineAttr[] =
 {
-    { SID_ATTR_CHAR_CASEMAP,        SVX_CASEMAP_NOT_MAPPED },
+    { SID_ATTR_CHAR_CASEMAP,        (sal_uInt16)SvxCaseMap::NotMapped },
     { SID_ATTR_CHAR_WEIGHT,         WEIGHT_BOLD },
     { SID_ATTR_CHAR_POSTURE,        ITALIC_NORMAL },
     { SID_ATTR_CHAR_UNDERLINE,      LINESTYLE_SINGLE },
     { SID_ATTR_CHAR_UNDERLINE,      LINESTYLE_DOUBLE },
     { SID_ATTR_CHAR_STRIKEOUT,      STRIKEOUT_SINGLE },
-    { SID_ATTR_CHAR_CASEMAP,        SVX_CASEMAP_VERSALIEN },
-    { SID_ATTR_CHAR_CASEMAP,        SVX_CASEMAP_GEMEINE },
-    { SID_ATTR_CHAR_CASEMAP,        SVX_CASEMAP_KAPITAELCHEN },
-    { SID_ATTR_CHAR_CASEMAP,        SVX_CASEMAP_TITEL },
+    { SID_ATTR_CHAR_CASEMAP,        (sal_uInt16)SvxCaseMap::Uppercase },
+    { SID_ATTR_CHAR_CASEMAP,        (sal_uInt16)SvxCaseMap::Lowercase },
+    { SID_ATTR_CHAR_CASEMAP,        (sal_uInt16)SvxCaseMap::SmallCaps },
+    { SID_ATTR_CHAR_CASEMAP,        (sal_uInt16)SvxCaseMap::Capitalize },
     { SID_ATTR_BRUSH,               0 }
 };
 // Items from aRedlineAttr relevant for InsertAttr: strikethrough is
@@ -1968,8 +1968,8 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void )
     rCJKFont.SetUnderline(LINESTYLE_NONE);
     rFont.SetStrikeout(STRIKEOUT_NONE);
     rCJKFont.SetStrikeout(STRIKEOUT_NONE);
-    rFont.SetCaseMap(SVX_CASEMAP_NOT_MAPPED);
-    rCJKFont.SetCaseMap(SVX_CASEMAP_NOT_MAPPED);
+    rFont.SetCaseMap(SvxCaseMap::NotMapped);
+    rCJKFont.SetCaseMap(SvxCaseMap::NotMapped);
 
     Color aColor = pColorLB->GetSelectEntryColor();
 
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index 1eb1cfb16617..5c96d41c2b9d 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -275,12 +275,13 @@ static sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr)
         case  SID_ATTR_CHAR_STRIKEOUT: nRet = 3; break;
         case  SID_ATTR_CHAR_CASEMAP:
         {
-            switch(rAttr.nAttr)
+            switch((SvxCaseMap)rAttr.nAttr)
             {
-                case  SVX_CASEMAP_VERSALIEN   : nRet = 5;break;
-                case  SVX_CASEMAP_GEMEINE     : nRet = 6;break;
-                case  SVX_CASEMAP_KAPITAELCHEN: nRet = 7;break;
-                case  SVX_CASEMAP_TITEL       : nRet = 8;break;
+                case  SvxCaseMap::Uppercase : nRet = 5;break;
+                case  SvxCaseMap::Lowercase : nRet = 6;break;
+                case  SvxCaseMap::SmallCaps : nRet = 7;break;
+                case  SvxCaseMap::Capitalize: nRet = 8;break;
+                default: break;
             }
         }
         break;
@@ -335,10 +336,10 @@ static void lcl_ConvertCfgToAttr(sal_Int32 nVal, AuthorCharAttr& rAttr, bool bDe
                 }
         break;
         case 4: rAttr.nItemId = SID_ATTR_CHAR_UNDERLINE;rAttr.nAttr = LINESTYLE_DOUBLE         ; break;
-        case 5: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = SVX_CASEMAP_VERSALIEN    ; break;
-        case 6: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = SVX_CASEMAP_GEMEINE      ; break;
-        case 7: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = SVX_CASEMAP_KAPITAELCHEN ; break;
-        case 8: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = SVX_CASEMAP_TITEL        ; break;
+        case 5: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = (sal_uInt16)SvxCaseMap::Uppercase; break;
+        case 6: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = (sal_uInt16)SvxCaseMap::Lowercase; break;
+        case 7: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = (sal_uInt16)SvxCaseMap::SmallCaps; break;
+        case 8: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = (sal_uInt16)SvxCaseMap::Capitalize; break;
         case 9: rAttr.nItemId = SID_ATTR_BRUSH; break;
     }
 }
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index 8ac5b0f90841..1de085853431 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -133,21 +133,21 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
 
         case FN_SET_SMALL_CAPS:
         {
-            SvxCaseMap eCaseMap = SVX_CASEMAP_KAPITAELCHEN;
+            SvxCaseMap eCaseMap = SvxCaseMap::SmallCaps;
             switch (eState)
             {
             case STATE_TOGGLE:
             {
                 SvxCaseMap eTmpCaseMap = static_cast<const SvxCaseMapItem&>(aSet.Get(RES_CHRATR_CASEMAP)).GetCaseMap();
-                if (eTmpCaseMap == SVX_CASEMAP_KAPITAELCHEN)
-                    eCaseMap = SVX_CASEMAP_NOT_MAPPED;
+                if (eTmpCaseMap == SvxCaseMap::SmallCaps)
+                    eCaseMap = SvxCaseMap::NotMapped;
             }
             break;
             case STATE_ON:
                 // Nothing to do, already set.
                 break;
             case STATE_OFF:
-                eCaseMap = SVX_CASEMAP_NOT_MAPPED;
+                eCaseMap = SvxCaseMap::NotMapped;
                 break;
             }
             SvxCaseMapItem aCaseMap(eCaseMap, RES_CHRATR_CASEMAP);
@@ -581,7 +581,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
             nLineSpace = static_cast<const SvxLineSpacingItem* >(pItem)->GetPropLineSpace();
     }
 
-    SvxCaseMap eCaseMap = SVX_CASEMAP_NOT_MAPPED;
+    SvxCaseMap eCaseMap = SvxCaseMap::NotMapped;
     eState = aCoreSet.GetItemState(RES_CHRATR_CASEMAP, false, &pItem);
     if (eState == SfxItemState::DEFAULT)
         pItem = &rPool.GetDefaultItem(RES_CHRATR_CASEMAP);
@@ -599,7 +599,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
                     bFlag = 0 > nEsc;
                 break;
             case FN_SET_SMALL_CAPS:
-                bFlag = eCaseMap == SVX_CASEMAP_KAPITAELCHEN;
+                bFlag = eCaseMap == SvxCaseMap::SmallCaps;
                 break;
             case SID_ATTR_PARA_ADJUST_LEFT:
                 if (!bAdjustGood)