convert DEFAULTFONT_ constants to scoped enum

Change-Id: Ia33e957f6cf530e2639b3c86d9482f642652cb46

2 files changed, 29 insertions, 29 deletions

diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 0ff0caa9b55f..986e109d6ef1 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -314,19 +314,19 @@ void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool)
         struct FontDta {
             sal_Int16       nFallbackLang;
             sal_Int16       nLang;
-            sal_uInt16      nFontType;
+            DefaultFontType nFontType;
             sal_uInt16      nFontInfoId;
             } aTable[3] =
         {
             // info to get western font to be used
             {   LANGUAGE_ENGLISH_US,    LANGUAGE_NONE,
-                DEFAULTFONT_FIXED,      EE_CHAR_FONTINFO },
+                DefaultFontType::FIXED,      EE_CHAR_FONTINFO },
             // info to get CJK font to be used
             {   LANGUAGE_JAPANESE,      LANGUAGE_NONE,
-                DEFAULTFONT_CJK_TEXT,   EE_CHAR_FONTINFO_CJK },
+                DefaultFontType::CJK_TEXT,   EE_CHAR_FONTINFO_CJK },
             // info to get CTL font to be used
             {   LANGUAGE_ARABIC_SAUDI_ARABIA,  LANGUAGE_NONE,
-                DEFAULTFONT_CTL_TEXT,   EE_CHAR_FONTINFO_CTL }
+                DefaultFontType::CTL_TEXT,   EE_CHAR_FONTINFO_CTL }
         };
         aTable[0].nLang = aOpt.nDefaultLanguage;
         aTable[1].nLang = aOpt.nDefaultLanguage_CJK;
diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx
index 76007fc2b08c..870a8282342e 100644
--- a/starmath/source/format.cxx
+++ b/starmath/source/format.cxx
@@ -25,15 +25,15 @@
 
 
 // Latin default-fonts
-static const sal_uInt16 aLatinDefFnts[FNT_END] =
+static const DefaultFontType aLatinDefFnts[FNT_END] =
 {
-    DEFAULTFONT_SERIF,  // FNT_VARIABLE
-    DEFAULTFONT_SERIF,  // FNT_FUNCTION
-    DEFAULTFONT_SERIF,  // FNT_NUMBER
-    DEFAULTFONT_SERIF,  // FNT_TEXT
-    DEFAULTFONT_SERIF,  // FNT_SERIF
-    DEFAULTFONT_SANS,   // FNT_SANS
-    DEFAULTFONT_FIXED   // FNT_FIXED
+    DefaultFontType::SERIF,  // FNT_VARIABLE
+    DefaultFontType::SERIF,  // FNT_FUNCTION
+    DefaultFontType::SERIF,  // FNT_NUMBER
+    DefaultFontType::SERIF,  // FNT_TEXT
+    DefaultFontType::SERIF,  // FNT_SERIF
+    DefaultFontType::SANS,   // FNT_SANS
+    DefaultFontType::FIXED   // FNT_FIXED
     //OpenSymbol,    // FNT_MATH
 };
 
@@ -41,28 +41,28 @@ static const sal_uInt16 aLatinDefFnts[FNT_END] =
 //! we use non-asian fonts for variables, functions and numbers since they
 //! look better and even in asia only latin letters will be used for those.
 //! At least that's what I was told...
-static const sal_uInt16 aCJKDefFnts[FNT_END] =
+static const DefaultFontType aCJKDefFnts[FNT_END] =
 {
-    DEFAULTFONT_SERIF,          // FNT_VARIABLE
-    DEFAULTFONT_SERIF,          // FNT_FUNCTION
-    DEFAULTFONT_SERIF,          // FNT_NUMBER
-    DEFAULTFONT_CJK_TEXT,       // FNT_TEXT
-    DEFAULTFONT_CJK_TEXT,       // FNT_SERIF
-    DEFAULTFONT_CJK_DISPLAY,    // FNT_SANS
-    DEFAULTFONT_CJK_TEXT        // FNT_FIXED
+    DefaultFontType::SERIF,          // FNT_VARIABLE
+    DefaultFontType::SERIF,          // FNT_FUNCTION
+    DefaultFontType::SERIF,          // FNT_NUMBER
+    DefaultFontType::CJK_TEXT,       // FNT_TEXT
+    DefaultFontType::CJK_TEXT,       // FNT_SERIF
+    DefaultFontType::CJK_DISPLAY,    // FNT_SANS
+    DefaultFontType::CJK_TEXT        // FNT_FIXED
     //OpenSymbol,    // FNT_MATH
 };
 
 // CTL default-fonts
-static const sal_uInt16 aCTLDefFnts[FNT_END] =
+static const DefaultFontType aCTLDefFnts[FNT_END] =
 {
-    DEFAULTFONT_CTL_TEXT,    // FNT_VARIABLE
-    DEFAULTFONT_CTL_TEXT,    // FNT_FUNCTION
-    DEFAULTFONT_CTL_TEXT,    // FNT_NUMBER
-    DEFAULTFONT_CTL_TEXT,    // FNT_TEXT
-    DEFAULTFONT_CTL_TEXT,    // FNT_SERIF
-    DEFAULTFONT_CTL_TEXT,    // FNT_SANS
-    DEFAULTFONT_CTL_TEXT     // FNT_FIXED
+    DefaultFontType::CTL_TEXT,    // FNT_VARIABLE
+    DefaultFontType::CTL_TEXT,    // FNT_FUNCTION
+    DefaultFontType::CTL_TEXT,    // FNT_NUMBER
+    DefaultFontType::CTL_TEXT,    // FNT_TEXT
+    DefaultFontType::CTL_TEXT,    // FNT_SERIF
+    DefaultFontType::CTL_TEXT,    // FNT_SANS
+    DefaultFontType::CTL_TEXT     // FNT_FIXED
     //OpenSymbol,    // FNT_MATH
 };
 
@@ -76,7 +76,7 @@ OUString GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent )
         return OUString(FNTNAME_MATH);
     else
     {
-        const sal_uInt16 *pTable;
+        const DefaultFontType *pTable;
         switch ( SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ) )
         {
             case SvtScriptType::LATIN :     pTable = aLatinDefFnts; break;