From cf54f2a10f128cf5d79397911b5be710e7081963 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 28 Mar 2015 19:05:38 +0100 Subject: Clean up C-style casts from pointers to void Change-Id: I85d6761e72ba2f67a1d67a94cae674cbb271b43f --- rsc/source/parser/rsckey.cxx | 12 +++++------ rsc/source/parser/rscpar.cxx | 6 +++--- rsc/source/parser/rscyacc.y | 2 +- rsc/source/prj/start.cxx | 48 +++++++++++++++++++++---------------------- rsc/source/res/rscarray.cxx | 2 +- rsc/source/res/rscclass.cxx | 10 ++++----- rsc/source/res/rscconst.cxx | 10 ++++----- rsc/source/res/rsccont.cxx | 14 ++++++------- rsc/source/res/rscflag.cxx | 2 +- rsc/source/res/rscmgr.cxx | 2 +- rsc/source/res/rscrange.cxx | 6 +++--- rsc/source/res/rscstr.cxx | 6 +++--- rsc/source/rsc/rsc.cxx | 2 +- rsc/source/tools/rscchar.cxx | 2 +- rsc/source/tools/rsctools.cxx | 12 +++++------ rsc/source/tools/rsctree.cxx | 6 +++--- 16 files changed, 71 insertions(+), 71 deletions(-) (limited to 'rsc') diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx index b60a290362e4..7b721bb0891b 100644 --- a/rsc/source/parser/rsckey.cxx +++ b/rsc/source/parser/rsckey.cxx @@ -36,9 +36,9 @@ extern "C" { int SAL_CALL KeyCompare( const void * pFirst, const void * pSecond ) { - if( ((KEY_STRUCT *)pFirst)->nName > ((KEY_STRUCT *)pSecond)->nName ) + if( static_cast(pFirst)->nName > static_cast(pSecond)->nName ) return 1; - else if( ((KEY_STRUCT *)pFirst)->nName < ((KEY_STRUCT *)pSecond)->nName ) + else if( static_cast(pFirst)->nName < static_cast(pSecond)->nName ) return -1; else return 0; @@ -72,13 +72,13 @@ void RscNameTable::SetSort( bool bSorted ) Atom RscNameTable::Put( Atom nName, sal_uInt32 nTyp, long nValue ) { if( pTable ) - pTable = (KEY_STRUCT *) + pTable = static_cast( rtl_reallocateMemory( (void *)pTable, - ((nEntries +1) * sizeof( KEY_STRUCT )) ); + ((nEntries +1) * sizeof( KEY_STRUCT )) )); else - pTable = (KEY_STRUCT *) + pTable = static_cast( rtl_allocateMemory( ((nEntries +1) - * sizeof( KEY_STRUCT )) ); + * sizeof( KEY_STRUCT )) )); pTable[ nEntries ].nName = nName; pTable[ nEntries ].nTyp = nTyp; diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx index 8f56023d93b0..088fce877d6f 100644 --- a/rsc/source/parser/rscpar.cxx +++ b/rsc/source/parser/rscpar.cxx @@ -25,7 +25,7 @@ void RscFileInst::Init() { nLineNo = 0; nLineBufLen = 256; - pLine = (char *)rtl_allocateMemory( nLineBufLen ); + pLine = static_cast(rtl_allocateMemory( nLineBufLen )); *pLine = '\0'; nScanPos = 0; cLastChar = '\0'; @@ -46,7 +46,7 @@ RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc, //Status: Zeiger am Ende des Lesepuffers nInputPos = nInputEndPos = nInputBufLen = READBUFFER_MAX; - pInput = (char *)rtl_allocateMemory( nInputBufLen ); + pInput = static_cast(rtl_allocateMemory( nInputBufLen )); } RscFileInst::~RscFileInst() @@ -96,7 +96,7 @@ void RscFileInst::GetNewLine() { nLineBufLen += 256; // einen dazu fuer '\0' - pLine = (char*)rtl_reallocateMemory( pLine, nLineBufLen +1 ); + pLine = static_cast(rtl_reallocateMemory( pLine, nLineBufLen +1 )); } // cr lf, lf cr, lf oder cr wird '\0' diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y index 3900b67fd22d..c084d9b2e988 100644 --- a/rsc/source/parser/rscyacc.y +++ b/rsc/source/parser/rscyacc.y @@ -1164,7 +1164,7 @@ string_multiline rtl::OStringBuffer aBuf( 256 ); aBuf.append( $1 ); aBuf.append( $2 ); - $$ = (char*)pStringContainer->putString( aBuf.getStr() ); + $$ = const_cast(pStringContainer->putString( aBuf.getStr() )); } ; diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index cfe243fa8845..181b9f58fb41 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -64,7 +64,7 @@ static bool CallPrePro( const OString& rInput, bool bVerbose = false; for( i = 1; i < int(pCmdLine->GetCount() -1); i++ ) { - if ( 0 == rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-verbose" ) ) + if ( 0 == rsc_stricmp( static_cast(pCmdLine->GetEntry( i )), "-verbose" ) ) { bVerbose = true; continue; @@ -86,11 +86,11 @@ static bool CallPrePro( const OString& rInput, // ignore args starting with "-isystem" continue; } - if ( !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-u", 2 ) || - !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-i", 2 ) || - !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-d", 2 )) + if ( !rsc_strnicmp( static_cast(pCmdLine->GetEntry( i )), "-u", 2 ) || + !rsc_strnicmp( static_cast(pCmdLine->GetEntry( i )), "-i", 2 ) || + !rsc_strnicmp( static_cast(pCmdLine->GetEntry( i )), "-d", 2 )) { - aNewCmdL.Append( rsc_strdup( (char *)pCmdLine->GetEntry( i ) ) ); + aNewCmdL.Append( rsc_strdup( static_cast(pCmdLine->GetEntry( i )) ) ); } } @@ -104,7 +104,7 @@ static bool CallPrePro( const OString& rInput, for( i = 0; i < (int)(pCmdL->GetCount() -1); i++ ) { printf( " " ); - printf( "%s", (const char *)pCmdL->GetEntry( i ) ); + printf( "%s", static_cast(pCmdL->GetEntry( i )) ); } printf( "\n" ); } @@ -120,7 +120,7 @@ static bool CallPrePro( const OString& rInput, pCmdL = &aRespCmdL; for( i = 0; i < (int)(aNewCmdL.GetCount() -1); i++ ) { - fprintf( fRspFile, "%s ", (const char *)aNewCmdL.GetEntry( i ) ); + fprintf( fRspFile, "%s ", static_cast(aNewCmdL.GetEntry( i )) ); } fclose( fRspFile ); @@ -130,13 +130,13 @@ static bool CallPrePro( const OString& rInput, for( i = 0; i < (int)(pCmdL->GetCount() -1); i++ ) { printf( " " ); - printf( "%s", (const char *)pCmdL->GetEntry( i ) ); + printf( "%s", static_cast(pCmdL->GetEntry( i )) ); } printf( "\n" ); } } - nRet = rscpp_main( pCmdL->GetCount()-1, (char**)pCmdL->GetBlock() ); + nRet = rscpp_main( pCmdL->GetCount()-1, reinterpret_cast(pCmdL->GetBlock()) ); if ( fRspFile ) { @@ -164,30 +164,30 @@ static bool CallRsc2( RscStrList * pInputList, for (int i = 1; i < (int)(pCmdLine->GetCount() -1); ++i) { - if ( !rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-verbose" ) ) + if ( !rsc_stricmp( static_cast(pCmdLine->GetEntry( i )), "-verbose" ) ) { eVerbosity = RscVerbosityVerbose; continue; } - if ( !rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-quiet" ) ) + if ( !rsc_stricmp( static_cast(pCmdLine->GetEntry( i )), "-quiet" ) ) { eVerbosity = RscVerbositySilent; continue; } - if( !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-fp=", 4 ) || - !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-fo=", 4 ) || - !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-presponse", 10 ) || - !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-rc", 3 ) || - !rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-+" ) || - !rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-br" ) || - !rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-bz" ) || - !rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-r" ) || - ( '-' != *(char *)pCmdLine->GetEntry( i ) ) ) + if( !rsc_strnicmp( static_cast(pCmdLine->GetEntry( i )), "-fp=", 4 ) || + !rsc_strnicmp( static_cast(pCmdLine->GetEntry( i )), "-fo=", 4 ) || + !rsc_strnicmp( static_cast(pCmdLine->GetEntry( i )), "-presponse", 10 ) || + !rsc_strnicmp( static_cast(pCmdLine->GetEntry( i )), "-rc", 3 ) || + !rsc_stricmp( static_cast(pCmdLine->GetEntry( i )), "-+" ) || + !rsc_stricmp( static_cast(pCmdLine->GetEntry( i )), "-br" ) || + !rsc_stricmp( static_cast(pCmdLine->GetEntry( i )), "-bz" ) || + !rsc_stricmp( static_cast(pCmdLine->GetEntry( i )), "-r" ) || + ( '-' != *static_cast(pCmdLine->GetEntry( i )) ) ) { } else { - aNewCmdL.Append( rsc_strdup( (char *)pCmdLine->GetEntry( i ) ) ); + aNewCmdL.Append( rsc_strdup( static_cast(pCmdLine->GetEntry( i )) ) ); } } @@ -204,12 +204,12 @@ static bool CallRsc2( RscStrList * pInputList, printf( "Rsc2 commandline: " ); for( size_t i = 0; i < (unsigned int)(aNewCmdL.GetCount() -1); i++ ) { - printf( " %s", (const char *)aNewCmdL.GetEntry( i ) ); + printf( " %s", static_cast(aNewCmdL.GetEntry( i )) ); } printf( "\n" ); } - nRet = rsc2_main( aNewCmdL.GetCount(), (char**)aNewCmdL.GetBlock() ); + nRet = rsc2_main( aNewCmdL.GetCount(), reinterpret_cast(aNewCmdL.GetBlock()) ); if( nRet ) return false; @@ -238,7 +238,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return 1; }; - ppStr = (char **)aCmdLine.GetBlock(); + ppStr = reinterpret_cast(aCmdLine.GetBlock()); ppStr++; i = 1; bool bSetSrs = false; diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx index 3e7c70a9b63c..4db3fb2c8dbb 100644 --- a/rsc/source/res/rscarray.cxx +++ b/rsc/source/res/rscarray.cxx @@ -94,7 +94,7 @@ RSCINST RscArray::Create( RSCINST * pInst, const RSCINST & rDflt, if( !pInst ) { aInst.pClass = this; - aInst.pData = (CLASS_DATA) rtl_allocateMemory( Size() ); + aInst.pData = static_cast(rtl_allocateMemory( Size() )); } else aInst = *pInst; diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx index 4c50c2eb6657..7d7861b607de 100644 --- a/rsc/source/res/rscclass.cxx +++ b/rsc/source/res/rscclass.cxx @@ -148,7 +148,7 @@ RSCINST RscClass::Create( RSCINST * pInst, if( !pInst ) { aInst.pClass = this; - aInst.pData = (CLASS_DATA) rtl_allocateMemory( Size() ); + aInst.pData = static_cast(rtl_allocateMemory( Size() )); } else aInst = *pInst; @@ -234,13 +234,13 @@ ERRTYPE RscClass::SetVariable( Atom nVarName, { if( pVarTypeList ) { - pVarTypeList = (VARTYPE_STRUCT *) rtl_reallocateMemory( (void *)pVarTypeList, - ((nEntries +1) * sizeof( VARTYPE_STRUCT )) ); + pVarTypeList = static_cast(rtl_reallocateMemory( (void *)pVarTypeList, + ((nEntries +1) * sizeof( VARTYPE_STRUCT )) )); } else { - pVarTypeList = (VARTYPE_STRUCT *) rtl_allocateMemory( ((nEntries +1) - * sizeof( VARTYPE_STRUCT )) ); + pVarTypeList = static_cast(rtl_allocateMemory( ((nEntries +1) + * sizeof( VARTYPE_STRUCT )) )); } pVarTypeList[ nEntries ].nVarName = nVarName; pVarTypeList[ nEntries ].nMask = nMask; diff --git a/rsc/source/res/rscconst.cxx b/rsc/source/res/rscconst.cxx index d8273dd89c44..77b67475516c 100644 --- a/rsc/source/res/rscconst.cxx +++ b/rsc/source/res/rscconst.cxx @@ -47,10 +47,10 @@ RSCCLASS_TYPE RscConst::GetClassType() const ERRTYPE RscConst::SetConstant( Atom nVarName, sal_Int32 lValue ) { if( pVarArray ) - pVarArray = (VarEle *) rtl_reallocateMemory( (void *)pVarArray, - ((nEntries +1) * sizeof( VarEle )) ); + pVarArray = static_cast(rtl_reallocateMemory( (void *)pVarArray, + ((nEntries +1) * sizeof( VarEle )) )); else - pVarArray = (VarEle *) rtl_allocateMemory( ((nEntries +1) * sizeof( VarEle )) ); + pVarArray = static_cast(rtl_allocateMemory( ((nEntries +1) * sizeof( VarEle )) )); pVarArray[ nEntries ].nId = nVarName; pVarArray[ nEntries ].lValue = lValue; nEntries++; @@ -159,8 +159,8 @@ RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass if( !pInst ) { aInst.pClass = this; - aInst.pData = (CLASS_DATA) - rtl_allocateMemory( sizeof( RscEnumInst ) ); + aInst.pData = static_cast( + rtl_allocateMemory( sizeof( RscEnumInst ) )); } else aInst = *pInst; diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx index 917f64df9bb1..e0ddc76ff4bc 100644 --- a/rsc/source/res/rsccont.cxx +++ b/rsc/source/res/rsccont.cxx @@ -79,7 +79,7 @@ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt, if( !pInst ) { aInst.pClass = this; - aInst.pData = (CLASS_DATA) rtl_allocateMemory( Size() ); + aInst.pData = static_cast(rtl_allocateMemory( Size() )); } else aInst = *pInst; @@ -105,8 +105,8 @@ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt, { *pClassData = *pDfltClassData; pClassData->pEntries = - (ENTRY_STRUCT *)rtl_allocateMemory( sizeof( ENTRY_STRUCT ) - * pClassData->nEntries ); + static_cast(rtl_allocateMemory( sizeof( ENTRY_STRUCT ) + * pClassData->nEntries )); for (sal_uInt32 i = 0; i < pClassData->nEntries; i++ ) { pClassData->pEntries[ i ].Create(); @@ -213,14 +213,14 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName, if( pClassData->pEntries ) { pClassData->pEntries = - (ENTRY_STRUCT *)rtl_reallocateMemory( pClassData->pEntries, - sizeof( ENTRY_STRUCT ) * (pClassData->nEntries +1) ); + static_cast(rtl_reallocateMemory( pClassData->pEntries, + sizeof( ENTRY_STRUCT ) * (pClassData->nEntries +1) )); } else { pClassData->pEntries = - (ENTRY_STRUCT *)rtl_allocateMemory( sizeof( ENTRY_STRUCT ) - * (pClassData->nEntries +1) ); + static_cast(rtl_allocateMemory( sizeof( ENTRY_STRUCT ) + * (pClassData->nEntries +1) )); } pClassData->pEntries[ pClassData->nEntries ].Create(); diff --git a/rsc/source/res/rscflag.cxx b/rsc/source/res/rscflag.cxx index d78a6df8bcd6..d0f1573e1b3a 100644 --- a/rsc/source/res/rscflag.cxx +++ b/rsc/source/res/rscflag.cxx @@ -76,7 +76,7 @@ RSCINST RscFlag::CreateBasic( RSCINST * pInst ) if( !pInst ) { aInst.pClass = this; - aInst.pData = (CLASS_DATA) rtl_allocateMemory( Size() ); + aInst.pData = static_cast(rtl_allocateMemory( Size() )); } else aInst = *pInst; diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx index 086eb7f1ebdd..1f8e941d079f 100644 --- a/rsc/source/res/rscmgr.cxx +++ b/rsc/source/res/rscmgr.cxx @@ -44,7 +44,7 @@ RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass ) if( !pInst ) { aInst.pClass = this; - aInst.pData = (CLASS_DATA) rtl_allocateMemory( Size() ); + aInst.pData = static_cast(rtl_allocateMemory( Size() )); } else aInst = *pInst; diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx index 07b914c12ab6..782076250297 100644 --- a/rsc/source/res/rscrange.cxx +++ b/rsc/source/res/rscrange.cxx @@ -90,7 +90,7 @@ RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt, if( !pInst ) { aInst.pClass = this; - aInst.pData = (CLASS_DATA)rtl_allocateMemory( sizeof( RscRangeInst ) ); + aInst.pData = static_cast(rtl_allocateMemory( sizeof( RscRangeInst ) )); } else aInst = *pInst; @@ -202,7 +202,7 @@ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt, if( !pInst ) { aInst.pClass = this; - aInst.pData = (CLASS_DATA) rtl_allocateMemory( sizeof( RscLongRangeInst ) ); + aInst.pData = static_cast(rtl_allocateMemory( sizeof( RscLongRangeInst ) )); } else aInst = *pInst; @@ -278,7 +278,7 @@ RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnCla if( !pInst ) { aInst.pClass = this; - aInst.pData = (CLASS_DATA)rtl_allocateMemory( sizeof( RscId ) ); + aInst.pData = static_cast(rtl_allocateMemory( sizeof( RscId ) )); } else aInst = *pInst; diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx index 3dbb9e308c0d..2e7ffee915c8 100644 --- a/rsc/source/res/rscstr.cxx +++ b/rsc/source/res/rscstr.cxx @@ -59,7 +59,7 @@ ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ) if( pStr ) { sal_uInt32 nLen = strlen( pStr ) +1; - pTmp = (char *)rtl_allocateMemory( nLen ); + pTmp = static_cast(rtl_allocateMemory( nLen )); memcpy( pTmp, pStr, nLen ); } @@ -102,8 +102,8 @@ RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt, if( !pInst ) { aInst.pClass = this; - aInst.pData = (CLASS_DATA) - rtl_allocateMemory( sizeof( RscStringInst ) ); + aInst.pData = static_cast( + rtl_allocateMemory( sizeof( RscStringInst ) )); } else aInst = *pInst; diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index ed4b4470b603..7ee853254c77 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -91,7 +91,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) pEH->FatalError( ERR_OPENFILE, RscId(), pStr ); /* check the inputted switches */ - ppStr = (char **)aCmdLine.GetBlock(); + ppStr = reinterpret_cast(aCmdLine.GetBlock()); ppStr++; i = 1; while( ppStr && i < (aCmdLine.GetCount() -1) ) diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx index 38f0ec6db52f..e216c13c09e5 100644 --- a/rsc/source/tools/rscchar.cxx +++ b/rsc/source/tools/rscchar.cxx @@ -151,7 +151,7 @@ char * RscChar::MakeUTF8( char * pStr, sal_uInt16 nTextEncoding ) hConv = rtl_createUnicodeToTextConverter( RTL_TEXTENCODING_UTF8 ); // factor of 6 is the maximum size of an UNICODE character as utf8 - char * pUtf8 = (char *)rtl_allocateMemory( nUniSize * 6 ); + char * pUtf8 = static_cast(rtl_allocateMemory( nUniSize * 6 )); rtl_convertUnicodeToText( hConv, 0, pUniCode, nUniSize, pUtf8, nUniSize * 6, diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index 3fa4bdda9f8b..7b25510c8f7c 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.cxx @@ -74,7 +74,7 @@ int rsc_stricmp( const char *string1, const char *string2 ){ char* rsc_strdup( const char* pStr ) { int nLen = strlen( pStr ); - char* pBuffer = (char*)rtl_allocateMemory( nLen+1 ); + char* pBuffer = static_cast(rtl_allocateMemory( nLen+1 )); memcpy( pBuffer, pStr, nLen+1 ); return pBuffer; } @@ -222,11 +222,11 @@ void RscPtrPtr :: Reset() sal_uInt32 RscPtrPtr :: Append( void * pBuffer ) { if( !pMem ) - pMem = (void **)rtl_allocateMemory( (nCount +1) * sizeof( void * ) ); + pMem = static_cast(rtl_allocateMemory( (nCount +1) * sizeof( void * ) )); else - pMem = (void **)rtl_reallocateMemory( (void *)pMem, + pMem = static_cast(rtl_reallocateMemory( (void *)pMem, ((nCount +1) * sizeof( void * ) - ) ); + ) )); pMem[ nCount ] = pBuffer; return nCount++; } @@ -267,7 +267,7 @@ sal_uInt32 RscWriteRc :: IncSize( sal_uInt32 nSize ) sal_uInt32 nOrigPos = nLen; nLen += nSize; if( pMem ) - pMem = (char*)rtl_reallocateMemory( pMem, nLen ); + pMem = static_cast(rtl_reallocateMemory( pMem, nLen )); if( pMem ) memset( pMem + nOrigPos, 0, nSize ); return nOrigPos; @@ -277,7 +277,7 @@ char * RscWriteRc :: GetPointer( sal_uInt32 nSize ) { if( !pMem ) { - pMem = (char *)rtl_allocateMemory( nLen ); + pMem = static_cast(rtl_allocateMemory( nLen )); memset( pMem, 0, nLen ); } return pMem + nSize; diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx index 98ae17595bf4..c72c77f8d5e6 100644 --- a/rsc/source/tools/rsctree.cxx +++ b/rsc/source/tools/rsctree.cxx @@ -343,9 +343,9 @@ COMPARE IdNode::Compare( const NameNode * pSearch ) const // pSearch ist ein Zeiger auf sal_uInt32 COMPARE IdNode::Compare( const void * pSearch ) const { - if( GetId() < *((const sal_uInt32 *)pSearch) ) + if( GetId() < *static_cast(pSearch) ) return LESS; - else if( GetId() > *((const sal_uInt32 *)pSearch) ) + else if( GetId() > *static_cast(pSearch) ) return GREATER; else return EQUAL; @@ -376,7 +376,7 @@ COMPARE StringNode::Compare( const NameNode * pSearch ) const // pSearch ist ein Zeiger auf const char * COMPARE StringNode::Compare( const void * pSearch ) const { - int nCmp = strcmp( m_aName.getStr(), (const char *)pSearch ); + int nCmp = strcmp( m_aName.getStr(), static_cast(pSearch) ); if( nCmp < 0 ) return LESS; -- cgit