diff options
Diffstat (limited to 'rsc/source/parser')
-rw-r--r-- | rsc/source/parser/rsckey.cxx | 12 | ||||
-rw-r--r-- | rsc/source/parser/rscpar.cxx | 6 | ||||
-rw-r--r-- | rsc/source/parser/rscyacc.y | 2 |
3 files changed, 10 insertions, 10 deletions
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<KEY_STRUCT const *>(pFirst)->nName > static_cast<KEY_STRUCT const *>(pSecond)->nName ) return 1; - else if( ((KEY_STRUCT *)pFirst)->nName < ((KEY_STRUCT *)pSecond)->nName ) + else if( static_cast<KEY_STRUCT const *>(pFirst)->nName < static_cast<KEY_STRUCT const *>(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<KEY_STRUCT *>( rtl_reallocateMemory( (void *)pTable, - ((nEntries +1) * sizeof( KEY_STRUCT )) ); + ((nEntries +1) * sizeof( KEY_STRUCT )) )); else - pTable = (KEY_STRUCT *) + pTable = static_cast<KEY_STRUCT *>( 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<char *>(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<char *>(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<char*>(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<char*>(pStringContainer->putString( aBuf.getStr() )); } ; |