From 88bf1749f1eb7322106da1254e349f51f5df0df5 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 18 Aug 2021 09:25:40 +0100 Subject: undo changes to TextAlign MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert commit 8689bd5490b473a7ffb149bbe5f7f0683f679c72 Author: Caolán McNamara Date: Thu Jul 29 20:49:29 2021 +0100 convert TextAlign to scoped enum lets leave this as it always was Change-Id: Id4d2a5644974cdd2b0ed6d361d5c52629674d057 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120626 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- filter/source/pdf/pdfexport.cxx | 4 ++-- filter/source/svg/svgfontexport.cxx | 2 +- filter/source/svg/svgwriter.cxx | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'filter') diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 24fda92699ec..2932d2e52ac9 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -1118,7 +1118,7 @@ void PDFExport::ImplWriteWatermark( vcl::PDFWriter& rWriter, const Size& rPageSi aFont.SetItalic( ITALIC_NONE ); aFont.SetWidthType( WIDTH_NORMAL ); aFont.SetWeight( WEIGHT_NORMAL ); - aFont.SetAlignment( TextAlign::Bottom ); + aFont.SetAlignment( ALIGN_BOTTOM ); tools::Long nTextWidth = rPageSize.Width(); if( rPageSize.Width() < rPageSize.Height() ) { @@ -1189,7 +1189,7 @@ void PDFExport::ImplWriteTiledWatermark( vcl::PDFWriter& rWriter, const Size& rP aFont.SetItalic( ITALIC_NONE ); aFont.SetWidthType( WIDTH_NORMAL ); aFont.SetWeight( WEIGHT_NORMAL ); - aFont.SetAlignment( TextAlign::Bottom ); + aFont.SetAlignment( ALIGN_BOTTOM ); aFont.SetFontHeight(40); aFont.SetOrientation(450_deg10); diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index 249e222a0762..ab730d3d2774 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -189,7 +189,7 @@ void SVGFontExport::implEmbedFont( const vcl::Font& rFont ) vcl::Font aFont( rFont ); aFont.SetFontSize( Size( 0, nFontEM ) ); - aFont.SetAlignment( TextAlign::Baseline ); + aFont.SetAlignment( ALIGN_BASELINE ); pVDev->SetMapMode(MapMode(MapUnit::Map100thMM)); pVDev->SetFont( aFont ); diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index d7bcf77d95be..05d18bc3675c 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1650,9 +1650,9 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos, const FontMetric aMetric( mpVDev->GetFontMetric() ); const vcl::Font& rFont = mpVDev->GetFont(); - if( rFont.GetAlignment() == TextAlign::Top ) + if( rFont.GetAlignment() == ALIGN_TOP ) aBaseLinePos.AdjustY(aMetric.GetAscent() ); - else if( rFont.GetAlignment() == TextAlign::Bottom ) + else if( rFont.GetAlignment() == ALIGN_BOTTOM ) aBaseLinePos.AdjustY( -(aMetric.GetDescent()) ); implMap( rPos, aPos ); @@ -2648,9 +2648,9 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText, const FontMetric aMetric( mpVDev->GetFontMetric() ); const vcl::Font& rFont = mpVDev->GetFont(); - if( rFont.GetAlignment() == TextAlign::Top ) + if( rFont.GetAlignment() == ALIGN_TOP ) aBaseLinePos.AdjustY(aMetric.GetAscent() ); - else if( rFont.GetAlignment() == TextAlign::Bottom ) + else if( rFont.GetAlignment() == ALIGN_BOTTOM ) aBaseLinePos.AdjustY( -(aMetric.GetDescent()) ); ImplMap( rPos, aPos ); -- cgit