diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-17 18:50:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-20 09:06:49 +0100 |
| commit | 8b2cf9099a6509594df874f951f527ae5c35c421 (patch) | |
| tree | d875cfd5b4fcef9f486b5d63759fa816df7ef379 /oox | |
| parent | 35ce36b713d4b17f7768c6d471a2ee5825af37da (diff) | |
Some more loplugin:cstylecast: oox
Change-Id: If2f8b9ff2577f2c8e9f15d1f174d50e5254fe7d8
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/core/binarycodec.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx index 25f367afcb85..84d5c737bd1e 100644 --- a/oox/source/core/binarycodec.cxx +++ b/oox/source/core/binarycodec.cxx @@ -193,7 +193,7 @@ bool BinaryCodec_XOR::initCodec( const uno::Sequence< beans::NamedValue >& aData uno::Sequence< beans::NamedValue > BinaryCodec_XOR::getEncryptionData() { ::comphelper::SequenceAsHashMap aHashData; - aHashData[ OUString("XOR95EncryptionKey") ] <<= uno::Sequence<sal_Int8>( (sal_Int8*)mpnKey, 16 ); + aHashData[ OUString("XOR95EncryptionKey") ] <<= uno::Sequence<sal_Int8>( reinterpret_cast<sal_Int8*>(mpnKey), 16 ); aHashData[ OUString("XOR95BaseKey") ] <<= (sal_Int16)mnBaseKey; aHashData[ OUString("XOR95PasswordHash") ] <<= (sal_Int16)mnHash; @@ -302,19 +302,19 @@ bool BinaryCodec_RCF::initCodec( const uno::Sequence< beans::NamedValue >& aData uno::Sequence< beans::NamedValue > BinaryCodec_RCF::getEncryptionData() { ::comphelper::SequenceAsHashMap aHashData; - aHashData[ OUString("STD97EncryptionKey") ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)mpnDigestValue, RTL_DIGEST_LENGTH_MD5 ); - aHashData[ OUString("STD97UniqueID") ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)mpnUnique, 16 ); + aHashData[ OUString("STD97EncryptionKey") ] <<= uno::Sequence< sal_Int8 >( reinterpret_cast<sal_Int8*>(mpnDigestValue), RTL_DIGEST_LENGTH_MD5 ); + aHashData[ OUString("STD97UniqueID") ] <<= uno::Sequence< sal_Int8 >( reinterpret_cast<sal_Int8*>(mpnUnique), 16 ); return aHashData.getAsConstNamedValueList(); } void BinaryCodec_RCF::initKey( const sal_uInt16 pnPassData[ 16 ], const sal_uInt8 pnSalt[ 16 ] ) { - uno::Sequence< sal_Int8 > aKey = ::comphelper::DocPasswordHelper::GenerateStd97Key( pnPassData, uno::Sequence< sal_Int8 >( (sal_Int8*)pnSalt, 16 ) ); + uno::Sequence< sal_Int8 > aKey = ::comphelper::DocPasswordHelper::GenerateStd97Key( pnPassData, uno::Sequence< sal_Int8 >( reinterpret_cast<sal_Int8 const *>(pnSalt), 16 ) ); // Fill raw digest of above updates into DigestValue. if ( aKey.getLength() == sizeof(mpnDigestValue) ) - (void)memcpy ( mpnDigestValue, (const sal_uInt8*)aKey.getConstArray(), sizeof(mpnDigestValue) ); + (void)memcpy ( mpnDigestValue, aKey.getConstArray(), sizeof(mpnDigestValue) ); else memset( mpnDigestValue, 0, sizeof(mpnDigestValue) ); |