drop FontAlign alias of TextAlign

Change-Id: If69ce85482fdb7d33d00fb0cf9b4d4609bb92cd1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119681
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

4 files changed, 7 insertions, 7 deletions

diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 2fa1a0839d38..9b3751b9cea9 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -735,7 +735,7 @@ void WMFWriter::WMFRecord_SetROP2(RasterOp eROP)
     pWMF->WriteUInt16( nROP2 );
 }
 
-void WMFWriter::WMFRecord_SetTextAlign(FontAlign eFontAlign, sal_uInt16 eHorTextAlign)
+void WMFWriter::WMFRecord_SetTextAlign(TextAlign eFontAlign, sal_uInt16 eHorTextAlign)
 {
     sal_uInt16 nAlign;
 
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
index 725872aa97dd..36239dd73ae8 100644
--- a/vcl/source/filter/wmf/wmfwr.hxx
+++ b/vcl/source/filter/wmf/wmfwr.hxx
@@ -73,7 +73,7 @@ private:
     Color     aSrcTextColor;
     LineInfo  aSrcLineInfo;
     RasterOp  eSrcRasterOp;
-    FontAlign eSrcTextAlign;
+    TextAlign eSrcTextAlign;
     vcl::Font aSrcFont;
     MapMode   aSrcMapMode;
     vcl::Region    aSrcClipRegion;
@@ -87,7 +87,7 @@ private:
     Color     aDstTextColor;
     LineInfo  aDstLineInfo;
     RasterOp  eDstROP2;
-    FontAlign eDstTextAlign;
+    TextAlign eDstTextAlign;
     vcl::Font aDstFont;
 
     sal_uInt16    eDstHorTextAlign;
@@ -163,7 +163,7 @@ private:
     void WMFRecord_SetStretchBltMode();
     void WMFRecord_SetPixel(const Point & rPoint, const Color & rColor);
     void WMFRecord_SetROP2(RasterOp eROP);
-    void WMFRecord_SetTextAlign(FontAlign eFontAlign, sal_uInt16 eHorTextAlign);
+    void WMFRecord_SetTextAlign(TextAlign eFontAlign, sal_uInt16 eHorTextAlign);
     void WMFRecord_SetTextColor(const Color & rColor);
     void WMFRecord_SetWindowExt(const Size & rSize);
     void WMFRecord_SetWindowOrg(const Point & rPoint);
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 5da80236aec5..cc5042fc9506 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -108,7 +108,7 @@ void Font::SetTransparent( bool bTransparent )
         mpImplFont->mbTransparent = bTransparent;
 }
 
-void Font::SetAlignment( FontAlign eAlign )
+void Font::SetAlignment( TextAlign eAlign )
 {
     if (const_cast<const ImplType&>(mpImplFont)->meAlign != eAlign)
         mpImplFont->SetAlignment(eAlign);
@@ -824,7 +824,7 @@ const Color& Font::GetColor() const { return mpImplFont->maColor; }
 const Color& Font::GetFillColor() const { return mpImplFont->maFillColor; }
 bool Font::IsTransparent() const { return mpImplFont->mbTransparent; }
 
-FontAlign Font::GetAlignment() const { return mpImplFont->GetAlignment(); }
+TextAlign Font::GetAlignment() const { return mpImplFont->GetAlignment(); }
 
 const OUString& Font::GetFamilyName() const { return mpImplFont->GetFamilyName(); }
 const OUString& Font::GetStyleName() const { return mpImplFont->maStyleName; }
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 75f9482b1208..5da460b8174f 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -649,7 +649,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                 aFont.SetCharSet( static_cast<rtl_TextEncoding>(nCharSet) );
                 aFont.SetFamily( static_cast<FontFamily>(nFamily) );
                 aFont.SetPitch( static_cast<FontPitch>(nPitch) );
-                aFont.SetAlignment( static_cast<FontAlign>(nAlign) );
+                aFont.SetAlignment( static_cast<TextAlign>(nAlign) );
                 aFont.SetWeight( ( nWeight == 1 ) ? WEIGHT_LIGHT : ( nWeight == 2 ) ? WEIGHT_NORMAL :
                                  ( nWeight == 3 ) ? WEIGHT_BOLD : WEIGHT_DONTKNOW );
                 aFont.SetUnderline( static_cast<FontLineStyle>(nUnderline) );