strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#85520# added encoding ID 0 to name table evaluation, fonts.dir update if necessary

Browse source
This commit is contained in:
Philipp Lohmann 2001-06-28 08:49:06 +00:00
parent 60b8e8a83b
commit 6bee3677ac
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
psprint/source/fontmanager/fontmanager.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: fontmanager.cxx,v $
*
* $Revision: 1.13 $
* $Revision: 1.14 $
*
* last change: $Author: pl $ $Date: 2001-06-27 13:36:10 $
* last change: $Author: pl $ $Date: 2001-06-28 09:49:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1159,7 +1159,7 @@ OUString PrintFontManager::convertTrueTypeName( void* pRecord ) const
NameRecord* pNameRecord = (NameRecord*)pRecord;
OUString aValue;
if(
( pNameRecord->platformID == 3 && pNameRecord->encodingID == 1 ) // MS, Unicode
( pNameRecord->platformID == 3 && ( pNameRecord->encodingID == 0 || pNameRecord->encodingID == 1 ) ) // MS, Unicode
||
( pNameRecord->platformID == 0 ) // Apple, Unicode
)
@ -1549,9 +1549,13 @@ void PrintFontManager::initialize( void* pInitDisplay )
::std::list< PrintFont* > aNewFonts;
if( analyzeFontFile( nDirID, aFileName, aXLFDs.size() ? false : true, aXLFDs, aNewFonts ) )
{
bool bUpdateFont = aXLFDs.size() < aNewFonts.size();
for( ::std::list< PrintFont* >::iterator it = aNewFonts.begin(); it != aNewFonts.end(); ++it )
{
m_aFonts[ m_nNextFontID++ ] = *it;
fontID aFont = m_nNextFontID++;
m_aFonts[ aFont ] = *it;
if( bUpdateFont && isPrivateFontFile( aFont ) )
changeFontProperties( aFont, OStringToOUString( getXLFD( *it ), RTL_TEXTENCODING_UTF8 ) );
#ifdef DEBUG
fprintf( stderr, "adding font \"%s\" from file \"%s/%s\"\n", OUStringToOString( m_pAtoms->getString( ATOM_FAMILYNAME, (*it)->m_nFamilyName ), RTL_TEXTENCODING_MS_1252 ).getStr(), aPath.getStr(), aFileName.getStr() );
#endif