vcl/source/outdev/font.cxx | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 6acf1c7ab7b514a8713ed66b74efbee1a75f029a
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Wed Dec 24 00:31:45 2014 +1100
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.sherloc...@gmail.com>
Tested-by: Chris Sherlock <chris.sherloc...@gmail.com>
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 414b2e8..3868a6b 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
