diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-12-24 00:31:45 +1100 |
|---|---|---|
| committer | Matthew Francis <mjay.francis@gmail.com> | 2014-12-23 15:21:44 +0000 |
| commit | a7f76a197900e7ece5d09fed2bf7920a42425e9c (patch) | |
| tree | 234dff7f5b1dc0e9758e9df493951f4bc8c92de7 | |
| parent | ee21699b90fb5ca3c7f5869465b3f442d643aac3 (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/13628
Reviewed-by: Matthew Francis <mjay.francis@gmail.com>
Tested-by: Matthew Francis <mjay.francis@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 7d142e048277..b7d044cd448c 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 ); |