From 311fd06af4e297fa748684a61edd3ee38845c485 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 10 Nov 2015 10:12:29 +0100 Subject: loplugin:nullptr (automatic rewrite) Change-Id: I68f6c78d1a539a960efbcf81be1e5b2bd26c2bc5 --- cppcanvas/source/wrapper/basegfxfactory.cxx | 12 ++++++------ cppcanvas/source/wrapper/implbitmap.cxx | 8 ++++---- cppcanvas/source/wrapper/implcanvas.cxx | 2 +- cppcanvas/source/wrapper/implcustomsprite.cxx | 2 +- cppcanvas/source/wrapper/implfont.cxx | 2 +- cppcanvas/source/wrapper/implpolypolygon.cxx | 4 ++-- cppcanvas/source/wrapper/vclfactory.cxx | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) (limited to 'cppcanvas/source/wrapper') diff --git a/cppcanvas/source/wrapper/basegfxfactory.cxx b/cppcanvas/source/wrapper/basegfxfactory.cxx index f72394be8252..04be736c272a 100644 --- a/cppcanvas/source/wrapper/basegfxfactory.cxx +++ b/cppcanvas/source/wrapper/basegfxfactory.cxx @@ -47,11 +47,11 @@ namespace cppcanvas PolyPolygonSharedPtr BaseGfxFactory::createPolyPolygon( const CanvasSharedPtr& rCanvas, const ::basegfx::B2DPolygon& rPoly ) { - OSL_ENSURE( rCanvas.get() != NULL && + OSL_ENSURE( rCanvas.get() != nullptr && rCanvas->getUNOCanvas().is(), "BaseGfxFactory::createPolyPolygon(): Invalid canvas" ); - if( rCanvas.get() == NULL ) + if( rCanvas.get() == nullptr ) return PolyPolygonSharedPtr(); uno::Reference< rendering::XCanvas > xCanvas( rCanvas->getUNOCanvas() ); @@ -68,11 +68,11 @@ namespace cppcanvas BitmapSharedPtr BaseGfxFactory::createBitmap( const CanvasSharedPtr& rCanvas, const ::basegfx::B2ISize& rSize ) { - OSL_ENSURE( rCanvas.get() != NULL && + OSL_ENSURE( rCanvas.get() != nullptr && rCanvas->getUNOCanvas().is(), "BaseGfxFactory::createBitmap(): Invalid canvas" ); - if( rCanvas.get() == NULL ) + if( rCanvas.get() == nullptr ) return BitmapSharedPtr(); uno::Reference< rendering::XCanvas > xCanvas( rCanvas->getUNOCanvas() ); @@ -88,11 +88,11 @@ namespace cppcanvas BitmapSharedPtr BaseGfxFactory::createAlphaBitmap( const CanvasSharedPtr& rCanvas, const ::basegfx::B2ISize& rSize ) { - OSL_ENSURE( rCanvas.get() != NULL && + OSL_ENSURE( rCanvas.get() != nullptr && rCanvas->getUNOCanvas().is(), "BaseGfxFactory::createBitmap(): Invalid canvas" ); - if( rCanvas.get() == NULL ) + if( rCanvas.get() == nullptr ) return BitmapSharedPtr(); uno::Reference< rendering::XCanvas > xCanvas( rCanvas->getUNOCanvas() ); diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx index a95a36f250ea..281a76bdc998 100644 --- a/cppcanvas/source/wrapper/implbitmap.cxx +++ b/cppcanvas/source/wrapper/implbitmap.cxx @@ -57,11 +57,11 @@ namespace cppcanvas { CanvasSharedPtr pCanvas( getCanvas() ); - OSL_ENSURE( pCanvas.get() != NULL && + OSL_ENSURE( pCanvas.get() != nullptr && pCanvas->getUNOCanvas().is(), "ImplBitmap::draw: invalid canvas" ); - if( pCanvas.get() == NULL || + if( pCanvas.get() == nullptr || !pCanvas->getUNOCanvas().is() ) { return false; @@ -79,11 +79,11 @@ namespace cppcanvas { CanvasSharedPtr pCanvas( getCanvas() ); - OSL_ENSURE( pCanvas.get() != NULL && + OSL_ENSURE( pCanvas.get() != nullptr && pCanvas->getUNOCanvas().is(), "ImplBitmap::drawAlphaModulated(): invalid canvas" ); - if( pCanvas.get() == NULL || + if( pCanvas.get() == nullptr || !pCanvas->getUNOCanvas().is() ) { return false; diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx index a4f902bbcbf3..f3e5f49e8980 100644 --- a/cppcanvas/source/wrapper/implcanvas.cxx +++ b/cppcanvas/source/wrapper/implcanvas.cxx @@ -81,7 +81,7 @@ namespace cppcanvas ::basegfx::B2DPolyPolygon const* ImplCanvas::getClip() const { - return !maClipPolyPolygon ? NULL : &(*maClipPolyPolygon); + return !maClipPolyPolygon ? nullptr : &(*maClipPolyPolygon); } ColorSharedPtr ImplCanvas::createColor() const diff --git a/cppcanvas/source/wrapper/implcustomsprite.cxx b/cppcanvas/source/wrapper/implcustomsprite.cxx index 24aa95a47621..17ce28b61942 100644 --- a/cppcanvas/source/wrapper/implcustomsprite.cxx +++ b/cppcanvas/source/wrapper/implcustomsprite.cxx @@ -60,7 +60,7 @@ namespace cppcanvas return CanvasSharedPtr(); // cache content canvas C++ wrapper - if( mpLastCanvas.get() == NULL || + if( mpLastCanvas.get() == nullptr || mpLastCanvas->getUNOCanvas() != xCanvas ) { mpLastCanvas = CanvasSharedPtr( new ImplCanvas( xCanvas ) ); diff --git a/cppcanvas/source/wrapper/implfont.cxx b/cppcanvas/source/wrapper/implfont.cxx index 50b851063f6f..3fe7aaee4623 100644 --- a/cppcanvas/source/wrapper/implfont.cxx +++ b/cppcanvas/source/wrapper/implfont.cxx @@ -35,7 +35,7 @@ namespace cppcanvas const OUString& rFontName, const double& rCellSize ) : mxCanvas( rCanvas ), - mxFont( NULL ) + mxFont( nullptr ) { OSL_ENSURE( mxCanvas.is(), "ImplFont::ImplFont(): Invalid Canvas" ); diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx index ed0c4dbd5a89..ddd3be37fddc 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.cxx +++ b/cppcanvas/source/wrapper/implpolypolygon.cxx @@ -96,11 +96,11 @@ namespace cppcanvas { CanvasSharedPtr pCanvas( getCanvas() ); - OSL_ENSURE( pCanvas.get() != NULL && + OSL_ENSURE( pCanvas.get() != nullptr && pCanvas->getUNOCanvas().is(), "ImplBitmap::draw: invalid canvas" ); - if( pCanvas.get() == NULL || + if( pCanvas.get() == nullptr || !pCanvas->getUNOCanvas().is() ) return false; diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx index 338daa4ba731..4715e790d83e 100644 --- a/cppcanvas/source/wrapper/vclfactory.cxx +++ b/cppcanvas/source/wrapper/vclfactory.cxx @@ -69,11 +69,11 @@ namespace cppcanvas BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr& rCanvas, const ::BitmapEx& rBmpEx ) { - OSL_ENSURE( rCanvas.get() != NULL && + OSL_ENSURE( rCanvas.get() != nullptr && rCanvas->getUNOCanvas().is(), "VCLFactory::createBitmap(): Invalid canvas" ); - if( rCanvas.get() == NULL ) + if( rCanvas.get() == nullptr ) return BitmapSharedPtr(); uno::Reference< rendering::XCanvas > xCanvas( rCanvas->getUNOCanvas() ); -- cgit