diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-17 18:50:39 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-20 09:06:50 +0100 |
commit | 00173d8c3a17f9dc00ead78392812a98397cf277 (patch) | |
tree | 05f4e44e3883295fa0aa33672e39efd41d0100b0 /package/source/zipapi | |
parent | 4d78f348f904a08db52e9f063a230b31bcc2e07f (diff) |
Some more loplugin:cstylecast: package
Change-Id: Icf7351082cf63aeb70ec47a8562a89d452ae9d8e
Diffstat (limited to 'package/source/zipapi')
-rw-r--r-- | package/source/zipapi/Deflater.cxx | 4 | ||||
-rw-r--r-- | package/source/zipapi/Inflater.cxx | 2 | ||||
-rw-r--r-- | package/source/zipapi/ZipFile.cxx | 10 | ||||
-rw-r--r-- | package/source/zipapi/ZipOutputStream.cxx | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index 70fe26dde107..9ff3e7d5d1b8 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -70,8 +70,8 @@ Deflater::Deflater(sal_Int32 nSetLevel, bool bNowrap) sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength) { sal_Int32 nResult; - pStream->next_in = (unsigned char*) sInBuffer.getConstArray() + nOffset; - pStream->next_out = (unsigned char*) rBuffer.getArray()+nNewOffset; + pStream->next_in = reinterpret_cast<unsigned char*>(sInBuffer.getArray()) + nOffset; + pStream->next_out = reinterpret_cast<unsigned char*>(rBuffer.getArray())+nNewOffset; pStream->avail_in = nLength; pStream->avail_out = nNewLength; diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx index a9e372c860cf..17a83fa59868 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/zipapi/Inflater.cxx @@ -102,7 +102,7 @@ sal_Int32 Inflater::doInflateBytes (Sequence < sal_Int8 > &rBuffer, sal_Int32 n nLastInflateError = 0; - pStream->next_in = ( unsigned char* ) ( sInBuffer.getConstArray() + nOffset ); + pStream->next_in = reinterpret_cast<unsigned char*>( sInBuffer.getArray() + nOffset ); pStream->avail_in = nLength; pStream->next_out = reinterpret_cast < unsigned char* > ( rBuffer.getArray() + nNewOffset ); pStream->avail_out = nNewLength; diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index ad35ea24d6de..f595803f6737 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -365,7 +365,7 @@ bool ZipFile::StaticFillData ( ::rtl::Reference< BaseEncryptionData > & rData, if ( nMediaTypeLength == rStream->readBytes ( aBuffer, nMediaTypeLength ) ) { - aMediaType = OUString( (sal_Unicode*)aBuffer.getConstArray(), + aMediaType = OUString( reinterpret_cast<sal_Unicode const *>(aBuffer.getConstArray()), nMediaTypeLength / sizeof( sal_Unicode ) ); bOk = true; } @@ -672,7 +672,7 @@ bool ZipFile::readLOC( ZipEntry &rEntry ) if (nRead < aNameBuffer.getLength()) aNameBuffer.realloc(nRead); - OUString sLOCPath = OUString::intern( (sal_Char *) aNameBuffer.getArray(), + OUString sLOCPath = OUString::intern( reinterpret_cast<char *>(aNameBuffer.getArray()), aNameBuffer.getLength(), RTL_TEXTENCODING_UTF8 ); @@ -845,7 +845,7 @@ sal_Int32 ZipFile::readCEN() throw ZipException("unexpected extra header info length" ); // read always in UTF8, some tools seem not to set UTF8 bit - aEntry.sPath = OUString::intern ( (sal_Char *) aMemGrabber.getCurrentPos(), + aEntry.sPath = OUString::intern ( reinterpret_cast<char const *>(aMemGrabber.getCurrentPos()), aEntry.nPathLen, RTL_TEXTENCODING_UTF8 ); @@ -935,7 +935,7 @@ sal_Int32 ZipFile::recover() { // read always in UTF8, some tools seem not to set UTF8 bit if( nPos + 30 + aEntry.nPathLen <= nBufSize ) - aEntry.sPath = OUString ( (sal_Char *) &pBuffer[nPos + 30], + aEntry.sPath = OUString ( reinterpret_cast<char const *>(&pBuffer[nPos + 30]), aEntry.nPathLen, RTL_TEXTENCODING_UTF8 ); else @@ -943,7 +943,7 @@ sal_Int32 ZipFile::recover() Sequence < sal_Int8 > aFileName; aGrabber.seek( nGenPos + nPos + 30 ); aGrabber.readBytes( aFileName, aEntry.nPathLen ); - aEntry.sPath = OUString ( (sal_Char *) aFileName.getArray(), + aEntry.sPath = OUString ( reinterpret_cast<char *>(aFileName.getArray()), aFileName.getLength(), RTL_TEXTENCODING_UTF8 ); aEntry.nPathLen = static_cast< sal_Int16 >(aFileName.getLength()); diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx index 518058ec1de3..7cf7074548f5 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/zipapi/ZipOutputStream.cxx @@ -198,7 +198,7 @@ void ZipOutputStream::writeCEN( const ZipEntry &rEntry ) throw IOException( "File contains streams that are too large." ); } - Sequence < sal_Int8 > aSequence( (sal_Int8*)sUTF8Name.getStr(), sUTF8Name.getLength() ); + Sequence < sal_Int8 > aSequence( reinterpret_cast<sal_Int8 const *>(sUTF8Name.getStr()), sUTF8Name.getLength() ); m_aChucker.WriteBytes( aSequence ); } @@ -271,7 +271,7 @@ void ZipOutputStream::writeLOC( ZipEntry *pEntry, bool bEncrypt ) throw IOException( "File contains streams that are too large." ); } - Sequence < sal_Int8 > aSequence( (sal_Int8*)sUTF8Name.getStr(), sUTF8Name.getLength() ); + Sequence < sal_Int8 > aSequence( reinterpret_cast<sal_Int8 const *>(sUTF8Name.getStr()), sUTF8Name.getLength() ); m_aChucker.WriteBytes( aSequence ); m_pCurrentEntry->nOffset = m_aChucker.GetPosition() - (LOCHDR + nNameLength); |