diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-29 20:23:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-30 06:41:53 +0000 |
| commit | 990082f37c31380d9fedd62c5dac1b5bff4c9636 (patch) | |
| tree | 8f567bbc9814fd8a5b610529d82610422da59910 /vcl/source/outdev | |
| parent | 446d0887ff5421822e0296e20cbb36f08f1e6445 (diff) | |
Convert FontRelief to scoped enum
Change-Id: I545c83d742db27f1a004b66e5eb1ef768f62e011
Reviewed-on: https://gerrit.libreoffice.org/25626
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/outdev')
| -rw-r--r-- | vcl/source/outdev/font.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/outdev/text.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 01aa8419b67c..022ba4438bd1 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -1167,7 +1167,7 @@ bool OutputDevice::ImplNewFont() const ((maFont.GetOverline() != LINESTYLE_NONE) && (maFont.GetOverline() != LINESTYLE_DONTKNOW)) || ((maFont.GetStrikeout() != STRIKEOUT_NONE) && (maFont.GetStrikeout() != STRIKEOUT_DONTKNOW)); mbTextSpecial = maFont.IsShadow() || maFont.IsOutline() || - (maFont.GetRelief() != RELIEF_NONE); + (maFont.GetRelief() != FontRelief::NONE); // #95414# fix for OLE objects which use scale factors very creatively diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 2fb4c2f8eba4..67b61b9c8391 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -340,7 +340,7 @@ void OutputDevice::ImplDrawSpecialText( SalLayout& rSalLayout ) FontRelief eRelief = maFont.GetRelief(); Point aOrigPos = rSalLayout.DrawBase(); - if ( eRelief != RELIEF_NONE ) + if ( eRelief != FontRelief::NONE ) { Color aReliefColor( COL_LIGHTGRAY ); Color aTextColor( aOldColor ); @@ -370,7 +370,7 @@ void OutputDevice::ImplDrawSpecialText( SalLayout& rSalLayout ) long nOff = 1; nOff += mnDPIX/300; - if ( eRelief == RELIEF_ENGRAVED ) + if ( eRelief == FontRelief::Engraved ) nOff = -nOff; rSalLayout.DrawOffset() += Point( nOff, nOff); ImplDrawTextDirect( rSalLayout, mbTextLines ); @@ -2482,7 +2482,7 @@ bool OutputDevice::GetTextBoundRect( Rectangle& rRect, vcl::Font aFont( GetFont() ); aFont.SetShadow( false ); aFont.SetOutline( false ); - aFont.SetRelief( RELIEF_NONE ); + aFont.SetRelief( FontRelief::NONE ); aFont.SetOrientation( 0 ); aFont.SetFontSize( Size( mpFontInstance->maFontSelData.mnWidth, mpFontInstance->maFontSelData.mnHeight ) ); aVDev->SetFont( aFont ); @@ -2707,7 +2707,7 @@ bool OutputDevice::GetTextOutlines( basegfx::B2DPolyPolygonVector& rVector, vcl::Font aFont(GetFont()); aFont.SetShadow(false); aFont.SetOutline(false); - aFont.SetRelief(RELIEF_NONE); + aFont.SetRelief(FontRelief::NONE); aFont.SetOrientation(0); if( bOptimize ) { |