diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 15:32:59 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 15:32:59 +0000 |
| commit | 9760f03c888845250d4156c9d4f185057b2a088a (patch) | |
| tree | 2cb2ccfe0206e6bf1d09a2937b9bbbf36a119ba7 | |
| parent | 882d9e3392c1cd2cd28130c5471e5712ca2b4317 (diff) | |
INTEGRATION: CWS fontlists04 (1.61.8); FILE MERGED
2004/09/24 10:24:48 hdu 1.61.8.1: #i34586# use logical instead of physical glyph widths to calculate justification adjustments
| -rwxr-xr-x | vcl/source/gdi/sallayout.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 4b539230ec5e..765b19df5568 100755 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sallayout.cxx,v $ * - * $Revision: 1.61 $ + * $Revision: 1.62 $ * - * last change: $Author: hr $ $Date: 2004-09-08 15:56:33 $ + * last change: $Author: hr $ $Date: 2004-11-09 16:32:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -940,14 +940,14 @@ void GenericSalLayout::ApplyDXArray( ImplLayoutArgs& rArgs ) if( pG->IsClusterStart() ) { // calculate original and adjusted cluster width - int nOldClusterWidth = pG->mnOrigWidth; + int nOldClusterWidth = pG->mnNewWidth; int nNewClusterWidth = pNewGlyphWidths[i]; GlyphItem* pClusterG = pG + 1; for( int j = i; ++j < mnGlyphCount; ++pClusterG ) { if( pClusterG->IsClusterStart() ) break; - nOldClusterWidth += pClusterG->mnOrigWidth; + nOldClusterWidth += pClusterG->mnNewWidth; nNewClusterWidth += pNewGlyphWidths[j]; } int nDiff = nNewClusterWidth - nOldClusterWidth; |