diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:29:41 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:29:41 +0200 |
commit | f6ec07a3963a401dc736baa9bdd2ed3c7325bb66 (patch) | |
tree | 9cad620eb2cd5846464cf151b10949a8e36e5200 /vcl/quartz | |
parent | 9f356d3e66127bf14fe957962e8451dbd27c8ac8 (diff) |
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I07bf1403e6b992807541a499b786d47f835b2f81
Diffstat (limited to 'vcl/quartz')
-rw-r--r-- | vcl/quartz/ctfonts.cxx | 2 | ||||
-rw-r--r-- | vcl/quartz/salbmp.cxx | 2 | ||||
-rw-r--r-- | vcl/quartz/salgdi.cxx | 4 | ||||
-rw-r--r-- | vcl/quartz/salgdicommon.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 607fbd9f62c8..274da6bfdc2e 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -208,7 +208,7 @@ bool CoreTextStyle::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolyg GgoData aGgoData; aGgoData.mpPolyPoly = &rResult; - CGPathApply( xPath, (void*)&aGgoData, MyCGPathApplierFunc ); + CGPathApply( xPath, static_cast<void*>(&aGgoData), MyCGPathApplierFunc ); #if 0 // TODO: does OSX ensure that the last polygon is always closed? const CGPathElement aClosingElement = { kCGPathElementCloseSubpath, NULL }; MyCGPathApplierFunc( (void*)&aGgoData, &aClosingElement ); diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index 4ee39d3ff630..a2d43649f2f1 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -960,7 +960,7 @@ bool QuartzSalBitmap::GetSystemData( BitmapSystemData& rData ) mxGraphicContext = mxGraphicContextNew; } - rData.rImageContext = (void *) mxGraphicContext; + rData.rImageContext = static_cast<void *>(mxGraphicContext); rData.mnWidth = mnWidth; rData.mnHeight = mnHeight; } diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 52cf48acf816..6a1b18af04c6 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -676,7 +676,7 @@ void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bV // use the font subsetter to get the widths TrueTypeFont* pSftFont = NULL; - int nRC = ::OpenTTFontBuffer( (void*)&aBuffer[0], aBuffer.size(), 0, &pSftFont); + int nRC = ::OpenTTFontBuffer( static_cast<void*>(&aBuffer[0]), aBuffer.size(), 0, &pSftFont); if( nRC != SF_OK ) return; @@ -694,7 +694,7 @@ void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bV { for( int i = 0; i < nGlyphCount; ++i ) rGlyphWidths[i] = pGlyphMetrics[i].adv; - free( (void*)pGlyphMetrics ); + free( const_cast<TTSimpleGlyphMetrics *>(pGlyphMetrics) ); } FontCharMapPtr pMap = mpFontData->GetFontCharMap(); diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 1464f18ce323..30f8086da031 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -226,7 +226,7 @@ bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile, // prepare data for psprint's font subsetter TrueTypeFont* pSftFont = NULL; - int nRC = ::OpenTTFontBuffer( (void*)&aBuffer[0], aBuffer.size(), 0, &pSftFont); + int nRC = ::OpenTTFontBuffer( static_cast<void*>(&aBuffer[0]), aBuffer.size(), 0, &pSftFont); if( nRC != SF_OK ) return false; |