diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:23:48 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:23:48 +0000 |
| commit | 51543770e7b7a8d1b656f6d154fcf46251abaa3a (patch) | |
| tree | 07258fdfe3390081df5492180d88f147220eeef2 /psprint | |
| parent | 1a6b1ff712951c282bd95b85f5c8c6617b6602d2 (diff) | |
INTEGRATION: CWS warnings01 (1.10.4); FILE MERGED
2006/05/23 15:23:32 sb 1.10.4.8: RESYNC: (1.17-1.18); FILE MERGED
2006/04/07 15:28:12 sb 1.10.4.7: RESYNC: (1.15-1.17); FILE MERGED
2006/01/25 17:08:32 sb 1.10.4.6: RESYNC: (1.14-1.15); FILE MERGED
2005/11/07 13:45:40 pl 1.10.4.5: RESYNC: (1.13-1.14); FILE MERGED
2005/10/28 10:53:37 pl 1.10.4.4: #i55991# removed warnings for solaris platform
2005/10/24 14:10:31 pl 1.10.4.3: #i55991# resolve issue after resync
2005/10/24 14:03:47 pl 1.10.4.2: RESYNC: (1.10-1.13); FILE MERGED
2005/10/21 10:15:22 pl 1.10.4.1: #i55991# removed warnings for linux platform
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/source/fontmanager/fontconfig.cxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/psprint/source/fontmanager/fontconfig.cxx b/psprint/source/fontmanager/fontconfig.cxx index bd1d91309297..5cc605776eab 100644 --- a/psprint/source/fontmanager/fontconfig.cxx +++ b/psprint/source/fontmanager/fontconfig.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fontconfig.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: rt $ $Date: 2006-05-05 08:57:09 $ + * last change: $Author: hr $ $Date: 2006-06-19 10:23:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,7 +78,7 @@ using namespace rtl; class FontCfgWrapper { - void* m_pLib; + oslModule m_pLib; FcConfig* m_pDefConfig; FcBool (*m_pFcInit)(); @@ -102,7 +102,7 @@ class FontCfgWrapper FcBool (*m_pFcPatternAddInteger)(FcPattern*,const char*,int); FcBool (*m_pFcPatternAddString)(FcPattern*,const char*,const FcChar8*); - void* loadSymbol( const char* ); + oslGenericFunction loadSymbol( const char* ); FontCfgWrapper(); ~FontCfgWrapper(); @@ -177,10 +177,10 @@ public: { return m_pFcPatternAddString( pPattern, pObject, pString ); } }; -void* FontCfgWrapper::loadSymbol( const char* pSymbol ) +oslGenericFunction FontCfgWrapper::loadSymbol( const char* pSymbol ) { OUString aSym( OUString::createFromAscii( pSymbol ) ); - void* pSym = osl_getSymbol( (oslModule)m_pLib, aSym.pData ); + oslGenericFunction pSym = osl_getFunctionSymbol( m_pLib, aSym.pData ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "%s %s\n", pSymbol, pSym ? "found" : "not found" ); #endif @@ -396,7 +396,7 @@ bool PrintFontManager::initFontconfig() OString aDir, aBase, aOrgPath( (sal_Char*)file ); splitPath( aOrgPath, aDir, aBase ); int nDirID = getDirectoryAtom( aDir, true ); - if( ! m_pFontCache->getFontCacheFile( nDirID, aDir, aBase, aFonts ) ) + if( ! m_pFontCache->getFontCacheFile( nDirID, aBase, aFonts ) ) { #if OSL_DEBUG_LEVEL > 2 fprintf( stderr, "file %s not cached\n", aBase.getStr() ); @@ -404,7 +404,7 @@ bool PrintFontManager::initFontconfig() // not known, analyze font file to get attributes // not described by fontconfig (e.g. alias names, PSName) std::list< OString > aDummy; - analyzeFontFile( nDirID, aBase, true, aDummy, aFonts ); + analyzeFontFile( nDirID, aBase, aDummy, aFonts ); #if OSL_DEBUG_LEVEL > 1 if( aFonts.empty() ) fprintf( stderr, "Warning: file is unusable to psprint\n" ); @@ -415,7 +415,9 @@ bool PrintFontManager::initFontconfig() 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 + std::list<PrintFont*>::const_iterator second_font = aFonts.begin(); + ++second_font; + if( second_font != aFonts.end() ) // more than one font { // a collection entry, get the correct index if( eIndexRes == FcResultMatch && nCollectionEntry != -1 ) |