mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:cstylecast: deal with remaining pointer casts

Browse Source 
Change-Id: I8e3adffc4eca232889bbffd8efca48bad78a8b91
This commit is contained in:
Stephan Bergmann
2015-06-08 16:23:21 +02:00
parent 761e0ae0a7
commit 638a4ec6dc
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
canvas/source/cairo/cairo_canvasbitmap.cxx
View File

@@ -113,7 +113,7 @@ namespace cairocanvas
{ {
case 0: case 0:
{ {
aRV = uno::Any( reinterpret_cast<sal_Int64>( (BitmapEx *) NULL ) ); aRV = uno::Any( reinterpret_cast<sal_Int64>( nullptr ) );
if ( !mbHasAlpha ) if ( !mbHasAlpha )
break; break;

8
canvas/source/vcl/canvasbitmaphelper.cxx
View File

@@ -139,7 +139,7 @@ namespace vclcanvas
Bitmap::ScopedReadAccess pReadAccess( aBitmap ); Bitmap::ScopedReadAccess pReadAccess( aBitmap );
Bitmap::ScopedReadAccess pAlphaReadAccess( aAlpha.IsEmpty() ? Bitmap::ScopedReadAccess pAlphaReadAccess( aAlpha.IsEmpty() ?
(BitmapReadAccess*)NULL : aAlpha.AcquireReadAccess(), nullptr : aAlpha.AcquireReadAccess(),
aAlpha ); aAlpha );
ENSURE_OR_THROW( pReadAccess.get() != NULL, ENSURE_OR_THROW( pReadAccess.get() != NULL,
@@ -218,7 +218,7 @@ namespace vclcanvas
{ {
Bitmap::ScopedWriteAccess pWriteAccess( aBitmap ); Bitmap::ScopedWriteAccess pWriteAccess( aBitmap );
Bitmap::ScopedWriteAccess pAlphaWriteAccess( aAlpha.IsEmpty() ? Bitmap::ScopedWriteAccess pAlphaWriteAccess( aAlpha.IsEmpty() ?
(BitmapWriteAccess*)NULL : aAlpha.AcquireWriteAccess(), nullptr : aAlpha.AcquireWriteAccess(),
aAlpha ); aAlpha );
if( pAlphaWriteAccess.get() ) if( pAlphaWriteAccess.get() )
@@ -459,7 +459,7 @@ namespace vclcanvas
{ {
Bitmap::ScopedWriteAccess pWriteAccess( aBitmap ); Bitmap::ScopedWriteAccess pWriteAccess( aBitmap );
Bitmap::ScopedWriteAccess pAlphaWriteAccess( aAlpha.IsEmpty() ? Bitmap::ScopedWriteAccess pAlphaWriteAccess( aAlpha.IsEmpty() ?
(BitmapWriteAccess*)NULL : aAlpha.AcquireWriteAccess(), nullptr : aAlpha.AcquireWriteAccess(),
aAlpha ); aAlpha );
ENSURE_OR_THROW( pWriteAccess.get() != NULL, ENSURE_OR_THROW( pWriteAccess.get() != NULL,
@@ -512,7 +512,7 @@ namespace vclcanvas
Bitmap::ScopedReadAccess pReadAccess( aBitmap ); Bitmap::ScopedReadAccess pReadAccess( aBitmap );
Bitmap::ScopedReadAccess pAlphaReadAccess( aAlpha.IsEmpty() ? Bitmap::ScopedReadAccess pAlphaReadAccess( aAlpha.IsEmpty() ?
(BitmapReadAccess*)NULL : aAlpha.AcquireReadAccess(), nullptr : aAlpha.AcquireReadAccess(),
aAlpha ); aAlpha );
ENSURE_OR_THROW( pReadAccess.get() != NULL, ENSURE_OR_THROW( pReadAccess.get() != NULL,
"Could not acquire read access to bitmap" ); "Could not acquire read access to bitmap" );

2
canvas/source/vcl/canvashelper_texturefill.cxx
View File

@@ -713,7 +713,7 @@ namespace vclcanvas
// TODO(E1): Return value // TODO(E1): Return value
// TODO(F1): FillRule // TODO(F1): FillRule
gradientFill( mpOutDev->getOutDev(), gradientFill( mpOutDev->getOutDev(),
mp2ndOutDev.get() ? &mp2ndOutDev->getOutDev() : (OutputDevice*)NULL, mp2ndOutDev.get() ? &mp2ndOutDev->getOutDev() : nullptr,
rValues, rValues,
aColors, aColors,
aPolyPoly, aPolyPoly,

2
canvas/source/vcl/impltools.cxx
View File

@@ -258,7 +258,7 @@ namespace vclcanvas
Bitmap::ScopedReadAccess pReadAccess( aSrcBitmap ); Bitmap::ScopedReadAccess pReadAccess( aSrcBitmap );
Bitmap::ScopedReadAccess pAlphaReadAccess( rBitmap.IsTransparent() ? Bitmap::ScopedReadAccess pAlphaReadAccess( rBitmap.IsTransparent() ?
aSrcAlpha.AcquireReadAccess() : aSrcAlpha.AcquireReadAccess() :
(BitmapReadAccess*)NULL, nullptr,
aSrcAlpha ); aSrcAlpha );
if( pReadAccess.get() == NULL || if( pReadAccess.get() == NULL ||