diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-05 09:58:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-06 09:01:29 +0200 |
| commit | bfcb2a1a75ae0ff780bff0747ea90c1e79a56fc3 (patch) | |
| tree | 27c331cb0cfd7fd4717b61bfe7ec493e9c512fc1 /editeng | |
| parent | 9b37c2176e4da7575398c15921e3466208f19847 (diff) | |
convert DEFAULTFONT_ constants to scoped enum
Change-Id: Ia33e957f6cf530e2639b3c86d9482f642652cb46
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/eehtml.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/items/bulitem.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/items/textitem.cxx | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 2ef23c72046c..bf4fae4375e3 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -652,7 +652,7 @@ void EditHTMLParser::ImpSetStyleSheet( sal_uInt16 nHLevel ) // Choose a proportional Font for Pre if ( nHLevel == STYLE_PRE ) { - vcl::Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 ); + vcl::Font aFont = OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, 0 ); SvxFontItem aFontItem( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ); aItems.Put( aFontItem ); diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index b86a5a64ce37..006d6f265cb4 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -203,7 +203,7 @@ SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) c void SvxBulletItem::SetDefaultFont_Impl() { - aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 ); + aFont = OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, 0 ); aFont.SetAlign( ALIGN_BOTTOM); aFont.SetTransparent( true ); } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index db11b63772b9..629eec483836 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -3505,14 +3505,14 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo static struct { - sal_uInt16 nFontType; + DefaultFontType nFontType; sal_uInt16 nLanguage; } aOutTypeArr[ nItemCnt ] = { - { DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US }, - { DEFAULTFONT_CJK_TEXT, LANGUAGE_ENGLISH_US }, - { DEFAULTFONT_CTL_TEXT, LANGUAGE_ARABIC_SAUDI_ARABIA } + { DefaultFontType::LATIN_TEXT, LANGUAGE_ENGLISH_US }, + { DefaultFontType::CJK_TEXT, LANGUAGE_ENGLISH_US }, + { DefaultFontType::CTL_TEXT, LANGUAGE_ARABIC_SAUDI_ARABIA } }; SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex }; |