diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-25 10:35:42 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-25 10:35:42 +0000 |
| commit | 8782c48d0af8eb9a6a6c1faffabf24c7caf16d43 (patch) | |
| tree | 92575af53ff537bc649ef51e4cc68d05ab2c2b32 /psprint/source | |
| parent | 8742f444b23a4615a6786f2c0507e5b66062b99b (diff) | |
INTEGRATION: CWS vcl50 (1.15.12); FILE MERGED
2005/12/21 10:11:50 pl 1.15.12.1: #i47447# fontconfig works with utf8 strings
Diffstat (limited to 'psprint/source')
| -rw-r--r-- | psprint/source/fontmanager/fontconfig.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/psprint/source/fontmanager/fontconfig.cxx b/psprint/source/fontmanager/fontconfig.cxx index 235eec72b579..261ee61620b8 100644 --- a/psprint/source/fontmanager/fontconfig.cxx +++ b/psprint/source/fontmanager/fontconfig.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fontconfig.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2005-11-11 11:44:50 $ + * last change: $Author: hr $ $Date: 2006-01-25 11:35:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -331,7 +331,6 @@ bool PrintFontManager::initFontconfig() (void *) NULL ); FcPattern* pPattern = rWrapper.FcPatternCreate(); FcFontSet* pFSet = rWrapper.FcFontList( pConfig, pPattern, pOSet ); - rtl_TextEncoding aThreadTextEncoding = osl_getThreadTextEncoding(); if( pFSet ) { @@ -401,7 +400,7 @@ bool PrintFontManager::initFontconfig() if( aFonts.empty() ) continue; - int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( (sal_Char*)family ), aThreadTextEncoding ), sal_True ); + int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( (sal_Char*)family ), RTL_TEXTENCODING_UTF8 ), sal_True ); PrintFont* pUpdate = aFonts.front(); if( ++aFonts.begin() != aFonts.end() ) // more than one font { @@ -490,7 +489,7 @@ bool PrintFontManager::initFontconfig() } if( eStyleRes == FcResultMatch ) { - pUpdate->m_aStyleName = OStringToOUString( OString( (sal_Char*)style ), aThreadTextEncoding ); + pUpdate->m_aStyleName = OStringToOUString( OString( (sal_Char*)style ), RTL_TEXTENCODING_UTF8 ); } // update font cache |