diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-12-24 00:31:45 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-12-23 13:36:07 +0000 |
commit | 6acf1c7ab7b514a8713ed66b74efbee1a75f029a (patch) | |
tree | e2d9b06e2c935426b3eb08bf843663085946ee77 | |
parent | c18468bbef6f701520116485fa20a790a2c837e9 (diff) |
vcl: fdo#87510 regression in GetFontMetric
Unfortunately when I refactored the code some time ago in commit 588bb542bebd
I forgot to remove the original assignment to mnExtLeading. This fixes this issue.
Change-Id: I9ef514c1a28ec72747fed865a47c41a1193ce1b9
Reviewed-on: https://gerrit.libreoffice.org/13627
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
-rw-r--r-- | vcl/source/outdev/font.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 414b2e85cdd0..3868a6b35c1e 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -197,7 +197,6 @@ FontMetric OutputDevice::GetFontMetric() const aMetric.mpImplMetric->mnDescent = ImplDevicePixelToLogicHeight( pMetric->mnDescent+mnEmphasisDescent ); aMetric.mpImplMetric->mnIntLeading = ImplDevicePixelToLogicHeight( pMetric->mnIntLeading+mnEmphasisAscent ); aMetric.mpImplMetric->mnExtLeading = ImplDevicePixelToLogicHeight( GetFontExtLeading() ); - aMetric.mpImplMetric->mnExtLeading = ImplDevicePixelToLogicHeight( pMetric->mnExtLeading ); aMetric.mpImplMetric->mnLineHeight = ImplDevicePixelToLogicHeight( pMetric->mnAscent+pMetric->mnDescent+mnEmphasisAscent+mnEmphasisDescent ); aMetric.mpImplMetric->mnSlant = ImplDevicePixelToLogicHeight( pMetric->mnSlant ); |