convert DEFAULTFONT_ constants to scoped enum

Change-Id: Ia33e957f6cf530e2639b3c86d9482f642652cb46

4 files changed, 10 insertions, 10 deletions

diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index fcc4d88211ab..43faa83c1265 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1298,9 +1298,9 @@ void SdDrawDocument::getDefaultFonts( vcl::Font& rLatinFont, vcl::Font& rCJKFont
     if (MsLangId::isKorean(eUiLanguage))
         eLatin = eUiLanguage;
 
-    rLatinFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_PRESENTATION, eLatin, DEFAULTFONT_FLAGS_ONLYONE );
-    rCJKFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_PRESENTATION, GetLanguage( EE_CHAR_LANGUAGE_CJK ), DEFAULTFONT_FLAGS_ONLYONE );
-    rCTLFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_PRESENTATION, GetLanguage( EE_CHAR_LANGUAGE_CTL ), DEFAULTFONT_FLAGS_ONLYONE ) ;
+    rLatinFont = OutputDevice::GetDefaultFont( DefaultFontType::LATIN_PRESENTATION, eLatin, DEFAULTFONT_FLAGS_ONLYONE );
+    rCJKFont = OutputDevice::GetDefaultFont( DefaultFontType::CJK_PRESENTATION, GetLanguage( EE_CHAR_LANGUAGE_CJK ), DEFAULTFONT_FLAGS_ONLYONE );
+    rCTLFont = OutputDevice::GetDefaultFont( DefaultFontType::CTL_PRESENTATION, GetLanguage( EE_CHAR_LANGUAGE_CTL ), DEFAULTFONT_FLAGS_ONLYONE ) ;
 }
 
 /* converts the given western font height to a corresponding ctl font height, depending on the system language */
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 4721b49e9dfd..ad5fd9bfa1bc 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -242,7 +242,7 @@ void FuHangulHanjaConversion::StartChineseConversion()
                         nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER;
 
                     vcl::Font aTargetFont = OutputDevice::GetDefaultFont(
-                                        DEFAULTFONT_CJK_PRESENTATION,
+                                        DefaultFontType::CJK_PRESENTATION,
                                         nTargetLang, DEFAULTFONT_FLAGS_ONLYONE );
 
                     StartConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, false );
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index 0df3b852583a..4439d73975d5 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -285,19 +285,19 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine()
         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_SERIF,      EE_CHAR_FONTINFO },
+                DefaultFontType::SERIF,      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 = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN);
         aTable[1].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN);
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index db4ab7a4a619..c5cda61d264c 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -138,7 +138,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie
         | tools::EventMultiplexerEvent::EID_PAGE_ORDER);
 
     LanguageType eLang = mrOutliner.GetDefaultLanguage();
-    maPageNumberFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE, eLang, 0 );
+    maPageNumberFont = OutputDevice::GetDefaultFont( DefaultFontType::SANS_UNICODE, eLang, 0 );
     maPageNumberFont.SetHeight( 500 );
 
     maBulletFont.SetColor( COL_AUTO );
@@ -1720,7 +1720,7 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo)
             LanguageType eLang = rEditEngine.GetDefaultLanguage();
 
             Point aTextPos( aImagePos.X() - aOffset.Width(), pInfo->mrStartPos.Y() );
-            vcl::Font aNewFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE, eLang, 0 ) );
+            vcl::Font aNewFont( OutputDevice::GetDefaultFont( DefaultFontType::SANS_UNICODE, eLang, 0 ) );
             aNewFont.SetSize( aFontSz );
             aNewFont.SetVertical( bVertical );
             aNewFont.SetOrientation( bVertical ? 2700 : 0 );