diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-07-29 20:49:29 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-07-30 16:40:56 +0200 |
commit | 8689bd5490b473a7ffb149bbe5f7f0683f679c72 (patch) | |
tree | 896991b9de6e8aa9e00149b8ff7c12873cd73d48 /canvas | |
parent | d4d8fb12e81152ad75d1ab4cabfa300aa982e589 (diff) |
convert TextAlign to scoped enum
Change-Id: Id2c466eacb44f0ea6adba75a0ac0be8be8e7ed4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119682
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/source/cairo/cairo_canvasfont.cxx | 2 | ||||
-rw-r--r-- | canvas/source/directx/dx_textlayout_drawhelper.cxx | 4 | ||||
-rw-r--r-- | canvas/source/opengl/ogl_canvashelper.cxx | 2 | ||||
-rw-r--r-- | canvas/source/vcl/canvasfont.cxx | 2 | ||||
-rw-r--r-- | canvas/source/vcl/spritecanvashelper.cxx | 2 | ||||
-rw-r--r-- | canvas/source/vcl/spritehelper.cxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index cca052d167e0..3270432b7a31 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -45,7 +45,7 @@ namespace cairocanvas maFontRequest( rFontRequest ), mpRefDevice( rDevice ) { - maFont->SetAlignment( ALIGN_BASELINE ); + maFont->SetAlignment( TextAlign::Baseline ); maFont->SetCharSet( (rFontRequest.FontDescription.IsSymbolFont==css::util::TriState_YES) ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); maFont->SetVertical( rFontRequest.FontDescription.IsVertical==css::util::TriState_YES ); diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index 1ffeb612de3d..c6d8d76ea9f5 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -111,7 +111,7 @@ namespace dxcanvas rFontRequest.FontDescription.StyleName, Size( 0, ::basegfx::fround(rFontRequest.CellSize))); - aFont.SetAlignment( ALIGN_BASELINE ); + aFont.SetAlignment( TextAlign::Baseline ); aFont.SetCharSet( (rFontRequest.FontDescription.IsSymbolFont==css::util::TriState_YES) ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); aFont.SetVertical( rFontRequest.FontDescription.IsVertical==css::util::TriState_YES ); aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) ); @@ -251,7 +251,7 @@ namespace dxcanvas rFontRequest.FontDescription.StyleName, Size( 0, ::basegfx::fround(rFontRequest.CellSize))); - aFont.SetAlignment( ALIGN_BASELINE ); + aFont.SetAlignment( TextAlign::Baseline ); aFont.SetCharSet( (rFontRequest.FontDescription.IsSymbolFont==css::util::TriState_YES) ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); aFont.SetVertical( rFontRequest.FontDescription.IsVertical==css::util::TriState_YES ); aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) ); diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index 0484f710ae53..a7e15a6cf45d 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -692,7 +692,7 @@ namespace oglcanvas rFontRequest.FontDescription.StyleName, Size( 0, ::basegfx::fround(rFontRequest.CellSize))); - aFont.SetAlignment( ALIGN_BASELINE ); + aFont.SetAlignment( TextAlign::Baseline ); aFont.SetCharSet( (rFontRequest.FontDescription.IsSymbolFont==util::TriState_YES) ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); aFont.SetVertical( rFontRequest.FontDescription.IsVertical==util::TriState_YES ); aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) ); diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index e7fab0492549..0a5c29506134 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -49,7 +49,7 @@ namespace vclcanvas mpRefDevice( &rDevice ), mpOutDevProvider( rOutDevProvider ) { - maFont->SetAlignment( ALIGN_BASELINE ); + maFont->SetAlignment( TextAlign::Baseline ); maFont->SetCharSet( (rFontRequest.FontDescription.IsSymbolFont==css::util::TriState_YES) ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); maFont->SetVertical( rFontRequest.FontDescription.IsVertical==css::util::TriState_YES ); diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index 1796c8ac7ffe..0b7479aa19a9 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -107,7 +107,7 @@ namespace vclcanvas aVCLFont.SetFontHeight( 20 ); aVCLFont.SetColor( INFO_COLOR ); - rOutDev.SetTextAlign(ALIGN_TOP); + rOutDev.SetTextAlign(TextAlign::Top); rOutDev.SetTextColor( INFO_COLOR ); rOutDev.SetFont( aVCLFont ); diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 57b38a9a2815..feba1b7c10b4 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -215,7 +215,7 @@ namespace vclcanvas aVCLFont.SetFontHeight( std::min(::tools::Long(20),aOutputSize.Height()) ); aVCLFont.SetColor( COL_RED ); - rTargetSurface.SetTextAlign(ALIGN_TOP); + rTargetSurface.SetTextAlign(TextAlign::Top); rTargetSurface.SetTextColor( COL_RED ); rTargetSurface.SetFont( aVCLFont ); |