summaryrefslogtreecommitdiff
path: root/vcl/source/gdi
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-01-19 15:10:10 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-01-20 09:06:54 +0100
commitfe9d002ef55e30aa3629f4e1951beb18ebb692b0 (patch)
tree1c72b3d97c34801d23ab1d9509aa56081e4d401f /vcl/source/gdi
parentf6cfe99d22041061b8042cdab05e57180c0ab70a (diff)
Some more loplugin:cstylecast: vcl
Change-Id: I74d35630b9fcdaa97af0b1f1e6d1e5c72488964d
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r--vcl/source/gdi/bitmap.cxx2
-rw-r--r--vcl/source/gdi/bitmap3.cxx2
-rw-r--r--vcl/source/gdi/bitmap4.cxx24
-rw-r--r--vcl/source/gdi/bmpacc.cxx2
-rw-r--r--vcl/source/gdi/cvtsvm.cxx2
-rw-r--r--vcl/source/gdi/dibtools.cxx14
-rw-r--r--vcl/source/gdi/embeddedfontshelper.cxx2
-rw-r--r--vcl/source/gdi/gdimtf.cxx2
-rw-r--r--vcl/source/gdi/gfxlink.cxx2
-rw-r--r--vcl/source/gdi/impvect.cxx6
-rw-r--r--vcl/source/gdi/jobset.cxx12
-rw-r--r--vcl/source/gdi/mapmod.cxx4
-rw-r--r--vcl/source/gdi/octree.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx8
-rw-r--r--vcl/source/gdi/svgdata.cxx2
15 files changed, 43 insertions, 43 deletions
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 050eaa5ea18f..5a8bad6f341f 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -1701,7 +1701,7 @@ bool Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColors,
memset( pTols, 0, nColorCount * sizeof( long ) );
}
else
- pTols = (long*) _pTols;
+ pTols = reinterpret_cast<long*>(_pTols);
for( i = 0UL; i < nColorCount; i++ )
{
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 211516045adb..83ce47fff5b0 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -2247,7 +2247,7 @@ bool Bitmap::ImplReduceMedian( sal_uInt16 nColCount )
const long nHeight = pWAcc->Height();
long nIndex = 0L;
- memset( (HPBYTE) pColBuf, 0, nSize );
+ memset( pColBuf, 0, nSize );
// create Buffer
if( pRAcc->HasPalette() )
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index 32ca3cc4412d..a18b9c26b71e 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -127,9 +127,9 @@ bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
const long nHeight = pWriteAcc->Height(), nHeight2 = nHeight + 2;
long* pColm = new long[ nWidth2 ];
long* pRows = new long[ nHeight2 ];
- BitmapColor* pColRow1 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
- BitmapColor* pColRow2 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
- BitmapColor* pColRow3 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
+ BitmapColor* pColRow1 = reinterpret_cast<BitmapColor*>(new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ]);
+ BitmapColor* pColRow2 = reinterpret_cast<BitmapColor*>(new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ]);
+ BitmapColor* pColRow3 = reinterpret_cast<BitmapColor*>(new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ]);
BitmapColor* pRowTmp1 = pColRow1;
BitmapColor* pRowTmp2 = pColRow2;
BitmapColor* pRowTmp3 = pColRow3;
@@ -228,9 +228,9 @@ bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
}
delete[] pKoeff;
- delete[] (sal_uInt8*) pColRow1;
- delete[] (sal_uInt8*) pColRow2;
- delete[] (sal_uInt8*) pColRow3;
+ delete[] reinterpret_cast<sal_uInt8*>(pColRow1);
+ delete[] reinterpret_cast<sal_uInt8*>(pColRow2);
+ delete[] reinterpret_cast<sal_uInt8*>(pColRow3);
delete[] pColm;
delete[] pRows;
@@ -272,9 +272,9 @@ bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Lin
const long nHeight = pWriteAcc->Height(), nHeight2 = nHeight + 2;
long* pColm = new long[ nWidth2 ];
long* pRows = new long[ nHeight2 ];
- BitmapColor* pColRow1 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
- BitmapColor* pColRow2 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
- BitmapColor* pColRow3 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
+ BitmapColor* pColRow1 = reinterpret_cast<BitmapColor*>(new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ]);
+ BitmapColor* pColRow2 = reinterpret_cast<BitmapColor*>(new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ]);
+ BitmapColor* pColRow3 = reinterpret_cast<BitmapColor*>(new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ]);
BitmapColor* pRowTmp1 = pColRow1;
BitmapColor* pRowTmp2 = pColRow2;
BitmapColor* pRowTmp3 = pColRow3;
@@ -357,9 +357,9 @@ bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Lin
}
}
- delete[] (sal_uInt8*) pColRow1;
- delete[] (sal_uInt8*) pColRow2;
- delete[] (sal_uInt8*) pColRow3;
+ delete[] reinterpret_cast<sal_uInt8*>(pColRow1);
+ delete[] reinterpret_cast<sal_uInt8*>(pColRow2);
+ delete[] reinterpret_cast<sal_uInt8*>(pColRow3);
delete[] pColm;
delete[] pRows;
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index 9e4994c5dda4..7ad73870f664 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -299,7 +299,7 @@ void BitmapReadAccess::ImplZeroInitUnusedBits()
nMask = OSL_SWAPDWORD( nMask );
#endif
for( sal_uInt32 i = 0; i < nHeight; i++, pLast4Bytes += nScanSize )
- ( *(sal_uInt32*) pLast4Bytes ) &= nMask;
+ *reinterpret_cast<sal_uInt32*>(pLast4Bytes) &= nMask;
}
}
}
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index cf290bbf3c16..9cc2543f0d14 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -457,7 +457,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
sal_Int16 nVersion;
// read header
- rIStm.Read( (char*) &aCode, sizeof( aCode ) ); // Identifier
+ rIStm.Read( aCode, sizeof( aCode ) ); // Identifier
rIStm.ReadInt16( nSize ); // Size
rIStm.ReadInt16( nVersion ); // Version
sal_Int32 nTmp32(0);
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 2e3779865411..1a9eb339aa19 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -611,7 +611,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
for( ; nCount--; nY += nI )
{
- if (rIStm.Read( (char*)( pTmp16 = (sal_uInt16*) pBuf.get() ), nAlignedWidth )
+ if (rIStm.Read( ( pTmp16 = reinterpret_cast<sal_uInt16*>(pBuf.get()) ), nAlignedWidth )
!= nAlignedWidth)
{
return false;
@@ -619,7 +619,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
for( long nX = 0L; nX < nWidth; nX++ )
{
- aMask.GetColorFor16BitLSB( aColor, (sal_uInt8*) pTmp16++ );
+ aMask.GetColorFor16BitLSB( aColor, reinterpret_cast<sal_uInt8*>(pTmp16++) );
rAcc.SetPixel( nY, nX, aColor );
}
}
@@ -662,7 +662,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
for( ; nCount--; nY += nI )
{
- if (rIStm.Read( (char*)( pTmp32 = (sal_uInt32*) pBuf.get() ), nAlignedWidth )
+ if (rIStm.Read( ( pTmp32 = reinterpret_cast<sal_uInt32*>(pBuf.get()) ), nAlignedWidth )
!= nAlignedWidth)
{
return false;
@@ -670,7 +670,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
for( long nX = 0L; nX < nWidth; nX++ )
{
- aMask.GetColorAndAlphaFor32Bit( aColor, aAlpha, (sal_uInt8*) pTmp32++ );
+ aMask.GetColorAndAlphaFor32Bit( aColor, aAlpha, reinterpret_cast<sal_uInt8*>(pTmp32++) );
rAcc.SetPixel( nY, nX, aColor );
pAccAlpha->SetPixelIndex(nY, nX, sal_uInt8(0xff) - aAlpha);
rAlphaUsed |= bool(0xff != aAlpha);
@@ -681,7 +681,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
{
for( ; nCount--; nY += nI )
{
- if (rIStm.Read( (char*)( pTmp32 = (sal_uInt32*) pBuf.get() ), nAlignedWidth )
+ if (rIStm.Read( ( pTmp32 = reinterpret_cast<sal_uInt32*>(pBuf.get()) ), nAlignedWidth )
!= nAlignedWidth)
{
return false;
@@ -689,7 +689,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
for( long nX = 0L; nX < nWidth; nX++ )
{
- aMask.GetColorFor32Bit( aColor, (sal_uInt8*) pTmp32++ );
+ aMask.GetColorFor32Bit( aColor, reinterpret_cast<sal_uInt8*>(pTmp32++) );
rAcc.SetPixel( nY, nX, aColor );
}
}
@@ -793,7 +793,7 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, Bitmap* pBmpAlpha, sal_uLon
// set decoded bytes to memory stream,
// from which we will read the bitmap data
pIStm = pMemStm = new SvMemoryStream;
- pMemStm->SetBuffer( (char*) pData, nUncodedSize, false, nUncodedSize );
+ pMemStm->SetBuffer( pData, nUncodedSize, false, nUncodedSize );
nOffset = 0;
}
else
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx
index 5706022a6bf2..43485d79ab41 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -114,7 +114,7 @@ bool EmbeddedFontsHelper::addEmbeddedFont( uno::Reference< io::XInputStream > st
unsigned char *nakedPointerToUncompressedFont = NULL;
libeot::EOTMetadata eotMetadata;
libeot::EOTError uncompressError =
- libeot::EOT2ttf_buffer( (const unsigned char *)&fontData[0], fontData.size(), &eotMetadata, &nakedPointerToUncompressedFont, &uncompressedFontSize );
+ libeot::EOT2ttf_buffer( reinterpret_cast<unsigned char *>(&fontData[0]), fontData.size(), &eotMetadata, &nakedPointerToUncompressedFont, &uncompressedFontSize );
boost::shared_ptr<unsigned char> uncompressedFont( nakedPointerToUncompressedFont, libeot::EOTfreeBuffer );
if( uncompressError != libeot::EOT_SUCCESS )
{
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 8cf47471b8f3..65b353760563 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -507,7 +507,7 @@ void GDIMetaFile::ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct,
// delay intialization of XGraphic, to only expose
// XGraphic-generating services to arbitrary binary data
uno::Sequence< sal_Int8 > aSeq(
- (sal_Int8*)pData, pEndData-pData );
+ reinterpret_cast<sal_Int8 const *>(pData), pEndData-pData );
uno::Sequence<uno::Any> aGraphicsArgs(1);
aGraphicsArgs[0] = makeAny(aSeq);
xInit->initialize(aGraphicsArgs);
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 1c825bf09cc8..c352b81dfeb7 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -174,7 +174,7 @@ bool GfxLink::LoadNative( Graphic& rGraphic )
SvMemoryStream aMemStm;
sal_uLong nCvtType;
- aMemStm.SetBuffer( (char*) pData, mnBufSize, false, mnBufSize );
+ aMemStm.SetBuffer( const_cast<sal_uInt8*>(pData), mnBufSize, false, mnBufSize );
switch( meType )
{
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 32727c46bdf8..b547380a78d0 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -157,7 +157,7 @@ void ImplPointArray::ImplSetSize( sal_uLong nSize )
rtl_freeMemory( mpArray );
mpArray = (Point*) rtl_allocateMemory( nTotal );
- memset( (HPBYTE) mpArray, 0, nTotal );
+ memset( mpArray, 0, nTotal );
}
inline Point& ImplPointArray::operator[]( sal_uLong nPos )
@@ -646,7 +646,7 @@ bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
const long nHeight = pRAcc->Height();
const sal_uInt16 nColorCount = pRAcc->GetPaletteEntryCount();
sal_uInt16 n;
- ImplColorSet* pColorSet = (ImplColorSet*) new sal_uInt8[ 256 * sizeof( ImplColorSet ) ];
+ ImplColorSet* pColorSet = reinterpret_cast<ImplColorSet*>(new sal_uInt8[ 256 * sizeof( ImplColorSet ) ]);
memset( pColorSet, 0, 256 * sizeof( ImplColorSet ) );
rMtf.Clear();
@@ -707,7 +707,7 @@ bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
VECT_PROGRESS( pProgress, FRound( fPercent += fPercentStep_2 ) );
}
- delete[] (sal_uInt8*) pColorSet;
+ delete[] reinterpret_cast<sal_uInt8*>(pColorSet);
if( rMtf.GetActionSize() )
{
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index f376d14a5262..b37b970b4803 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -232,7 +232,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup )
rIStream.Read( pTempBuf.get(), nLen - sizeof( nLen ) - sizeof( nSystem ) );
if ( nLen >= sizeof(ImplOldJobSetupData)+4 )
{
- ImplOldJobSetupData* pData = (ImplOldJobSetupData*)pTempBuf.get();
+ ImplOldJobSetupData* pData = reinterpret_cast<ImplOldJobSetupData*>(pTempBuf.get());
if ( rJobSetup.mpData )
{
if ( rJobSetup.mpData->mnRefCount == 1 )
@@ -254,7 +254,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup )
if ( nSystem == JOBSET_FILE364_SYSTEM ||
nSystem == JOBSET_FILE605_SYSTEM )
{
- Impl364JobSetupData* pOldJobData = (Impl364JobSetupData*)(pTempBuf.get() + sizeof( ImplOldJobSetupData ));
+ Impl364JobSetupData* pOldJobData = reinterpret_cast<Impl364JobSetupData*>(pTempBuf.get() + sizeof( ImplOldJobSetupData ));
sal_uInt16 nOldJobDataSize = SVBT16ToShort( pOldJobData->nSize );
pJobData->mnSystem = SVBT16ToShort( pOldJobData->nSystem );
pJobData->mnDriverDataLen = SVBT32ToUInt32( pOldJobData->nDriverDataLen );
@@ -266,7 +266,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup )
pJobData->mnPaperHeight = (long)SVBT32ToUInt32( pOldJobData->nPaperHeight );
if ( pJobData->mnDriverDataLen )
{
- sal_uInt8* pDriverData = ((sal_uInt8*)pOldJobData) + nOldJobDataSize;
+ sal_uInt8* pDriverData = reinterpret_cast<sal_uInt8*>(pOldJobData) + nOldJobDataSize;
pJobData->mpDriverData = (sal_uInt8*)rtl_allocateMemory( pJobData->mnDriverDataLen );
memcpy( pJobData->mpDriverData, pDriverData, pJobData->mnDriverDataLen );
}
@@ -339,9 +339,9 @@ SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup )
int nPos = rOStream.Tell();
rOStream.WriteUInt16( nLen );
rOStream.WriteUInt16( nSystem );
- rOStream.Write( (char*)&aOldData, sizeof( aOldData ) );
- rOStream.Write( (char*)&aOldJobData, nOldJobDataSize );
- rOStream.Write( (char*)pJobData->mpDriverData, pJobData->mnDriverDataLen );
+ rOStream.Write( &aOldData, sizeof( aOldData ) );
+ rOStream.Write( &aOldJobData, nOldJobDataSize );
+ rOStream.Write( pJobData->mpDriverData, pJobData->mnDriverDataLen );
std::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it )
{
diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index 2bf14e3fe112..ec568fa38483 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.cxx
@@ -100,9 +100,9 @@ MapMode::ImplMapMode::ImplGetStaticMapMode(MapUnit eUnit)
// #i19496 check for out-of-bounds
if( eUnit >= MAP_LASTENUMDUMMY )
- return (ImplMapMode*)aStaticImplMapModeAry;
+ return reinterpret_cast<ImplMapMode*>(aStaticImplMapModeAry);
- ImplMapMode* pImplMapMode = ((ImplMapMode*)aStaticImplMapModeAry)+eUnit;
+ ImplMapMode* pImplMapMode = reinterpret_cast<ImplMapMode*>(aStaticImplMapModeAry)+eUnit;
if ( !pImplMapMode->mbSimple )
{
Fraction aDefFraction( 1, 1 );
diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index eac0f522fc84..1aac1ef17a97 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -269,7 +269,7 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) :
const long cginc = ( xsqr - ( cGreen << nBits ) ) << 1L;
const long cbinc = ( xsqr - ( cBlue << nBits ) ) << 1L;
- sal_uLong* cdp = (sal_uLong*) pBuffer;
+ sal_uLong* cdp = reinterpret_cast<sal_uLong*>(pBuffer);
sal_uInt8* crgbp = pMap;
for( r = 0, rxx = crinc; r < nColorMax; rdist += rxx, r++, rxx += xsqr2 )
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index a8c127d98927..ad79eb2ec39a 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2052,7 +2052,7 @@ inline void PDFWriterImpl::appendLiteralStringEncrypt( OStringBuffer& rInString,
//encrypt the string in a buffer, then append it
enableStringEncryption( nInObjectNumber );
rtl_cipher_encodeARCFOUR( m_aCipher, rInString.getStr(), nChars, m_pEncryptionBuffer, nChars );
- appendLiteralString( (const sal_Char*)m_pEncryptionBuffer, nChars, rOutBuffer );
+ appendLiteralString( reinterpret_cast<sal_Char*>(m_pEncryptionBuffer), nChars, rOutBuffer );
}
else
appendLiteralString( rInString.getStr(), nChars , rOutBuffer );
@@ -3739,7 +3739,7 @@ sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8* pEncoding,
ZCodec pCodec( 0x4000, 0x4000 );
SvMemoryStream aStream;
pCodec.BeginCompression();
- pCodec.Write( aStream, (const sal_uInt8*)aContents.getStr(), aContents.getLength() );
+ pCodec.Write( aStream, reinterpret_cast<const sal_uInt8*>(aContents.getStr()), aContents.getLength() );
pCodec.EndCompression();
#endif
@@ -6779,9 +6779,9 @@ bool PDFWriterImpl::emitTrailer()
// emit the owner password, must not be encrypted
aLineS.append( "/O(" );
- appendLiteralString( (const sal_Char*)&m_aContext.Encryption.OValue[0], sal_Int32(m_aContext.Encryption.OValue.size()), aLineS );
+ appendLiteralString( reinterpret_cast<char*>(&m_aContext.Encryption.OValue[0]), sal_Int32(m_aContext.Encryption.OValue.size()), aLineS );
aLineS.append( ")/U(" );
- appendLiteralString( (const sal_Char*)&m_aContext.Encryption.UValue[0], sal_Int32(m_aContext.Encryption.UValue.size()), aLineS );
+ appendLiteralString( reinterpret_cast<char*>(&m_aContext.Encryption.UValue[0]), sal_Int32(m_aContext.Encryption.UValue.size()), aLineS );
aLineS.append( ")/P " );// the permission set
aLineS.append( m_nAccessPermissions );
aLineS.append( ">>\nendobj\n\n" );
diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx
index 3a98b87d8b55..689ffd219fd9 100644
--- a/vcl/source/gdi/svgdata.cxx
+++ b/vcl/source/gdi/svgdata.cxx
@@ -105,7 +105,7 @@ void SvgData::ensureSequenceAndRange()
maRange.reset();
// create stream
- const uno::Sequence< sal_Int8 > aPostData((sal_Int8*)maSvgDataArray.get(), mnSvgDataArrayLength);
+ const uno::Sequence< sal_Int8 > aPostData(reinterpret_cast<sal_Int8*>(maSvgDataArray.get()), mnSvgDataArrayLength);
const uno::Reference< io::XInputStream > myInputStream(new comphelper::SequenceInputStream(aPostData));
if(myInputStream.is())