diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 11:56:41 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 11:56:41 +0000 |
| commit | 4d3d14b5f9bb58c335caddbb2fa85d0e0e9825ee (patch) | |
| tree | 56c2068509a82030a3b572323da3ac77b11f7a60 /vcl/source | |
| parent | 05d2a415654e2b9324f70d92871df20ca964dc43 (diff) | |
INTEGRATION: CWS vcl37 (1.194.2); FILE MERGED
2005/03/24 12:21:53 pl 1.194.2.2: RESYNC: (1.194-1.195); FILE MERGED
2005/03/04 15:05:58 hdu 1.194.2.1: #b6234423# add more glyph fallbacks
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 7624d10af5b1..2fcf810ba7a0 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: outdev3.cxx,v $ * - * $Revision: 1.196 $ + * $Revision: 1.197 $ * - * last change: $Author: rt $ $Date: 2005-03-29 11:46:29 $ + * last change: $Author: rt $ $Date: 2005-03-29 12:56:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -3054,14 +3054,16 @@ ImplFontEntry* ImplFontCache::GetFallback( ImplDevFontList* pFontList, int nMaxLevel = 0; int nBestQuality = 0; ImplDevFontListData** pFallbackList = NULL; - for( const char** ppNames = &aGlyphFallbackList[0]; *ppNames; ++ppNames ) + for( const char** ppNames = &aGlyphFallbackList[0];; ++ppNames ) { - // advance to next sublist when end-of-sublist marker - if( !**ppNames ) + // advance to next sub-list when end-of-sublist marker + if( !*ppNames ) { if( nBestQuality > 0 ) if( ++nMaxLevel >= MAX_FALLBACK ) break; + if( !ppNames[1] ) + break; nBestQuality = 0; continue; } @@ -3103,8 +3105,9 @@ ImplFontEntry* ImplFontCache::GetFallback( ImplDevFontList* pFontList, for( int i = 0; i < nMaxLevel; ++i ) { ImplDevFontListData* pFont = pFallbackList[ i ]; - ByteString aFontName( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8); - fprintf(stderr,"GlyphFallbackFont[%d] = \"%s\"\n", i, aFontName.GetBuffer()); + ByteString aFontName( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ); + fprintf( stderr, "GlyphFallbackFont[%d] (quality=%05d): \"%s\"\n", + i, pFont->GetMinQuality(), aFontName.GetBuffer() ); } #endif |