diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-13 18:33:13 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-13 19:50:18 +0000 |
| commit | 08bbdaa2f9e3a2b7cfee6838ea6d9f0096495812 (patch) | |
| tree | 01b38be11e15249e76ff2b5c54cdfdce6c7224d0 /toolkit | |
| parent | fb45376fea3e3d0ff0fc2af56d67efad1e7751cf (diff) | |
vcl: Create accessor and mutator for int and ext leading in FontMetric
Accessor and mutator created for external and internal leading space in
FontMetric.
See commit description in 8bfccd3a71d911b6d ("vcl: Create accessor
and mutator for font scaling in FontMetric") for reasoning behind
patch.
Unit tests
- check to ensure that can set external and leading space
- check equality operator on FontMetric after setting both external
and internal leading space
- enhanced tests to also check the inequality operator
Change-Id: I973970dd0b0631c5eca3e89039dce57ac3a3eb63
Reviewed-on: https://gerrit.libreoffice.org/21454
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/helper/vclunohelper.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index f657be072c44..20043e6614f3 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -434,7 +434,7 @@ css::awt::SimpleFontMetric VCLUnoHelper::CreateFontMetric( const FontMetric& rFo css::awt::SimpleFontMetric aFM; aFM.Ascent = (sal_Int16)rFontMetric.GetAscent(); aFM.Descent = (sal_Int16)rFontMetric.GetDescent(); - aFM.Leading = (sal_Int16)rFontMetric.GetIntLeading(); + aFM.Leading = (sal_Int16)rFontMetric.GetInternalLeading(); aFM.Slant = (sal_Int16)rFontMetric.GetSlant(); aFM.FirstChar = 0x0020; aFM.LastChar = 0xFFFD; |