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

loplugin:cstylecast: deal with remaining pointer casts

Change-Id: I1666375abb72566e71804ac82b22d3a5ea590b78
üst fa0149a4
...@@ -80,7 +80,7 @@ bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt ...@@ -80,7 +80,7 @@ bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt
aNew >>= aSeq; aNew >>= aSeq;
if ( aSeq.getLength() == 16 ) if ( aSeq.getLength() == 16 )
{ {
m_aName.MakeFromMemory( (void*) aSeq.getConstArray() ); m_aName.MakeFromMemory( const_cast<sal_Int8 *>(aSeq.getConstArray()) );
return true; return true;
} }
...@@ -92,7 +92,7 @@ bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt ...@@ -92,7 +92,7 @@ bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt
bool SfxGlobalNameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const bool SfxGlobalNameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const
{ {
com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 ); com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 );
void* pData = ( void* ) &m_aName.GetCLSID(); void const * pData = &m_aName.GetCLSID();
memcpy( aSeq.getArray(), pData, 16 ); memcpy( aSeq.getArray(), pData, 16 );
rVal <<= aSeq; rVal <<= aSeq;
return true; return true;
......
...@@ -1634,7 +1634,7 @@ void SfxItemSet::dumpAsXml(xmlTextWriterPtr pWriter) const ...@@ -1634,7 +1634,7 @@ void SfxItemSet::dumpAsXml(xmlTextWriterPtr pWriter) const
// ----------------------------------------------- class SfxAllItemSet // ----------------------------------------------- class SfxAllItemSet
SfxAllItemSet::SfxAllItemSet( SfxItemPool &rPool ) SfxAllItemSet::SfxAllItemSet( SfxItemPool &rPool )
: SfxItemSet(rPool, (const sal_uInt16*) 0), : SfxItemSet(rPool, nullptr),
aDefault(0), aDefault(0),
nFree(nInitCount) nFree(nInitCount)
{ {
...@@ -1707,11 +1707,11 @@ static SfxItemArray AddItem_Impl(SfxItemArray pItems, sal_uInt16 nOldSize, sal_u ...@@ -1707,11 +1707,11 @@ static SfxItemArray AddItem_Impl(SfxItemArray pItems, sal_uInt16 nOldSize, sal_u
{ {
// Copy all Items before nPos // Copy all Items before nPos
if ( nPos ) if ( nPos )
memcpy( (void*) pNew, pItems, nPos * sizeof(SfxPoolItem *) ); memcpy( static_cast<void*>(pNew), pItems, nPos * sizeof(SfxPoolItem *) );
// Copy all Items after nPos // Copy all Items after nPos
if ( nPos < nOldSize ) if ( nPos < nOldSize )
memcpy( (void*) (pNew + nPos + 1), pItems + nPos, memcpy( static_cast<void*>(pNew + nPos + 1), pItems + nPos,
(nOldSize-nPos) * sizeof(SfxPoolItem *) ); (nOldSize-nPos) * sizeof(SfxPoolItem *) );
} }
......
...@@ -121,7 +121,7 @@ bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ...@@ -121,7 +121,7 @@ bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8
if ( aSeq.getLength() ) if ( aSeq.getLength() )
{ {
SvMemoryStream* pStream = new SvMemoryStream(); SvMemoryStream* pStream = new SvMemoryStream();
pStream->Write( (void*)aSeq.getConstArray(), aSeq.getLength() ); pStream->Write( aSeq.getConstArray(), aSeq.getLength() );
pStream->Seek(0); pStream->Seek(0);
_xVal = new SvLockBytes( pStream, true ); _xVal = new SvLockBytes( pStream, true );
......
...@@ -326,7 +326,7 @@ Color* SvNumberFormatter::GetUserDefColor(sal_uInt16 nIndex) ...@@ -326,7 +326,7 @@ Color* SvNumberFormatter::GetUserDefColor(sal_uInt16 nIndex)
{ {
if( aColorLink.IsSet() ) if( aColorLink.IsSet() )
{ {
return reinterpret_cast<Color*>( aColorLink.Call( (void*) &nIndex )) ; return reinterpret_cast<Color*>( aColorLink.Call( static_cast<void*>(&nIndex) )) ;
} }
else else
{ {
......
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