diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 12:14:56 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 12:14:56 +0000 |
| commit | 0b47d03a97fbfa81b8bd5be1c855f1a1736f8705 (patch) | |
| tree | eecfc6eeac66319bf56d385b41bc3c46c4bf52da | |
| parent | 528c0474a4e0f052b168a273b79d72404bcb288c (diff) | |
INTEGRATION: CWS warnings01 (1.22.126); FILE MERGED
2006/05/23 17:49:05 sb 1.22.126.5: RESYNC: (1.23-1.24); FILE MERGED
2005/09/22 20:46:05 sb 1.22.126.4: RESYNC: (1.22-1.23); FILE MERGED
2005/09/06 10:11:51 sb 1.22.126.3: #i53898# sal::reinterpret_int_cast is not needed.
2005/08/31 13:43:22 sb 1.22.126.2: #i53898# Made code warning-free.
2005/08/29 14:03:54 sb 1.22.126.1: #i53898# Made code warning-free.
| -rw-r--r-- | cppu/source/uno/lbmap.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index bbaf56f02c50..bbc4cb222d63 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: lbmap.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: hr $ $Date: 2006-04-19 13:49:56 $ + * last change: $Author: hr $ $Date: 2006-06-19 13:14:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -318,11 +318,11 @@ static inline OUString getMappingName( aKey.append( (sal_Unicode)';' ); aKey.append( rFrom.getTypeName() ); aKey.append( (sal_Unicode)'[' ); - aKey.append( (sal_Int64)rFrom.get(), 16 ); + aKey.append( reinterpret_cast< sal_IntPtr >(rFrom.get()), 16 ); aKey.appendAscii( RTL_CONSTASCII_STRINGPARAM("];") ); aKey.append( rTo.getTypeName() ); aKey.append( (sal_Unicode)'[' ); - aKey.append( (sal_Int64)rTo.get(), 16 ); + aKey.append( reinterpret_cast< sal_IntPtr >(rTo.get()), 16 ); aKey.append( (sal_Unicode)']' ); return aKey.makeStringAndClear(); } @@ -405,7 +405,8 @@ static Mapping loadExternalMapping( { OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM(UNO_EXT_GETMAPPING) ); uno_ext_getMappingFunc fpGetMapFunc = - (uno_ext_getMappingFunc)::osl_getSymbol( hModule, aSymbolName.pData ); + (uno_ext_getMappingFunc)::osl_getFunctionSymbol( + hModule, aSymbolName.pData ); if (fpGetMapFunc) { |