diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 11:11:49 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 11:11:49 +0000 |
commit | ab49f7b8f7746e76f68ce2487d426da554803e1c (patch) | |
tree | 94daa8558c75bbb6be66402afc2ef5e22e034947 /vcl/source | |
parent | 271f9413d4ee429c50e074b38dde604d1675eadd (diff) |
INTEGRATION: CWS vcl93 (1.150.28); FILE MERGED
2008/08/22 08:03:15 hdu 1.150.28.1: #i88376# revert the patch from i72129 to fix a bad regression
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/glyphs/gcach_ftyp.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx index 8570a6f6beab..b3ad4b332ec7 100644 --- a/vcl/source/glyphs/gcach_ftyp.cxx +++ b/vcl/source/glyphs/gcach_ftyp.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: gcach_ftyp.cxx,v $ - * $Revision: 1.150 $ + * $Revision: 1.151 $ * * This file is part of OpenOffice.org. * @@ -1174,9 +1174,11 @@ int FreetypeServerFont::GetRawGlyphIndex( sal_UCS4 aChar ) const // check if symbol aliasing helps if( (aChar <= 0x00FF) && mpFontInfo->IsSymbolFont() ) nGlyphIndex = FT_Get_Char_Index( maFaceFT, aChar | 0xF000 ); +#if 0 // disabled for now because it introduced ae bad side-effect (#i88376#) // Finally try the postscript name table if (!nGlyphIndex) nGlyphIndex = psp::PrintFontManager::get().FreeTypeCharIndex( maFaceFT, aChar ); +#endif } mpFontInfo->CacheGlyphIndex( aChar, nGlyphIndex ); } |