diff options
author | Rüdiger Timm <rt@openoffice.org> | 2003-09-19 09:46:36 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2003-09-19 09:46:36 +0000 |
commit | 00d11795b33ac138c7976c41359d9ce802840ffd (patch) | |
tree | 5b00c0570dbafd3fa1b44538ac0096d9401a1709 /vcl/unx | |
parent | 31f3ce78bf72c0b78e6da0285aa38c9007d84baa (diff) |
INTEGRATION: CWS geordi2q05 (1.106.14); FILE MERGED
2003/09/16 16:20:52 rt 1.106.14.1: #111934#: join CWS ooo11vclrc5
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/source/gdi/salgdi3.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx index d6f3a3553da6..baf498ab6029 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.106 $ + * $Revision: 1.107 $ * - * last change: $Author: kz $ $Date: 2003-08-25 13:57:39 $ + * last change: $Author: rt $ $Date: 2003-09-19 10:46:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1210,6 +1210,7 @@ bool PspFontLayout::LayoutText( ImplLayoutArgs& rArgs ) int nCharPos = -1; Point aNewPos( 0, 0 ); GlyphItem aPrevItem; + rtl_TextEncoding aFontEnc = mrPrinterGfx.GetFontMgr().getFontEncoding( mnFontID ); for(;;) { bool bRightToLeft; @@ -1218,6 +1219,10 @@ bool PspFontLayout::LayoutText( ImplLayoutArgs& rArgs ) sal_Unicode cChar = rArgs.mpStr[ nCharPos ]; int nGlyphIndex = cChar; // printer glyphs = unicode + // symbol font aliasing: 0x0020-0x00ff -> 0xf020 -> 0xf0ff + if( aFontEnc == RTL_TEXTENCODING_SYMBOL ) + if( cChar < 256 ) + cChar += 0xf000; // update fallback_runs if needed psp::CharacterMetric aMetric; |