vcl: add text alignment functions to ImplFont and FontAttributes

ImplFont and FontAttributes now have GetAlignment and SetAlignment,
and I have renamed Font::GetAlign to Font::GetAlignment, and
Font::SetAlign to Font::SetAlignment.

See commit description in 8bfccd3a71d911b6d ("vcl: Create accessor
and mutator for font scaling in FontMetric") for reasoning behind
patch.

Unit test added to vcl/qa/cppunit/font.cxx to test text alignment.

Change-Id: I6272c84fc9416c90616d957d1897eba9469fe7ba
Reviewed-on: https://gerrit.libreoffice.org/21876
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

8 files changed, 11 insertions, 11 deletions

diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 260b29b857a0..44b1c495884d 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -567,7 +567,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
         FlashFont&          rFlashFont = Impl_getFont( aFont );
 
         // always adjust text position to match baseline alignment
-        switch( aOldFont.GetAlign() )
+        switch( aOldFont.GetAlignment() )
         {
             case( ALIGN_TOP ):
                 aBaseLinePos.Y() += aMetric.GetAscent();
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index 3649cceba7d7..6f668025db51 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -454,7 +454,7 @@ sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev )
 
     vcl::Font aOldFont( pVDev->GetFont() );
     vcl::Font aNewFont( aOldFont );
-    aNewFont.SetAlign( ALIGN_BASELINE );
+    aNewFont.SetAlignment( ALIGN_BASELINE );
     pVDev->SetFont( aNewFont );
     aOldFont.SetOrientation(0);
 
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index d8fbfdb83371..521c85a619fa 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -203,7 +203,7 @@ bool DXF2GDIMetaFile::SetFontAttribute(const DXFBasicEntity & rE, short nAngle,
     aFont.SetTransparent(true);
     aFont.SetFamily(FAMILY_SWISS);
     aFont.SetSize(Size(0,nHeight));
-    aFont.SetAlign(ALIGN_BASELINE);
+    aFont.SetAlignment(ALIGN_BASELINE);
     aFont.SetOrientation(nAngle);
     if (aActFont!=aFont) {
         aActFont=aFont;
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 984f234991c7..dd17524bb1b5 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -2264,7 +2264,7 @@ void OS2METReader::ReadFont(sal_uInt16 nFieldSize)
     pF->pSucc=pFontList; pFontList=pF;
     pF->nID=0;
     pF->aFont.SetTransparent(true);
-    pF->aFont.SetAlign(ALIGN_BASELINE);
+    pF->aFont.SetAlignment(ALIGN_BASELINE);
 
     nPos=pOS2MET->Tell();
     nMaxPos=nPos+(sal_uLong)nFieldSize;
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index e7bbf7125b71..c76c989fb37b 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1874,7 +1874,7 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile )
     aActFont.SetCharSet( GetTextEncoding());
     aActFont.SetFamily(FAMILY_SWISS);
     aActFont.SetSize(Size(0,12));
-    aActFont.SetAlign(ALIGN_BASELINE);
+    aActFont.SetAlignment(ALIGN_BASELINE);
 
     aHRes = aVRes = Fraction( 1, 1 );
 
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index da1f2d9d00f2..889d09dee65d 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -1056,7 +1056,7 @@ void PDFExport::ImplWriteWatermark( vcl::PDFWriter& rWriter, const Size& rPageSi
     aFont.SetItalic( ITALIC_NONE );
     aFont.SetWidthType( WIDTH_NORMAL );
     aFont.SetWeight( WEIGHT_NORMAL );
-    aFont.SetAlign( ALIGN_BOTTOM );
+    aFont.SetAlignment( ALIGN_BOTTOM );
     long nTextWidth = rPageSize.Width();
     if( rPageSize.Width() < rPageSize.Height() )
     {
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index 16aa15751712..6251db00a54a 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -196,7 +196,7 @@ void SVGFontExport::implEmbedFont( const vcl::Font& rFont )
                 vcl::Font           aFont( rFont );
 
                 aFont.SetSize( Size( 0, nFontEM ) );
-                aFont.SetAlign( ALIGN_BASELINE );
+                aFont.SetAlignment( ALIGN_BASELINE );
 
                 pVDev->SetMapMode( MAP_100TH_MM );
                 pVDev->SetFont( aFont );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 9f92c998af11..ee07784fab6d 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1555,9 +1555,9 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos,
     const FontMetric                        aMetric( mpVDev->GetFontMetric() );
     const vcl::Font&                        rFont = mpVDev->GetFont();
 
-    if( rFont.GetAlign() == ALIGN_TOP )
+    if( rFont.GetAlignment() == ALIGN_TOP )
         aBaseLinePos.Y() += aMetric.GetAscent();
-    else if( rFont.GetAlign() == ALIGN_BOTTOM )
+    else if( rFont.GetAlignment() == ALIGN_BOTTOM )
         aBaseLinePos.Y() -= aMetric.GetDescent();
 
     if( bApplyMapping )
@@ -2435,9 +2435,9 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
     const FontMetric                        aMetric( mpVDev->GetFontMetric() );
     const vcl::Font&                        rFont = mpVDev->GetFont();
 
-    if( rFont.GetAlign() == ALIGN_TOP )
+    if( rFont.GetAlignment() == ALIGN_TOP )
         aBaseLinePos.Y() += aMetric.GetAscent();
-    else if( rFont.GetAlign() == ALIGN_BOTTOM )
+    else if( rFont.GetAlignment() == ALIGN_BOTTOM )
         aBaseLinePos.Y() -= aMetric.GetDescent();
 
     if( bApplyMapping )