diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-13 07:56:01 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-13 07:56:01 +0000 |
| commit | f89d70de85a6805da1cf1cdde5b29bcccc09fb4f (patch) | |
| tree | c50334072c95f43f4e87ab9d28e03a3b2ad39b38 /vcl | |
| parent | 7d837f1cb91582a9409c6e763dff43a2fd8a40e2 (diff) | |
INTEGRATION: CWS vcl27 (1.30.48); FILE MERGED
2004/09/09 12:33:53 hdu 1.30.48.1: #116489# only apply asian kerning on default-formatted text
Diffstat (limited to 'vcl')
| -rwxr-xr-x | vcl/source/glyphs/gcach_layout.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vcl/source/glyphs/gcach_layout.cxx b/vcl/source/glyphs/gcach_layout.cxx index bfe466622762..ff87abea4c5b 100755 --- a/vcl/source/glyphs/gcach_layout.cxx +++ b/vcl/source/glyphs/gcach_layout.cxx @@ -2,8 +2,8 @@ * * $RCSfile: gcach_layout.cxx,v $ * - * $Revision: 1.30 $ - * last change: $Author: rt $ $Date: 2004-07-13 16:31:47 $ + * $Revision: 1.31 $ + * last change: $Author: hr $ $Date: 2004-10-13 08:56:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -123,12 +123,13 @@ void ServerFontLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { GenericSalLayout::AdjustLayout( rArgs ); - // asian kerning + // apply asian kerning if the glyphs are not already formatted if( (rArgs.mnFlags & SAL_LAYOUT_KERNING_ASIAN) && !(rArgs.mnFlags & SAL_LAYOUT_VERTICAL) ) - ApplyAsianKerning( rArgs.mpStr, rArgs.mnLength ); + if( (rArgs.mpDXArray != NULL) || (rArgs.mnLayoutWidth != 0) ) + ApplyAsianKerning( rArgs.mpStr, rArgs.mnLength ); - // kashida justification + // insert kashidas where requested by the formatting array if( (rArgs.mnFlags & SAL_LAYOUT_KASHIDA_JUSTIFICATON) && rArgs.mpDXArray ) { int nKashidaIndex = mrServerFont.GetGlyphIndex( 0x0640 ); |