summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFontWork.cxx4
-rw-r--r--svx/source/dialog/charmap.cxx4
-rw-r--r--svx/source/dialog/fntctrl.cxx4
-rw-r--r--svx/source/svdraw/svdfmtf.cxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 0e33369408e3..d049d7318c21 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -159,7 +159,7 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape,
vcl::Font aFont;
const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(pCustomShape->GetMergedItem( EE_CHAR_FONTINFO ));
aFont.SetHeight( pCustomShape->GetLogicRect().GetHeight() / rFWData.nMaxParagraphsPerTextArea );
- aFont.SetAlign( ALIGN_TOP );
+ aFont.SetAlignment( ALIGN_TOP );
aFont.SetFamilyName( rFontItem.GetFamilyName() );
aFont.SetFamily( rFontItem.GetFamily() );
aFont.SetStyleName( rFontItem.GetStyleName() );
@@ -246,7 +246,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(pCustomShape->GetMergedItem( nFntItm ));
vcl::Font aFont;
aFont.SetHeight( rFWData.nSingleLineHeight );
- aFont.SetAlign( ALIGN_TOP );
+ aFont.SetAlignment( ALIGN_TOP );
aFont.SetFamilyName( rFontItem.GetFamilyName() );
aFont.SetFamily( rFontItem.GetFamily() );
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 1c6f0bb93c33..bd3c81bf8600 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -523,7 +523,7 @@ void SvxShowCharSet::InitSettings(vcl::RenderContext& rRenderContext)
vcl::Font aFont(rRenderContext.GetFont());
aFont.SetWeight(WEIGHT_LIGHT);
- aFont.SetAlign(ALIGN_TOP);
+ aFont.SetAlignment(ALIGN_TOP);
aFont.SetSize(maFontSize);
aFont.SetTransparent(true);
rRenderContext.SetFont(aFont);
@@ -556,7 +556,7 @@ void SvxShowCharSet::RecalculateFont(vcl::RenderContext& rRenderContext)
vcl::Font aFont = rRenderContext.GetFont();
aFont.SetWeight(WEIGHT_LIGHT);
- aFont.SetAlign(ALIGN_TOP);
+ aFont.SetAlignment(ALIGN_TOP);
int nFontHeight = (aSize.Height() - 5) * 2 / (3 * ROW_COUNT);
maFontSize = rRenderContext.PixelToLogic(Size(0, nFontHeight));
aFont.SetSize(maFontSize);
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 682035c8f6f4..34bde58e7d54 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -92,7 +92,7 @@ void scaleFontWidth(vcl::Font& rFont, vcl::RenderContext& rRenderContext,long& n
void initFont(vcl::Font& rFont)
{
rFont.SetTransparent(true);
- rFont.SetAlign(ALIGN_BASELINE);
+ rFont.SetAlignment(ALIGN_BASELINE);
}
void setFontSize(vcl::Font& rFont)
@@ -118,7 +118,7 @@ void setFont(const SvxFont& rNewFont, SvxFont& rImplFont)
{
rImplFont = rNewFont;
rImplFont.SetTransparent(true);
- rImplFont.SetAlign(ALIGN_BASELINE);
+ rImplFont.SetAlignment(ALIGN_BASELINE);
}
} // end anonymous namespace
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index dbd14d786715..cfea596f881a 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -987,7 +987,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt
FontMetric aFontMetric( mpVD->GetFontMetric() );
vcl::Font aFnt( mpVD->GetFont() );
- FontAlign eAlg( aFnt.GetAlign() );
+ FontAlign eAlg( aFnt.GetAlignment() );
sal_Int32 nTextWidth = (sal_Int32)( mpVD->GetTextWidth( rStr ) * mfScaleX );
sal_Int32 nTextHeight = (sal_Int32)( mpVD->GetTextHeight() * mfScaleY );