diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-10-17 13:21:54 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-10-17 13:21:54 +0000 |
| commit | e2ada9f4d5fe81cdaa7f93a41b9c1f062c775921 (patch) | |
| tree | cea4b5bb96eac0359aa36f1812b959a01a8009fe | |
| parent | d0ef42efe96d554a4d773c35ce0f5f571dd84f4d (diff) | |
INTEGRATION: CWS macosxgcc4 (1.9.14); FILE MERGED
2005/09/20 00:07:50 fheckl 1.9.14.2: RESYNC: (1.9-1.10); FILE MERGED
2005/09/19 19:36:30 fheckl 1.9.14.1: Adding some casts needing for compilation to succeed with gcc4 on MacOSX (i54458)
| -rw-r--r-- | psprint/source/fontmanager/fontconfig.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/psprint/source/fontmanager/fontconfig.cxx b/psprint/source/fontmanager/fontconfig.cxx index e02c756c04d5..2c4dd1a350fa 100644 --- a/psprint/source/fontmanager/fontconfig.cxx +++ b/psprint/source/fontmanager/fontconfig.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fontconfig.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: hr $ $Date: 2005-09-28 14:25:31 $ + * last change: $Author: rt $ $Date: 2005-10-17 14:21:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -177,7 +177,7 @@ public: void* FontCfgWrapper::loadSymbol( const char* pSymbol ) { OUString aSym( OUString::createFromAscii( pSymbol ) ); - void* pSym = osl_getSymbol( m_pLib, aSym.pData ); + void* pSym = osl_getSymbol( (_oslModule*)m_pLib, aSym.pData ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "%s %s\n", pSymbol, pSym ? "found" : "not found" ); #endif @@ -267,7 +267,7 @@ FontCfgWrapper::FontCfgWrapper() m_pFcPatternAddString ) ) { - osl_unloadModule( m_pLib ); + osl_unloadModule( (_oslModule*)m_pLib ); m_pLib = NULL; #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "not all needed symbols were found in libfontconfig\n" ); @@ -278,7 +278,7 @@ FontCfgWrapper::FontCfgWrapper() m_pDefConfig = FcConfigGetCurrent(); if( ! m_pDefConfig ) { - osl_unloadModule( m_pLib ); + osl_unloadModule( (_oslModule*)m_pLib ); m_pLib = NULL; } } @@ -286,7 +286,7 @@ FontCfgWrapper::FontCfgWrapper() FontCfgWrapper::~FontCfgWrapper() { if( m_pLib ) - osl_unloadModule( m_pLib ); + osl_unloadModule( (_oslModule*)m_pLib ); } static FontCfgWrapper* pOneInstance = NULL; |