diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-19 10:43:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-20 09:52:08 +0200 |
| commit | 3cbdf64ad5240e6d9a73d4f7e005f7110d5e4002 (patch) | |
| tree | 87ecd744320ba70cd784a2aac82aa436ea5d0c13 /vcl/source/outdev/text.cxx | |
| parent | 662700703bebad38ca7ad74ca4eb040fe8b5b676 (diff) | |
convert DRAWMODE constants to scoped enum
Change-Id: I36cbe8057d09226f8b302963bdd94dc5600b686f
Diffstat (limited to 'vcl/source/outdev/text.cxx')
| -rw-r--r-- | vcl/source/outdev/text.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index e860df14073c..fbef3085fc57 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -706,23 +706,23 @@ void OutputDevice::SetTextColor( const Color& rColor ) Color aColor( rColor ); - if ( mnDrawMode & ( DRAWMODE_BLACKTEXT | DRAWMODE_WHITETEXT | - DRAWMODE_GRAYTEXT | DRAWMODE_GHOSTEDTEXT | - DRAWMODE_SETTINGSTEXT ) ) + if ( mnDrawMode & ( DrawModeFlags::BlackText | DrawModeFlags::WhiteText | + DrawModeFlags::GrayText | DrawModeFlags::GhostedText | + DrawModeFlags::SettingsText ) ) { - if ( mnDrawMode & DRAWMODE_BLACKTEXT ) + if ( mnDrawMode & DrawModeFlags::BlackText ) aColor = Color( COL_BLACK ); - else if ( mnDrawMode & DRAWMODE_WHITETEXT ) + else if ( mnDrawMode & DrawModeFlags::WhiteText ) aColor = Color( COL_WHITE ); - else if ( mnDrawMode & DRAWMODE_GRAYTEXT ) + else if ( mnDrawMode & DrawModeFlags::GrayText ) { const sal_uInt8 cLum = aColor.GetLuminance(); aColor = Color( cLum, cLum, cLum ); } - else if ( mnDrawMode & DRAWMODE_SETTINGSTEXT ) + else if ( mnDrawMode & DrawModeFlags::SettingsText ) aColor = GetSettings().GetStyleSettings().GetFontColor(); - if ( mnDrawMode & DRAWMODE_GHOSTEDTEXT ) + if ( mnDrawMode & DrawModeFlags::GhostedText ) { aColor = Color( (aColor.GetRed() >> 1) | 0x80, (aColor.GetGreen() >> 1) | 0x80, @@ -767,28 +767,28 @@ void OutputDevice::SetTextFillColor( const Color& rColor ) if ( !bTransFill ) { - if ( mnDrawMode & ( DRAWMODE_BLACKFILL | DRAWMODE_WHITEFILL | - DRAWMODE_GRAYFILL | DRAWMODE_NOFILL | - DRAWMODE_GHOSTEDFILL | DRAWMODE_SETTINGSFILL ) ) + if ( mnDrawMode & ( DrawModeFlags::BlackFill | DrawModeFlags::WhiteFill | + DrawModeFlags::GrayFill | DrawModeFlags::NoFill | + DrawModeFlags::GhostedFill | DrawModeFlags::SettingsFill ) ) { - if ( mnDrawMode & DRAWMODE_BLACKFILL ) + if ( mnDrawMode & DrawModeFlags::BlackFill ) aColor = Color( COL_BLACK ); - else if ( mnDrawMode & DRAWMODE_WHITEFILL ) + else if ( mnDrawMode & DrawModeFlags::WhiteFill ) aColor = Color( COL_WHITE ); - else if ( mnDrawMode & DRAWMODE_GRAYFILL ) + else if ( mnDrawMode & DrawModeFlags::GrayFill ) { const sal_uInt8 cLum = aColor.GetLuminance(); aColor = Color( cLum, cLum, cLum ); } - else if( mnDrawMode & DRAWMODE_SETTINGSFILL ) + else if( mnDrawMode & DrawModeFlags::SettingsFill ) aColor = GetSettings().GetStyleSettings().GetWindowColor(); - else if ( mnDrawMode & DRAWMODE_NOFILL ) + else if ( mnDrawMode & DrawModeFlags::NoFill ) { aColor = Color( COL_TRANSPARENT ); bTransFill = true; } - if ( !bTransFill && (mnDrawMode & DRAWMODE_GHOSTEDFILL) ) + if ( !bTransFill && (mnDrawMode & DrawModeFlags::GhostedFill) ) { aColor = Color( (aColor.GetRed() >> 1) | 0x80, (aColor.GetGreen() >> 1) | 0x80, |