diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:28:28 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:28:28 +0200 |
commit | 58f60b5108c584aa44f353f2fcbd07b81d474e48 (patch) | |
tree | 116406e44da2b874263e5e25ac558e5b2ce54b6f /svl | |
parent | fa0149a4b8a7772c313bb9d136364082545538a9 (diff) |
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I1666375abb72566e71804ac82b22d3a5ea590b78
Diffstat (limited to 'svl')
-rw-r--r-- | svl/source/items/globalnameitem.cxx | 4 | ||||
-rw-r--r-- | svl/source/items/itemset.cxx | 6 | ||||
-rw-r--r-- | svl/source/items/lckbitem.cxx | 2 | ||||
-rw-r--r-- | svl/source/numbers/zforlist.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 6e1f5ff8a043..1c02c1d4933b 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -80,7 +80,7 @@ bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt aNew >>= aSeq; if ( aSeq.getLength() == 16 ) { - m_aName.MakeFromMemory( (void*) aSeq.getConstArray() ); + m_aName.MakeFromMemory( const_cast<sal_Int8 *>(aSeq.getConstArray()) ); return true; } @@ -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 { 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 ); rVal <<= aSeq; return true; diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 48627064aca9..301bafc2bfab 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -1634,7 +1634,7 @@ void SfxItemSet::dumpAsXml(xmlTextWriterPtr pWriter) const // ----------------------------------------------- class SfxAllItemSet SfxAllItemSet::SfxAllItemSet( SfxItemPool &rPool ) -: SfxItemSet(rPool, (const sal_uInt16*) 0), +: SfxItemSet(rPool, nullptr), aDefault(0), nFree(nInitCount) { @@ -1707,11 +1707,11 @@ static SfxItemArray AddItem_Impl(SfxItemArray pItems, sal_uInt16 nOldSize, sal_u { // Copy all Items before nPos if ( nPos ) - memcpy( (void*) pNew, pItems, nPos * sizeof(SfxPoolItem *) ); + memcpy( static_cast<void*>(pNew), pItems, nPos * sizeof(SfxPoolItem *) ); // Copy all Items after nPos if ( nPos < nOldSize ) - memcpy( (void*) (pNew + nPos + 1), pItems + nPos, + memcpy( static_cast<void*>(pNew + nPos + 1), pItems + nPos, (nOldSize-nPos) * sizeof(SfxPoolItem *) ); } diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index bb7bb89a9fa4..169219f416d4 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -121,7 +121,7 @@ bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 if ( aSeq.getLength() ) { SvMemoryStream* pStream = new SvMemoryStream(); - pStream->Write( (void*)aSeq.getConstArray(), aSeq.getLength() ); + pStream->Write( aSeq.getConstArray(), aSeq.getLength() ); pStream->Seek(0); _xVal = new SvLockBytes( pStream, true ); diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index d17954ec99cf..19c5d95fa436 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -326,7 +326,7 @@ Color* SvNumberFormatter::GetUserDefColor(sal_uInt16 nIndex) { if( aColorLink.IsSet() ) { - return reinterpret_cast<Color*>( aColorLink.Call( (void*) &nIndex )) ; + return reinterpret_cast<Color*>( aColorLink.Call( static_cast<void*>(&nIndex) )) ; } else { |