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>

3 files changed, 6 insertions, 6 deletions

diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 4fb88ee02867..8ab16b79da7d 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2023,7 +2023,7 @@ void EditDoc::RemoveItemsFromPool(const ContentNode& rNode)
 void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, SvtScriptType nScriptType )
 {
     vcl::Font aPrevFont( rFont );
-    rFont.SetAlign( ALIGN_BASELINE );
+    rFont.SetAlignment( ALIGN_BASELINE );
     rFont.SetTransparent( true );
 
     sal_uInt16 nWhich_FontInfo = GetScriptItemId( EE_CHAR_FONTINFO, nScriptType );
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 09f37e929d1b..2f258620279c 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -44,7 +44,7 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const vcl::Font& rFont )
     rStream.WriteUInt16( nTemp );
 
     nTemp = (sal_uInt16)rFont.GetPitch(); rStream.WriteUInt16( nTemp );
-    nTemp = (sal_uInt16)rFont.GetAlign(); rStream.WriteUInt16( nTemp );
+    nTemp = (sal_uInt16)rFont.GetAlignment(); rStream.WriteUInt16( nTemp );
     nTemp = (sal_uInt16)rFont.GetWeight(); rStream.WriteUInt16( nTemp );
     nTemp = (sal_uInt16)rFont.GetUnderline(); rStream.WriteUInt16( nTemp );
     nTemp = (sal_uInt16)rFont.GetStrikeout(); rStream.WriteUInt16( nTemp );
@@ -73,7 +73,7 @@ vcl::Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
     aFont.SetCharSet((rtl_TextEncoding)nTemp);
 
     rStream.ReadUInt16( nTemp ); aFont.SetPitch((FontPitch)nTemp);
-    rStream.ReadUInt16( nTemp ); aFont.SetAlign((FontAlign)nTemp);
+    rStream.ReadUInt16( nTemp ); aFont.SetAlignment((FontAlign)nTemp);
     rStream.ReadUInt16( nTemp ); aFont.SetWeight((FontWeight)nTemp);
     rStream.ReadUInt16( nTemp ); aFont.SetUnderline((FontUnderline)nTemp);
     rStream.ReadUInt16( nTemp ); aFont.SetStrikeout((FontStrikeout)nTemp);
@@ -202,7 +202,7 @@ SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) c
 void SvxBulletItem::SetDefaultFont_Impl()
 {
     aFont = OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, GetDefaultFontFlags::NONE );
-    aFont.SetAlign( ALIGN_BOTTOM);
+    aFont.SetAlignment( ALIGN_BOTTOM);
     aFont.SetTransparent( true );
 }
 
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index fac21c1a78e2..d19e62ba11ea 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -893,7 +893,7 @@ vcl::Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const
     nScaledLineHeight *= nScale*10;
     nScaledLineHeight /= 1000;
 
-    aBulletFont.SetAlign( ALIGN_BOTTOM );
+    aBulletFont.SetAlignment( ALIGN_BOTTOM );
     aBulletFont.SetSize( Size( 0, nScaledLineHeight ) );
     bool bVertical = IsVertical();
     aBulletFont.SetVertical( bVertical );
@@ -946,7 +946,7 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos,
                 vcl::Font aBulletFont( ImpCalcBulletFont( nPara ) );
                 // Use baseline
                 bool bSymbol = pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL;
-                aBulletFont.SetAlign( bSymbol ? ALIGN_BOTTOM : ALIGN_BASELINE );
+                aBulletFont.SetAlignment( bSymbol ? ALIGN_BOTTOM : ALIGN_BASELINE );
                 vcl::Font aOldFont = pOutDev->GetFont();
                 pOutDev->SetFont( aBulletFont );