diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-05-18 09:06:55 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-05-18 09:06:55 +0000 |
| commit | edc96353728faca30715d506158d6d1f72309a9a (patch) | |
| tree | cb46e6b6895f0751398177e7ad7edffe171ac767 /psprint | |
| parent | 35ddd008ecec5c3b989bf44187d1ff6aca9de9bf (diff) | |
INTEGRATION: CWS wot02 (1.67.12); FILE MERGED
2006/05/12 15:02:34 pl 1.67.12.1: #i65265# need to get ascend also in XLFD case
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/source/fontmanager/fontmanager.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/psprint/source/fontmanager/fontmanager.cxx b/psprint/source/fontmanager/fontmanager.cxx index 40f5d941d3a8..d829ef6ce83d 100644 --- a/psprint/source/fontmanager/fontmanager.cxx +++ b/psprint/source/fontmanager/fontmanager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fontmanager.cxx,v $ * - * $Revision: 1.67 $ + * $Revision: 1.68 $ * - * last change: $Author: vg $ $Date: 2006-04-07 13:44:31 $ + * last change: $Author: vg $ $Date: 2006-05-18 10:06:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1305,13 +1305,13 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, bo pFont->m_aFontFile = rFontFile; pFont->m_aMetricFile = aAfmFile; - if( rXLFDs.size() ) - getFontAttributesFromXLFD( pFont, rXLFDs ); - else if( ! pFont->readAfmMetrics( getAfmFile( pFont ), m_pAtoms, false, true ) ) + if( ! pFont->readAfmMetrics( getAfmFile( pFont ), m_pAtoms, false, true ) ) { delete pFont; pFont = NULL; } + if( pFont && rXLFDs.size() ) + getFontAttributesFromXLFD( pFont, rXLFDs ); if( pFont ) rNewFonts.push_back( pFont ); break; |