mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS vcl85_SRC680 (1.78.28); FILE MERGED

Browse Source 
2007/12/21 14:35:42 pl 1.78.28.3: #i84679# fix ! ENABLE_FONTCOFIG case
2007/12/21 13:03:25 pl 1.78.28.2: RESYNC: (1.78-1.79); FILE MERGED
2007/12/05 17:22:29 pl 1.78.28.1: #i64879# add weight heavy to parseWeight
This commit is contained in:
Rüdiger Timm
2008-01-29 15:08:17 +00:00
parent 15758e985a
commit eed9ff83d1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
psprint/source/fontmanager/fontmanager.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: fontmanager.cxx,v $
*
* $Revision: 1.79 $
* $Revision: 1.80 $
*
* last change: $Author: kz $ $Date: 2007-12-12 13:17:02 $
* last change: $Author: rt $ $Date: 2008-01-29 16:08:17 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -183,6 +183,8 @@ static weight::type parseWeight( const ByteString& rWeight )
else
eWeight = weight::Bold;
}
else if( rWeight.Search( "heavy" ) != STRING_NOTFOUND )
eWeight = weight::Bold;
else if( rWeight.Search( "light" ) != STRING_NOTFOUND )
{
if( rWeight.Search( "emi" ) != STRING_NOTFOUND ) // semi, demi
@@ -1214,7 +1216,7 @@ PrintFontManager::PrintFontManager() :
m_pAtoms( new MultiAtomProvider() ),
m_nNextDirAtom( 1 ),
m_pFontCache( NULL ),
m_bFontconfigSuccess(false)
m_bFontconfigSuccess( false )
{
for( unsigned int i = 0; i < sizeof( aAdobeCodes )/sizeof( aAdobeCodes[0] ); i++ )
{