diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-04 14:05:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-06 09:01:27 +0200 |
| commit | 60e659ae355d073b05b3b9c8d2ac3bdc5f76020d (patch) | |
| tree | 9b68af7be7dc126d2650a02937567ccfc36892e0 /vcl/source/gdi | |
| parent | 96471119f0157d85c1fb33b114919a94272744c6 (diff) | |
convert IMPL_FONT_ATTR constants to scoped enum
Change-Id: I2b5986ea69dc09e6ba18b23a80029f6551b48152
Diffstat (limited to 'vcl/source/gdi')
| -rw-r--r-- | vcl/source/gdi/font.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 04fc54cad985..5dd22f3e0645 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -152,7 +152,7 @@ void Impl_Font::AskConfig() OUString aShortName; OUString aFamilyName; - sal_uLong nType = 0; + ImplFontAttrs nType = ImplFontAttrs::None; FontWeight eWeight = WEIGHT_DONTKNOW; FontWidth eWidthType = WIDTH_DONTKNOW; OUString aMapName = GetEnglishSearchFontName( maFamilyName ); @@ -172,21 +172,21 @@ void Impl_Font::AskConfig() // the font was found in the configuration if( meFamily == FAMILY_DONTKNOW ) { - if ( pFontAttr->Type & IMPL_FONT_ATTR_SERIF ) + if ( pFontAttr->Type & ImplFontAttrs::Serif ) meFamily = FAMILY_ROMAN; - else if ( pFontAttr->Type & IMPL_FONT_ATTR_SANSSERIF ) + else if ( pFontAttr->Type & ImplFontAttrs::SansSerif ) meFamily = FAMILY_SWISS; - else if ( pFontAttr->Type & IMPL_FONT_ATTR_TYPEWRITER ) + else if ( pFontAttr->Type & ImplFontAttrs::Typewriter ) meFamily = FAMILY_MODERN; - else if ( pFontAttr->Type & IMPL_FONT_ATTR_ITALIC ) + else if ( pFontAttr->Type & ImplFontAttrs::Italic ) meFamily = FAMILY_SCRIPT; - else if ( pFontAttr->Type & IMPL_FONT_ATTR_DECORATIVE ) + else if ( pFontAttr->Type & ImplFontAttrs::Decorative ) meFamily = FAMILY_DECORATIVE; } if( mePitch == PITCH_DONTKNOW ) { - if ( pFontAttr->Type & IMPL_FONT_ATTR_FIXED ) + if ( pFontAttr->Type & ImplFontAttrs::Fixed ) mePitch = PITCH_FIXED; } } @@ -194,15 +194,15 @@ void Impl_Font::AskConfig() // if some attributes are still unknown then use the FontSubst magic if( meFamily == FAMILY_DONTKNOW ) { - if( nType & IMPL_FONT_ATTR_SERIF ) + if( nType & ImplFontAttrs::Serif ) meFamily = FAMILY_ROMAN; - else if( nType & IMPL_FONT_ATTR_SANSSERIF ) + else if( nType & ImplFontAttrs::SansSerif ) meFamily = FAMILY_SWISS; - else if( nType & IMPL_FONT_ATTR_TYPEWRITER ) + else if( nType & ImplFontAttrs::Typewriter ) meFamily = FAMILY_MODERN; - else if( nType & IMPL_FONT_ATTR_ITALIC ) + else if( nType & ImplFontAttrs::Italic ) meFamily = FAMILY_SCRIPT; - else if( nType & IMPL_FONT_ATTR_DECORATIVE ) + else if( nType & ImplFontAttrs::Decorative ) meFamily = FAMILY_DECORATIVE; } |