3 files changed, 10 insertions, 10 deletions
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 6c761ec4bf07..220b5ddaa976 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -61,7 +61,7 @@ FontMetric OutputDevice::GetDevFont( int nDevFontIndex ) const
         aFontMetric.SetPitch( rData.GetPitch() );
         aFontMetric.SetWeight( rData.GetWeight() );
         aFontMetric.SetItalic( rData.GetItalic() );
-        aFontMetric.SetAlignment( TextAlign::ALIGN_TOP );
+        aFontMetric.SetAlignment( TextAlign::Top );
         aFontMetric.SetWidthType( rData.GetWidthType() );
         aFontMetric.SetQuality( rData.GetQuality() );
     }
@@ -199,7 +199,7 @@ FontMetric OutputDevice::GetFontMetric() const
     aMetric.SetPitch( xFontMetric->GetPitch() );
     aMetric.SetWeight( xFontMetric->GetWeight() );
     aMetric.SetItalic( xFontMetric->GetItalic() );
-    aMetric.SetAlignment( TextAlign::ALIGN_TOP );
+    aMetric.SetAlignment( TextAlign::Top );
     aMetric.SetWidthType( xFontMetric->GetWidthType() );
     if ( pFontInstance->mnOwnOrientation )
         aMetric.SetOrientation( pFontInstance->mnOwnOrientation );
@@ -1017,12 +1017,12 @@ bool OutputDevice::ImplNewFont() const
 
     // calculate text offset depending on TextAlignment
     TextAlign eAlign = maFont.GetAlignment();
-    if ( eAlign == ALIGN_BASELINE )
+    if ( eAlign == TextAlign::Baseline )
     {
         mnTextOffX = 0;
         mnTextOffY = 0;
     }
-    else if ( eAlign == ALIGN_TOP )
+    else if ( eAlign == TextAlign::Top )
     {
         mnTextOffX = 0;
         mnTextOffY = +pFontInstance->mxFontMetric->GetAscent() + mnEmphasisAscent;
@@ -1032,7 +1032,7 @@ bool OutputDevice::ImplNewFont() const
             aOriginPt.RotateAround( mnTextOffX, mnTextOffY, pFontInstance->mnOrientation );
         }
     }
-    else // eAlign == ALIGN_BOTTOM
+    else // eAlign == TextAlign::Bottom
     {
         mnTextOffX = 0;
         mnTextOffY = -pFontInstance->mxFontMetric->GetDescent() + mnEmphasisDescent;
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index 7fa966606744..ec16953d40f2 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -32,7 +32,7 @@
 
 OutDevState::OutDevState()
     : mbMapActive(false)
-    , meTextAlign(ALIGN_TOP)
+    , meTextAlign(TextAlign::Top)
     , meRasterOp(RasterOp::OverPaint)
     , mnTextLayoutMode(ComplexTextLayoutFlags::Default)
     , meTextLanguage(0)
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 25234b9f0341..ef11013a02fe 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1586,9 +1586,9 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const tools::Recta
                 aPos.AdjustY((nHeight-(nFormatLines*nTextHeight))/2 );
 
             // Font alignment
-            if ( eAlign == ALIGN_BOTTOM )
+            if ( eAlign == TextAlign::Bottom )
                 aPos.AdjustY(nTextHeight );
-            else if ( eAlign == ALIGN_BASELINE )
+            else if ( eAlign == TextAlign::Baseline )
                 aPos.AdjustY(rTargetDevice.GetFontMetric().GetAscent() );
 
             // Output all lines except for the last one
@@ -1664,9 +1664,9 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const tools::Recta
             aPos.AdjustX((nWidth-nTextWidth)/2 );
 
         // vertical font alignment
-        if ( eAlign == ALIGN_BOTTOM )
+        if ( eAlign == TextAlign::Bottom )
             aPos.AdjustY(nTextHeight );
-        else if ( eAlign == ALIGN_BASELINE )
+        else if ( eAlign == TextAlign::Baseline )
             aPos.AdjustY(rTargetDevice.GetFontMetric().GetAscent() );
 
         if ( nStyle & DrawTextFlags::Bottom )