diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-31 13:15:11 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-31 13:15:11 +0200 |
commit | 58be5b0ac6d21bc81f3ad4243169ea6dec0dcb81 (patch) | |
tree | e9a50f24d0fcf1dd682fc51842c0287b760a3a4b /oox | |
parent | 693002e16cca1b37ae8f8841bf7ef24e4c1d6408 (diff) |
Reduce to static_cast any reinterpret_cast from void pointers
Change-Id: I440205a15ab8edc7f7ec630cb7c1b93e7be6b396
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/helper/binaryinputstream.cxx | 2 | ||||
-rw-r--r-- | oox/source/helper/binaryoutputstream.cxx | 2 | ||||
-rw-r--r-- | oox/source/ole/vbainputstream.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx index 3c41921beb37..61677a1d1725 100644 --- a/oox/source/helper/binaryinputstream.cxx +++ b/oox/source/helper/binaryinputstream.cxx @@ -174,7 +174,7 @@ sal_Int32 BinaryXInputStream::readMemory( void* opMem, sal_Int32 nBytes, size_t if( !mbEof && (nBytes > 0) ) { sal_Int32 nBufferSize = getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, INPUTSTREAM_BUFFERSIZE ); - sal_uInt8* opnMem = reinterpret_cast< sal_uInt8* >( opMem ); + sal_uInt8* opnMem = static_cast< sal_uInt8* >( opMem ); while( !mbEof && (nBytes > 0) ) { sal_Int32 nReadSize = getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, nBufferSize ); diff --git a/oox/source/helper/binaryoutputstream.cxx b/oox/source/helper/binaryoutputstream.cxx index fcd21e07ddfb..c5b8daf48e67 100644 --- a/oox/source/helper/binaryoutputstream.cxx +++ b/oox/source/helper/binaryoutputstream.cxx @@ -85,7 +85,7 @@ void BinaryXOutputStream::writeMemory( const void* pMem, sal_Int32 nBytes, size_ if( mxOutStrm.is() && (nBytes > 0) ) { sal_Int32 nBufferSize = getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, (OUTPUTSTREAM_BUFFERSIZE / nAtomSize) * nAtomSize ); - const sal_uInt8* pnMem = reinterpret_cast< const sal_uInt8* >( pMem ); + const sal_uInt8* pnMem = static_cast< const sal_uInt8* >( pMem ); while( nBytes > 0 ) { sal_Int32 nWriteSize = getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, nBufferSize ); diff --git a/oox/source/ole/vbainputstream.cxx b/oox/source/ole/vbainputstream.cxx index bd19460340ed..c8b6242e8843 100644 --- a/oox/source/ole/vbainputstream.cxx +++ b/oox/source/ole/vbainputstream.cxx @@ -85,7 +85,7 @@ sal_Int32 VbaInputStream::readData( StreamDataSequence& orData, sal_Int32 nBytes sal_Int32 VbaInputStream::readMemory( void* opMem, sal_Int32 nBytes, size_t /*nAtomSize*/ ) { sal_Int32 nRet = 0; - sal_uInt8* opnMem = reinterpret_cast< sal_uInt8* >( opMem ); + sal_uInt8* opnMem = static_cast< sal_uInt8* >( opMem ); while( (nBytes > 0) && updateChunk() ) { sal_Int32 nChunkLeft = static_cast< sal_Int32 >( maChunk.size() - mnChunkPos ); |