6 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 5863c61aee04..4135dacdcc27 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -180,7 +180,7 @@ static void CalculateHorizontalScalingFactor(
     else
         aFont.SetFontHeight( rSdrObjCustomShape.GetLogicRect().GetHeight() / rFWData.nMaxParagraphsPerTextArea );
 
-    aFont.SetAlignment( ALIGN_TOP );
+    aFont.SetAlignment( TextAlign::Top );
     aFont.SetFamilyName( rFontItem.GetFamilyName() );
     aFont.SetFamily( rFontItem.GetFamily() );
     aFont.SetStyleName( rFontItem.GetStyleName() );
@@ -289,7 +289,7 @@ static void GetTextAreaOutline(
 
             aFont.SetFontHeight( rFWData.nSingleLineHeight );
 
-            aFont.SetAlignment( ALIGN_TOP );
+            aFont.SetAlignment( TextAlign::Top );
 
             aFont.SetFamilyName( rFontItem.GetFamilyName() );
             aFont.SetFamily( rFontItem.GetFamily() );
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 501c85d6b55d..16982c63487f 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -624,7 +624,7 @@ void SvxShowCharSet::InitSettings(vcl::RenderContext& rRenderContext)
 
     vcl::Font aFont(maFont);
     aFont.SetWeight(WEIGHT_LIGHT);
-    aFont.SetAlignment(ALIGN_TOP);
+    aFont.SetAlignment(TextAlign::Top);
     aFont.SetFontSize(maFontSize);
     aFont.SetTransparent(true);
     rRenderContext.SetFont(aFont);
@@ -651,7 +651,7 @@ void SvxShowCharSet::RecalculateFont(vcl::RenderContext& rRenderContext)
 
     vcl::Font aFont = maFont;
     aFont.SetWeight(WEIGHT_LIGHT);
-    aFont.SetAlignment(ALIGN_TOP);
+    aFont.SetAlignment(TextAlign::Top);
     int nFontHeight = (aSize.Height() - 5) * 2 / (3 * ROW_COUNT);
     maFontSize = rRenderContext.PixelToLogic(Size(0, nFontHeight));
     aFont.SetFontSize(maFontSize);
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 33d54bee40e5..28fff033abb6 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -90,7 +90,7 @@ void scaleFontWidth(vcl::Font& rFont, vcl::RenderContext const & rRenderContext,
 void initFont(vcl::Font& rFont)
 {
     rFont.SetTransparent(true);
-    rFont.SetAlignment(ALIGN_BASELINE);
+    rFont.SetAlignment(TextAlign::Baseline);
 }
 
 void setFontSize(vcl::Font& rFont)
@@ -116,7 +116,7 @@ void setFont(const SvxFont& rNewFont, SvxFont& rImplFont)
 {
     rImplFont = rNewFont;
     rImplFont.SetTransparent(true);
-    rImplFont.SetAlignment(ALIGN_BASELINE);
+    rImplFont.SetAlignment(TextAlign::Baseline);
 }
 
 /*
diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx
index 1cdb3cfc082a..bd88ec497089 100644
--- a/svx/source/dialog/searchcharmap.cxx
+++ b/svx/source/dialog/searchcharmap.cxx
@@ -291,7 +291,7 @@ void SvxSearchCharSet::RecalculateFont(vcl::RenderContext& rRenderContext)
 
     vcl::Font aFont = rRenderContext.GetFont();
     aFont.SetWeight(WEIGHT_LIGHT);
-    aFont.SetAlignment(ALIGN_TOP);
+    aFont.SetAlignment(TextAlign::Top);
     int nFontHeight = (aSize.Height() - 5) * 2 / (3 * ROW_COUNT);
     maFontSize = rRenderContext.PixelToLogic(Size(0, nFontHeight));
     aFont.SetFontSize(maFontSize);
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index de91990ccde8..80f03d393215 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1014,9 +1014,9 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt
     Point aPos( FRound(rPos.X() * mfScaleX + maOfs.X()), FRound(rPos.Y() * mfScaleY + maOfs.Y()) );
     Size aSize( nTextWidth, nTextHeight );
 
-    if ( eAlg == ALIGN_BASELINE )
+    if ( eAlg == TextAlign::Baseline )
         aPos.AdjustY( -(FRound(aFontMetric.GetAscent() * mfScaleY)) );
-    else if ( eAlg == ALIGN_BOTTOM )
+    else if ( eAlg == TextAlign::Bottom )
         aPos.AdjustY( -nTextHeight );
 
     tools::Rectangle aTextRect( aPos, aSize );
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index 471aa47375c3..50cef2800dc8 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -799,9 +799,9 @@ void ImpSdrPdfImport::InsertTextObject(const Point& rPos, const Size& rSize, con
                     FRound(rPos.Y() * mfScaleY + maOfs.Y()));
     Size aSize(FRound(rSize.Width() * mfScaleX), FRound(rSize.Height() * mfScaleY));
 
-    if (eAlignment == ALIGN_BASELINE)
+    if (eAlignment == TextAlign::Baseline)
         aPosition.AdjustY(-FRound(aFontMetric.GetAscent() * mfScaleY));
-    else if (eAlignment == ALIGN_BOTTOM)
+    else if (eAlignment == TextAlign::Bottom)
         aPosition.AdjustY(-nTextHeight);
 
     tools::Rectangle aTextRect(aPosition, aSize);