diff options
| author | Kurt Zenker <kz@openoffice.org> | 2003-10-15 09:03:46 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2003-10-15 09:03:46 +0000 |
| commit | a62249b9fa080b0632ff8d4b1c2efa1eeb2ac2b7 (patch) | |
| tree | d6b7c6f554269f73f7d13937083967979fa7ad16 /vcl/unx | |
| parent | 6ff457ccacf78ccb47f8836d049265b64d0bf537 (diff) | |
INTEGRATION: CWS extleading (1.104.38); FILE MERGED
2003/10/02 08:55:39 fme 1.104.38.3: RESYNC: (1.105-1.107); FILE MERGED
2003/08/08 09:50:22 fme 1.104.38.2: RESYNC: (1.104-1.105); FILE MERGED
2003/07/04 14:23:47 hdu 1.104.38.1: #110641# init ExternalLeading member
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/source/gdi/salgdi3.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx index baf498ab6029..f2fd46a0597f 100644 --- a/vcl/unx/source/gdi/salgdi3.cxx +++ b/vcl/unx/source/gdi/salgdi3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salgdi3.cxx,v $ * - * $Revision: 1.107 $ + * $Revision: 1.108 $ * - * last change: $Author: rt $ $Date: 2003-09-19 10:46:36 $ + * last change: $Author: kz $ $Date: 2003-10-15 10:03:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1917,7 +1917,8 @@ SalGraphics::GetFontMetric( ImplFontMetricData *pMetric ) pMetric->mnWidth = nTextWidth; pMetric->mnAscent = ( aInfo.m_nAscend * nTextHeight + 500 ) / 1000; pMetric->mnDescent = ( aInfo.m_nDescend * nTextHeight + 500 ) / 1000; - pMetric->mnLeading = ( aInfo.m_nLeading * nTextHeight + 500 ) / 1000; + pMetric->mnIntLeading = ( aInfo.m_nLeading * nTextHeight + 500 ) / 1000; + pMetric->mnExtLeading = 0; //TODO!!! } return; } @@ -1943,7 +1944,8 @@ SalGraphics::GetFontMetric( ImplFontMetricData *pMetric ) pMetric->mnWidth *= n; pMetric->mnAscent *= n; pMetric->mnDescent *= n; - pMetric->mnLeading *= n; + pMetric->mnIntLeading*= n; + pMetric->mnExtLeading*= n; pMetric->mnSlant *= n; } @@ -1953,7 +1955,8 @@ SalGraphics::GetFontMetric( ImplFontMetricData *pMetric ) pMetric->mnWidth = Divide( pMetric->mnWidth, n ); pMetric->mnAscent = sal_DivideNeg( pMetric->mnAscent, n ); pMetric->mnDescent = sal_DivideNeg( pMetric->mnDescent, n ); - pMetric->mnLeading = sal_DivideNeg( pMetric->mnLeading, n ); + pMetric->mnIntLeading = sal_DivideNeg( pMetric->mnIntLeading, n ); + pMetric->mnExtLeading = sal_DivideNeg( pMetric->mnExtLeading, n ); pMetric->mnSlant = sal_DivideNeg( pMetric->mnSlant, n ); } } |