diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-10-27 11:00:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-10-27 11:00:31 +0000 |
| commit | eabd944232da643a2108ea47dd050b9f606d4ccf (patch) | |
| tree | da2bb0768f54105de24c4cb1ea3cb45968eb3c2d /vcl | |
| parent | c10682e9efb33625555eabec699458b35ff0474a (diff) | |
INTEGRATION: CWS extleadfix (1.221.24); FILE MERGED
2006/09/29 14:13:26 hdu 1.221.24.1: #i60945# allow backwards compatible line metrics
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index e0bac94d080f..6ec1c7e67b25 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: outdev3.cxx,v $ * - * $Revision: 1.222 $ + * $Revision: 1.223 $ * - * last change: $Author: hr $ $Date: 2006-10-24 14:08:45 $ + * last change: $Author: rt $ $Date: 2006-10-27 12:00:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -7278,6 +7278,14 @@ FontMetric OutputDevice::GetFontMetric() const aMetric.mpImplMetric->mnExtLeading = ImplDevicePixelToLogicHeight( pMetric->mnExtLeading ); aMetric.mpImplMetric->mnLineHeight = ImplDevicePixelToLogicHeight( pMetric->mnAscent+pMetric->mnDescent+mnEmphasisAscent+mnEmphasisDescent ); aMetric.mpImplMetric->mnSlant = ImplDevicePixelToLogicHeight( pMetric->mnSlant ); + +#ifdef UNX + // backwards compatible line metrics after fixing #i60945# + if( (meOutDevType == OUTDEV_VIRDEV) + && static_cast<const VirtualDevice*>(this)->ForceZeroExtleadBug() ) + aMetric.mpImplMetric->mnExtLeading = 0; +#endif + return aMetric; } |