Kaydet (Commit) bbaa7def authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Reduce to static_cast any reinterpret_cast from void pointers

Change-Id: I985ccd5f852d10e5565e2a90f094fb0242bb0265
üst aa69a97c
...@@ -217,7 +217,7 @@ sal_Size XclExpStream::Write( const void* pData, sal_Size nBytes ) ...@@ -217,7 +217,7 @@ sal_Size XclExpStream::Write( const void* pData, sal_Size nBytes )
{ {
if( mbInRec ) if( mbInRec )
{ {
const sal_uInt8* pBuffer = reinterpret_cast< const sal_uInt8* >( pData ); const sal_uInt8* pBuffer = static_cast< const sal_uInt8* >( pData );
sal_Size nBytesLeft = nBytes; sal_Size nBytesLeft = nBytes;
bool bValid = true; bool bValid = true;
......
...@@ -3526,7 +3526,7 @@ SdrObject* XclImpDffConverter::ProcessObj( SvStream& rDffStrm, DffObjData& rDffO ...@@ -3526,7 +3526,7 @@ SdrObject* XclImpDffConverter::ProcessObj( SvStream& rDffStrm, DffObjData& rDffO
/* Pass pointer to top-level object back to caller. If the processed /* Pass pointer to top-level object back to caller. If the processed
object is embedded in a group, the pointer is already set to the object is embedded in a group, the pointer is already set to the
top-level parent object. */ top-level parent object. */
XclImpDrawObjBase** ppTopLevelObj = reinterpret_cast< XclImpDrawObjBase** >( pClientData ); XclImpDrawObjBase** ppTopLevelObj = static_cast< XclImpDrawObjBase** >( pClientData );
bool bIsTopLevel = !ppTopLevelObj || !*ppTopLevelObj; bool bIsTopLevel = !ppTopLevelObj || !*ppTopLevelObj;
if( ppTopLevelObj && bIsTopLevel ) if( ppTopLevelObj && bIsTopLevel )
*ppTopLevelObj = xDrawObj.get(); *ppTopLevelObj = xDrawObj.get();
......
...@@ -94,7 +94,7 @@ sal_uInt16 XclImpDecrypter::Read( SvStream& rStrm, void* pData, sal_uInt16 nByte ...@@ -94,7 +94,7 @@ sal_uInt16 XclImpDecrypter::Read( SvStream& rStrm, void* pData, sal_uInt16 nByte
if( IsValid() ) if( IsValid() )
{ {
Update( rStrm, mnRecSize ); Update( rStrm, mnRecSize );
nRet = OnRead( rStrm, reinterpret_cast< sal_uInt8* >( pData ), nBytes ); nRet = OnRead( rStrm, static_cast< sal_uInt8* >( pData ), nBytes );
mnOldPos = rStrm.Tell(); mnOldPos = rStrm.Tell();
} }
else else
...@@ -699,7 +699,7 @@ sal_Size XclImpStream::Read( void* pData, sal_Size nBytes ) ...@@ -699,7 +699,7 @@ sal_Size XclImpStream::Read( void* pData, sal_Size nBytes )
sal_Size nRet = 0; sal_Size nRet = 0;
if( mbValid && pData && (nBytes > 0) ) if( mbValid && pData && (nBytes > 0) )
{ {
sal_uInt8* pnBuffer = reinterpret_cast< sal_uInt8* >( pData ); sal_uInt8* pnBuffer = static_cast< sal_uInt8* >( pData );
sal_Size nBytesLeft = nBytes; sal_Size nBytesLeft = nBytes;
while( mbValid && (nBytesLeft > 0) ) while( mbValid && (nBytesLeft > 0) )
......
...@@ -276,7 +276,7 @@ sal_Int32 BiffInputStream::readMemory( void* opMem, sal_Int32 nBytes, size_t nAt ...@@ -276,7 +276,7 @@ sal_Int32 BiffInputStream::readMemory( void* opMem, sal_Int32 nBytes, size_t nAt
sal_Int32 nRet = 0; sal_Int32 nRet = 0;
if( !mbEof && opMem && (nBytes > 0) ) if( !mbEof && opMem && (nBytes > 0) )
{ {
sal_uInt8* pnBuffer = reinterpret_cast< sal_uInt8* >( opMem ); sal_uInt8* pnBuffer = static_cast< sal_uInt8* >( opMem );
sal_Int32 nBytesLeft = nBytes; sal_Int32 nBytesLeft = nBytes;
while( !mbEof && (nBytesLeft > 0) ) while( !mbEof && (nBytesLeft > 0) )
......
...@@ -129,7 +129,7 @@ void ScCalcOptionsDialog::SelectedDeviceChanged() ...@@ -129,7 +129,7 @@ void ScCalcOptionsDialog::SelectedDeviceChanged()
if(!pEntry) if(!pEntry)
return; return;
OpenCLDeviceInfo* pInfo = reinterpret_cast<OpenCLDeviceInfo*>(pEntry->GetUserData()); OpenCLDeviceInfo* pInfo = static_cast<OpenCLDeviceInfo*>(pEntry->GetUserData());
if(pInfo) if(pInfo)
{ {
mpFtFrequency->SetText(OUString::number(pInfo->mnFrequency)); mpFtFrequency->SetText(OUString::number(pInfo->mnFrequency));
......
This diff is collapsed.
...@@ -189,7 +189,7 @@ namespace ...@@ -189,7 +189,7 @@ namespace
{ {
sal_IntPtr DelayDeleteAbstractDialog( void *pAbstractDialog, void * /*pArg*/ ) sal_IntPtr DelayDeleteAbstractDialog( void *pAbstractDialog, void * /*pArg*/ )
{ {
delete reinterpret_cast<SfxAbstractTabDialog*>( pAbstractDialog ); delete static_cast<SfxAbstractTabDialog*>( pAbstractDialog );
return 0; return 0;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment