vcl/source/outdev/font.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 23acda53f70857cac41fc2c877441f91e592d2d0
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Thu Jan 14 08:01:17 2016 +1100
vcl: use mutators for FontMetric's ascent and descent properties
Change-Id: If534bdbd1ed0f06ea68798193eb4771a473a8f54
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 0fbf52e..fe0255f 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -216,8 +216,8 @@ FontMetric OutputDevice::GetFontMetric() const
aMetric.SetScalableFlag( pFontAttributes->IsScalable() );
aMetric.SetFullstopCenteredFlag( pFontAttributes->IsFullstopCentered() );
aMetric.mpImplMetric->mnBulletOffset = pFontAttributes->GetBulletOffset();
- aMetric.mpImplMetric->mnAscent = ImplDevicePixelToLogicHeight(
pFontAttributes->GetAscent() + mnEmphasisAscent );
- aMetric.mpImplMetric->mnDescent = ImplDevicePixelToLogicHeight(
pFontAttributes->GetDescent() + mnEmphasisDescent );
+ aMetric.SetAscent( ImplDevicePixelToLogicHeight(
pFontAttributes->GetAscent() + mnEmphasisAscent ) );
+ aMetric.SetDescent( ImplDevicePixelToLogicHeight(
pFontAttributes->GetDescent() + mnEmphasisDescent ) );
aMetric.SetInternalLeading( ImplDevicePixelToLogicHeight(
pFontAttributes->GetInternalLeading() + mnEmphasisAscent ) );
// OutputDevice has its own external leading function due to #i60945#
aMetric.SetExternalLeading( ImplDevicePixelToLogicHeight(
GetFontExtLeading() ) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
