summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-06-08 16:25:08 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-06-08 16:25:08 +0200
commitb5a062bd1c6d5af34d3838192365fb780a910c3f (patch)
tree9368db421727b2c9e3a014d311f22783e5d6a61e /filter
parentc278518819d2a84655d5ce52b16cf466ee33bcb1 (diff)
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I2976a8e6a3c9abf70e153a71bf0374d24d92968d
Diffstat (limited to 'filter')
-rw-r--r--filter/source/flash/swfdialog.cxx2
-rw-r--r--filter/source/flash/swffilter.cxx2
-rw-r--r--filter/source/flash/swfwriter1.cxx4
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx2
-rw-r--r--filter/source/graphicfilter/icgm/cgm.cxx4
-rw-r--r--filter/source/graphicfilter/ieps/ieps.cxx6
-rw-r--r--filter/source/graphicfilter/ipcd/ipcd.cxx32
-rw-r--r--filter/source/graphicfilter/ipcx/ipcx.cxx2
-rw-r--r--filter/source/msfilter/escherex.cxx2
-rw-r--r--filter/source/msfilter/msdffimp.cxx12
-rw-r--r--filter/source/msfilter/svdfppt.cxx6
-rw-r--r--filter/source/odfflatxml/OdfFlatXml.cxx2
-rw-r--r--filter/source/pdf/pdfdialog.cxx2
-rw-r--r--filter/source/pdf/pdffilter.cxx2
-rw-r--r--filter/source/pdf/pdfinteract.cxx2
-rw-r--r--filter/source/placeware/filter.cxx2
-rw-r--r--filter/source/placeware/zip.cxx2
-rw-r--r--filter/source/svg/svgreader.cxx2
-rw-r--r--filter/source/svg/svgwriter.cxx4
-rw-r--r--filter/source/t602/t602filter.cxx4
-rw-r--r--filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogcomponent.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx2
-rw-r--r--filter/source/xsltfilter/XSLTFilter.cxx4
24 files changed, 53 insertions, 53 deletions
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index a9faaa84c8b6..ec79ca4134ea 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -66,7 +66,7 @@ Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames()
Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
throw( Exception )
{
- return (cppu::OWeakObject*) new SWFDialog( comphelper::getComponentContext(rSMgr) );
+ return static_cast<cppu::OWeakObject*>(new SWFDialog( comphelper::getComponentContext(rSMgr) ));
}
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index f0bc107d4ad0..aefdf5632f2b 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -518,7 +518,7 @@ Sequence< OUString > SAL_CALL FlashExportFilter_getSupportedServiceNames( )
Reference< XInterface > SAL_CALL FlashExportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
throw( Exception )
{
- return (cppu::OWeakObject*) new FlashExportFilter( comphelper::getComponentContext(rSMgr) );
+ return static_cast<cppu::OWeakObject*>(new FlashExportFilter( comphelper::getComponentContext(rSMgr) ));
}
// XServiceInfo
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 1ffdd486c003..11446dd5bc7b 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1650,7 +1650,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
// the meta actions between the "XPATHFILL_SEQ_BEGIN" and "XPATHFILL_SEQ_END" comment.
SvtGraphicFill aFilling;
- SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), StreamMode::READ );
+ SvMemoryStream aMemStm( const_cast<sal_uInt8 *>(pData), pA->GetDataSize(), StreamMode::READ );
// read the fill info
ReadSvtGraphicFill( aMemStm, aFilling );
@@ -1680,7 +1680,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
// the meta actions between the "XPATHFILL_SEQ_BEGIN" and "XPATHFILL_SEQ_END" comment.
SvtGraphicStroke aStroke;
- SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), StreamMode::READ );
+ SvMemoryStream aMemStm( const_cast<sal_uInt8 *>(pData), pA->GetDataSize(), StreamMode::READ );
// read the fill info
ReadSvtGraphicStroke( aMemStm, aStroke );
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 7a7ff6d56476..a3b4dc8a3fc5 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -1291,7 +1291,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
const sal_uInt8* pData = pA->GetData();
if ( pData )
{
- SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), StreamMode::READ );
+ SvMemoryStream aMemStm( const_cast<sal_uInt8 *>(pData), pA->GetDataSize(), StreamMode::READ );
bool bSkipSequence = false;
OString sSeqEnd;
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index 6d0d6f824058..aea0c6f58c04 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -221,12 +221,12 @@ double CGM::ImplGetFloat( RealPrecision eRealPrecision, sal_uInt32 nRealSize )
{
if ( nRealSize == 4 )
{
- memcpy( (void*)&fFloatBuf, pPtr, 4 );
+ memcpy( static_cast<void*>(&fFloatBuf), pPtr, 4 );
nRetValue = (double)fFloatBuf;
}
else
{
- memcpy( (void*)&fDoubleBuf, pPtr, 8 );
+ memcpy( static_cast<void*>(&fDoubleBuf), pPtr, 8 );
nRetValue = fDoubleBuf;
}
}
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 0cf8b598ca5e..2ebffb103fe9 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -429,10 +429,10 @@ void CreateMtfReplacementAction( GDIMetaFile& rMtf, SvStream& rStrm, sal_uInt32
rStrm.Read( pBuf.get(), nSizeTIFF );
aReplacement.Write( pBuf.get(), nSizeTIFF );
}
- rMtf.AddAction( (MetaAction*)( new MetaCommentAction( aComment, 0, static_cast<const sal_uInt8*>(aReplacement.GetData()), aReplacement.Tell() ) ) );
+ rMtf.AddAction( static_cast<MetaAction*>( new MetaCommentAction( aComment, 0, static_cast<const sal_uInt8*>(aReplacement.GetData()), aReplacement.Tell() ) ) );
}
else
- rMtf.AddAction( (MetaAction*)( new MetaCommentAction( aComment, 0, NULL, 0 ) ) );
+ rMtf.AddAction( static_cast<MetaAction*>( new MetaCommentAction( aComment, 0, NULL, 0 ) ) );
}
//there is no preview -> make a red box
@@ -736,7 +736,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
aGraphic);
}
- aMtf.AddAction( (MetaAction*)( new MetaEPSAction( Point(), Size( nWidth, nHeight ),
+ aMtf.AddAction( static_cast<MetaAction*>( new MetaEPSAction( Point(), Size( nWidth, nHeight ),
aGfxLink, aGraphic.GetGDIMetaFile() ) ) );
CreateMtfReplacementAction( aMtf, rStream, nOrigPos, nPSSize, nPosWMF, nSizeWMF, nPosTIFF, nSizeTIFF );
aMtf.WindStart();
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index 9a8d9bfb5775..a5f9ad5b9185 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -222,14 +222,14 @@ void PCDReader::ReadImage()
if ( pL0 == NULL || pL1 == NULL || pCb == NULL || pCr == NULL ||
pL0N == NULL || pL1N == NULL || pCbN == NULL || pCrN == NULL)
{
- rtl_freeMemory((void*)pL0 );
- rtl_freeMemory((void*)pL1 );
- rtl_freeMemory((void*)pCb );
- rtl_freeMemory((void*)pCr );
- rtl_freeMemory((void*)pL0N);
- rtl_freeMemory((void*)pL1N);
- rtl_freeMemory((void*)pCbN);
- rtl_freeMemory((void*)pCrN);
+ rtl_freeMemory(static_cast<void*>(pL0) );
+ rtl_freeMemory(static_cast<void*>(pL1) );
+ rtl_freeMemory(static_cast<void*>(pCb) );
+ rtl_freeMemory(static_cast<void*>(pCr) );
+ rtl_freeMemory(static_cast<void*>(pL0N));
+ rtl_freeMemory(static_cast<void*>(pL1N));
+ rtl_freeMemory(static_cast<void*>(pCbN));
+ rtl_freeMemory(static_cast<void*>(pCrN));
bStatus = false;
return;
}
@@ -353,14 +353,14 @@ void PCDReader::ReadImage()
if ( !bStatus )
break;
}
- rtl_freeMemory((void*)pL0 );
- rtl_freeMemory((void*)pL1 );
- rtl_freeMemory((void*)pCb );
- rtl_freeMemory((void*)pCr );
- rtl_freeMemory((void*)pL0N);
- rtl_freeMemory((void*)pL1N);
- rtl_freeMemory((void*)pCbN);
- rtl_freeMemory((void*)pCrN);
+ rtl_freeMemory(static_cast<void*>(pL0) );
+ rtl_freeMemory(static_cast<void*>(pL1) );
+ rtl_freeMemory(static_cast<void*>(pCb) );
+ rtl_freeMemory(static_cast<void*>(pCr) );
+ rtl_freeMemory(static_cast<void*>(pL0N));
+ rtl_freeMemory(static_cast<void*>(pL1N));
+ rtl_freeMemory(static_cast<void*>(pCbN));
+ rtl_freeMemory(static_cast<void*>(pCrN));
}
//================== GraphicImport - the exported Function ================
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index 61b7fa6f9631..176299fba315 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -237,7 +237,7 @@ void PCXReader::ImplReadBody(BitmapWriteAccess * pAcc)
for ( np = 0; np < nPlanes; np++)
{
if ( nEncoding == 0)
- m_rPCX.Read( (void *)pPlane[ np ], nBytesPerPlaneLin );
+ m_rPCX.Read( static_cast<void *>(pPlane[ np ]), nBytesPerPlaneLin );
else
{
pDest = pPlane[ np ];
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 3faaecd7da1d..93b2d958ba4b 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1457,7 +1457,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(
if ( pAry && nAryLen )
{
Graphic aGraphic;
- SvMemoryStream aTemp( (void*)pAry, nAryLen, StreamMode::READ );
+ SvMemoryStream aTemp( const_cast<sal_uInt8 *>(pAry), nAryLen, StreamMode::READ );
sal_uInt32 nErrCode = GraphicConverter::Import( aTemp, aGraphic, ConvertDataFormat::WMF );
if ( nErrCode == ERRCODE_NONE )
{
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 9e88ceb4a361..6053ae3a76db 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2909,13 +2909,13 @@ DffRecordList::~DffRecordList()
DffRecordManager::DffRecordManager() :
DffRecordList ( NULL ),
- pCList ( (DffRecordList*)this )
+ pCList ( static_cast<DffRecordList*>(this) )
{
}
DffRecordManager::DffRecordManager( SvStream& rIn ) :
DffRecordList ( NULL ),
- pCList ( (DffRecordList*)this )
+ pCList ( static_cast<DffRecordList*>(this) )
{
Consume( rIn );
}
@@ -2934,7 +2934,7 @@ void DffRecordManager::Consume( SvStream& rIn, bool bAppend, sal_uInt32 nStOfs )
}
if ( nStOfs )
{
- pCList = (DffRecordList*)this;
+ pCList = static_cast<DffRecordList*>(this);
while ( pCList->pNext )
pCList = pCList->pNext;
while ( ( rIn.GetError() == 0 ) && ( ( rIn.Tell() + 8 ) <= nStOfs ) )
@@ -2952,7 +2952,7 @@ void DffRecordManager::Consume( SvStream& rIn, bool bAppend, sal_uInt32 nStOfs )
void DffRecordManager::Clear()
{
- pCList = (DffRecordList*)this;
+ pCList = static_cast<DffRecordList*>(this);
delete pNext, pNext = NULL;
nCurrent = 0;
nCount = 0;
@@ -2969,7 +2969,7 @@ DffRecordHeader* DffRecordManager::Current()
DffRecordHeader* DffRecordManager::First()
{
DffRecordHeader* pRet = NULL;
- pCList = (DffRecordList*)this;
+ pCList = static_cast<DffRecordList*>(this);
if ( pCList->nCount )
{
pCList->nCurrent = 0;
@@ -4190,7 +4190,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
else
{
InitializePropSet( DFF_msofbtOPT ); // get the default PropSet
- ( (DffPropertyReader*) this )->mnFix16Angle = 0;
+ static_cast<DffPropertyReader*>(this)->mnFix16Angle = 0;
}
aObjData.bOpt2 = maShapeRecords.SeekToContent( rSt, DFF_msofbtUDefProp, SEEK_FROM_CURRENT_AND_RESTART );
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index d07b692f5758..4006b9f90a4a 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2783,7 +2783,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
bool bTemporary = ( rSlidePersist.aSlideAtom.nFlags & 2 ) != 0;
sal_uInt32 nPos = rStCtrl.Tell();
rStCtrl.Seek( pE->nBackgroundOffset );
- rSlidePersist.pBObj = ImportObj( rStCtrl, (void*)&aProcessData, aPageSize, aPageSize );
+ rSlidePersist.pBObj = ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aPageSize, aPageSize );
rSlidePersist.bBObjIsTemporary = bTemporary;
rStCtrl.Seek( nPos );
}
@@ -2800,7 +2800,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
if ( nSpFlags & SP_FBACKGROUND )
{
aEscherObjListHd.SeekToBegOfRecord( rStCtrl );
- rSlidePersist.pBObj = ImportObj( rStCtrl, (void*)&aProcessData, aPageSize, aPageSize );
+ rSlidePersist.pBObj = ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aPageSize, aPageSize );
rSlidePersist.bBObjIsTemporary = false;
}
}
@@ -2836,7 +2836,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
aShapeHd.SeekToBegOfRecord( rStCtrl );
sal_Int32 nShapeId;
aProcessData.pTableRowProperties = NULL;
- SdrObject* pObj = ImportObj( rStCtrl, (void*)&aProcessData, aEmpty, aEmpty, 0, &nShapeId );
+ SdrObject* pObj = ImportObj( rStCtrl, static_cast<void*>(&aProcessData), aEmpty, aEmpty, 0, &nShapeId );
if ( pObj )
{
if ( aProcessData.pTableRowProperties )
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index 6b75b8333660..d1b6b780258a 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -213,7 +213,7 @@ Sequence< OUString > OdfFlatXml::impl_getSupportedServiceNames()
Reference< XInterface > SAL_CALL OdfFlatXml::impl_createInstance(const Reference< XMultiServiceFactory >& fact)
{
- return Reference<XInterface> ((OWeakObject *) new OdfFlatXml( comphelper::getComponentContext(fact) ));
+ return Reference<XInterface> (static_cast<OWeakObject *>(new OdfFlatXml( comphelper::getComponentContext(fact) )));
}
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index 415ee43525ba..febe61f7c656 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -58,7 +58,7 @@ Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames()
Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
throw( Exception )
{
- return (cppu::OWeakObject*) new PDFDialog( comphelper::getComponentContext(rSMgr) );
+ return static_cast<cppu::OWeakObject*>(new PDFDialog( comphelper::getComponentContext(rSMgr) ));
}
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 9605032b0981..2512ffb0214f 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -208,7 +208,7 @@ Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames( ) throw (Runt
Reference< XInterface > SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw( Exception )
{
- return (cppu::OWeakObject*) new PDFFilter( comphelper::getComponentContext(rSMgr) );
+ return static_cast<cppu::OWeakObject*>(new PDFFilter( comphelper::getComponentContext(rSMgr) ));
}
diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx
index d01281211ebf..cf68ee1341e5 100644
--- a/filter/source/pdf/pdfinteract.cxx
+++ b/filter/source/pdf/pdfinteract.cxx
@@ -76,7 +76,7 @@ Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames( )
Reference< XInterface > SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & ) throw( Exception )
{
- return (cppu::OWeakObject*) new PDFInteractionHandler;
+ return static_cast<cppu::OWeakObject*>(new PDFInteractionHandler);
}
OUString SAL_CALL PDFInteractionHandler::getImplementationName()
diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx
index 2d73c330dbf9..1092032a64f3 100644
--- a/filter/source/placeware/filter.cxx
+++ b/filter/source/placeware/filter.cxx
@@ -160,7 +160,7 @@ Sequence< OUString > SAL_CALL PlaceWareExportFilter_getSupportedServiceNames( )
Reference< XInterface > SAL_CALL PlaceWareExportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
throw( Exception )
{
- return (cppu::OWeakObject*) new PlaceWareExportFilter( comphelper::getComponentContext(rSMgr) );
+ return static_cast<cppu::OWeakObject*>(new PlaceWareExportFilter( comphelper::getComponentContext(rSMgr) ));
}
// XServiceInfo
diff --git a/filter/source/placeware/zip.cxx b/filter/source/placeware/zip.cxx
index 37de64a4316b..840d7a94025c 100644
--- a/filter/source/placeware/zip.cxx
+++ b/filter/source/placeware/zip.cxx
@@ -94,7 +94,7 @@ void PlacewareZipFile::copyAndCRC(ZipEntry *e, osl::File& rFile)
if( !isError() )
{
sal_uInt32 nTemp = static_cast<sal_uInt32>(n);
- e->crc = rtl_crc32( e->crc, (const void *) buf, nTemp );
+ e->crc = rtl_crc32( e->crc, static_cast<const void *>(buf), nTemp );
mnRC = mrFile.write( buf, n, nWritten );
OSL_ASSERT( n == nWritten );
}
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 0cf5f0585803..e9b16d13bc98 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1107,7 +1107,7 @@ struct AnnotatingVisitor
const ARGBColor& rInheritColor,
const Gradient& rInheritGradient )
{
- std::pair<const char*,const char*> aPaintUri((const char*)NULL,(const char*)NULL);
+ std::pair<const char*,const char*> aPaintUri(nullptr,nullptr);
std::pair<ARGBColor,bool> aColor(maCurrState.maCurrentColor,
false);
if( strcmp(sValue,"none") == 0 )
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 50810f856b41..0226922d31ee 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -3003,7 +3003,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
mapCurShape.reset();
}
- SvMemoryStream aMemStm( (void*) pA->GetData(), pA->GetDataSize(), StreamMode::READ );
+ SvMemoryStream aMemStm( const_cast<sal_uInt8 *>(pA->GetData()), pA->GetDataSize(), StreamMode::READ );
SvtGraphicFill aFill;
ReadSvtGraphicFill( aMemStm, aFill );
@@ -3079,7 +3079,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
( nWriteFlags & SVGWRITER_WRITE_FILL ) && !( nWriteFlags & SVGWRITER_NO_SHAPE_COMMENTS ) &&
pA->GetDataSize() )
{
- SvMemoryStream aMemStm( (void*) pA->GetData(), pA->GetDataSize(), StreamMode::READ );
+ SvMemoryStream aMemStm( const_cast<sal_uInt8 *>(pA->GetData()), pA->GetDataSize(), StreamMode::READ );
SvtGraphicStroke aStroke;
tools::PolyPolygon aStartArrow, aEndArrow;
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index 4c30eac5b463..0623c2e64406 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -875,7 +875,7 @@ Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( )
Reference< XInterface > SAL_CALL T602ImportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
throw( Exception )
{
- return (cppu::OWeakObject*) new T602ImportFilter( rSMgr );
+ return static_cast<cppu::OWeakObject*>(new T602ImportFilter( rSMgr ));
}
T602ImportFilterDialog::T602ImportFilterDialog(const ::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > &r ) :
@@ -1164,7 +1164,7 @@ Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames(
Reference< XInterface > SAL_CALL T602ImportFilterDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
throw( Exception )
{
- return (cppu::OWeakObject*) new T602ImportFilterDialog( rSMgr );
+ return static_cast<cppu::OWeakObject*>(new T602ImportFilterDialog( rSMgr ));
}
}
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 1b88f167d35d..aa09f597ca97 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -368,7 +368,7 @@ Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( )
Reference< XInterface > SAL_CALL XmlFilterAdaptor_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
throw( Exception )
{
- return (cppu::OWeakObject*) new XmlFilterAdaptor( comphelper::getComponentContext(rSMgr) );
+ return static_cast<cppu::OWeakObject*>(new XmlFilterAdaptor( comphelper::getComponentContext(rSMgr) ));
}
// XServiceInfo
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index ef70707dfd11..d24b9b48869c 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -203,7 +203,7 @@ Sequence< OUString > SAL_CALL XMLFilterDialogComponent_getSupportedServiceNames(
Reference< XInterface > SAL_CALL XMLFilterDialogComponent_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw ( Exception )
{
- return (OWeakObject*)new XMLFilterDialogComponent( comphelper::getComponentContext(rSMgr) );
+ return static_cast<OWeakObject*>(new XMLFilterDialogComponent( comphelper::getComponentContext(rSMgr) ));
}
OUString SAL_CALL XMLFilterDialogComponent::getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception)
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index b1004ec856f3..7fcbaaae7ac0 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1479,7 +1479,7 @@ IMPL_LINK( XMLFilterListBox, HeaderEndDrag_Impl, HeaderBar*, pBar )
void XMLFilterListBox::addFilterEntry( const filter_info_impl* pInfo )
{
const OUString aEntryStr( getEntryString( pInfo ) );
- InsertEntryToColumn( aEntryStr, TREELIST_APPEND, 0xffff, (void*)pInfo );
+ InsertEntryToColumn( aEntryStr, TREELIST_APPEND, 0xffff, const_cast<filter_info_impl *>(pInfo) );
}
void XMLFilterListBox::changeEntry( const filter_info_impl* pInfo )
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 6241137eea88..09b66fbc2d5c 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -557,13 +557,13 @@ namespace XSLT
static css::uno::Reference<XInterface> SAL_CALL
CreateTransformerInstance(const css::uno::Reference<XMultiServiceFactory> &r)
{
- return css::uno::Reference<XInterface> ((OWeakObject *) new LibXSLTTransformer( comphelper::getComponentContext(r) ));
+ return css::uno::Reference<XInterface> (static_cast<OWeakObject *>(new LibXSLTTransformer( comphelper::getComponentContext(r) )));
}
static css::uno::Reference<XInterface> SAL_CALL
CreateFilterInstance(const css::uno::Reference<XMultiServiceFactory> &r)
{
- return css::uno::Reference<XInterface> ((OWeakObject *) new XSLTFilter( comphelper::getComponentContext(r) ));
+ return css::uno::Reference<XInterface> (static_cast<OWeakObject *>(new XSLTFilter( comphelper::getComponentContext(r) )));
}
}