summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-01-28 16:31:30 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-01-29 01:59:55 +0000
commitd1a49df6833ff16f5cbaf98534eaae62693e520b (patch)
tree2bbf60556966b4939f3700cab9d1a6278e6b67f0 /sw
parent6402164182865d7644d2e93158a23e12a6da3926 (diff)
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>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/inc/swfont.hxx2
-rw-r--r--sw/source/uibase/uiview/srcview.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index e732c684ecb2..06f90312ee24 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -502,7 +502,7 @@ inline void SwFont::SetPitch( const FontPitch ePitch, const sal_uInt8 nWhich )
inline void SwSubFont::SetAlign( const FontAlign eAlign )
{
m_pMagic = nullptr;
- Font::SetAlign( eAlign );
+ Font::SetAlignment( eAlign );
}
inline void SwFont::SetAlign( const FontAlign eAlign )
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 9be761701f95..c70efd054b71 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -140,7 +140,7 @@ static void lcl_PrintHeader( vcl::RenderContext &rOutDev, sal_Int32 nPages, sal_
vcl::Font aFont( aOldFont );
aFont.SetWeight( WEIGHT_BOLD );
- aFont.SetAlign( ALIGN_BOTTOM );
+ aFont.SetAlignment( ALIGN_BOTTOM );
rOutDev.SetFont( aFont );
long nFontHeight = rOutDev.GetTextHeight();