diff options
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 2 | ||||
| -rw-r--r-- | cppcanvas/source/wrapper/basegfxfactory.cxx | 6 | ||||
| -rw-r--r-- | cppcanvas/source/wrapper/implbitmap.cxx | 4 | ||||
| -rw-r--r-- | cppcanvas/source/wrapper/implcustomsprite.cxx | 2 | ||||
| -rw-r--r-- | cppcanvas/source/wrapper/implpolypolygon.cxx | 2 | ||||
| -rw-r--r-- | cppcanvas/source/wrapper/vclfactory.cxx | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 8e7b03559447..efd276991370 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -2860,7 +2860,7 @@ namespace cppcanvas::internal // make sure canvas and graphic device are valid; action // creation don't check that every time - if( rCanvas.get() == nullptr || + if( !rCanvas || !rCanvas->getUNOCanvas().is() || !rCanvas->getUNOCanvas()->getDevice().is() ) { diff --git a/cppcanvas/source/wrapper/basegfxfactory.cxx b/cppcanvas/source/wrapper/basegfxfactory.cxx index 8f11c6bb4a49..5b06bcfd9715 100644 --- a/cppcanvas/source/wrapper/basegfxfactory.cxx +++ b/cppcanvas/source/wrapper/basegfxfactory.cxx @@ -40,7 +40,7 @@ namespace cppcanvas OSL_ENSURE( rCanvas && rCanvas->getUNOCanvas().is(), "BaseGfxFactory::createPolyPolygon(): Invalid canvas" ); - if( rCanvas.get() == nullptr ) + if( !rCanvas ) return PolyPolygonSharedPtr(); uno::Reference< rendering::XCanvas > xCanvas( rCanvas->getUNOCanvas() ); @@ -59,7 +59,7 @@ namespace cppcanvas OSL_ENSURE( rCanvas && rCanvas->getUNOCanvas().is(), "BaseGfxFactory::createBitmap(): Invalid canvas" ); - if( rCanvas.get() == nullptr ) + if( !rCanvas ) return BitmapSharedPtr(); uno::Reference< rendering::XCanvas > xCanvas( rCanvas->getUNOCanvas() ); @@ -77,7 +77,7 @@ namespace cppcanvas OSL_ENSURE( rCanvas && rCanvas->getUNOCanvas().is(), "BaseGfxFactory::createBitmap(): Invalid canvas" ); - if( rCanvas.get() == nullptr ) + if( !rCanvas ) return BitmapSharedPtr(); uno::Reference< rendering::XCanvas > xCanvas( rCanvas->getUNOCanvas() ); diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx index 4ca8980a1b15..9b7883f053a3 100644 --- a/cppcanvas/source/wrapper/implbitmap.cxx +++ b/cppcanvas/source/wrapper/implbitmap.cxx @@ -56,7 +56,7 @@ namespace cppcanvas::internal OSL_ENSURE( pCanvas && pCanvas->getUNOCanvas().is(), "ImplBitmap::draw: invalid canvas" ); - if( pCanvas.get() == nullptr || + if( !pCanvas || !pCanvas->getUNOCanvas().is() ) { return false; @@ -77,7 +77,7 @@ namespace cppcanvas::internal OSL_ENSURE( pCanvas && pCanvas->getUNOCanvas().is(), "ImplBitmap::drawAlphaModulated(): invalid canvas" ); - if( pCanvas.get() == nullptr || + if( !pCanvas || !pCanvas->getUNOCanvas().is() ) { return; diff --git a/cppcanvas/source/wrapper/implcustomsprite.cxx b/cppcanvas/source/wrapper/implcustomsprite.cxx index e30adf085374..71fe28a6682a 100644 --- a/cppcanvas/source/wrapper/implcustomsprite.cxx +++ b/cppcanvas/source/wrapper/implcustomsprite.cxx @@ -57,7 +57,7 @@ namespace cppcanvas::internal return CanvasSharedPtr(); // cache content canvas C++ wrapper - if( mpLastCanvas.get() == nullptr || + if( !mpLastCanvas || mpLastCanvas->getUNOCanvas() != xCanvas ) { mpLastCanvas = std::make_shared<ImplCanvas>( xCanvas ); diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx index 54f0fe30818c..308d3dace114 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.cxx +++ b/cppcanvas/source/wrapper/implpolypolygon.cxx @@ -91,7 +91,7 @@ namespace cppcanvas::internal OSL_ENSURE( pCanvas && pCanvas->getUNOCanvas().is(), "ImplBitmap::draw: invalid canvas" ); - if( pCanvas.get() == nullptr || + if( !pCanvas || !pCanvas->getUNOCanvas().is() ) return false; diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx index 9d286ec7d8d3..a750b2e88066 100644 --- a/cppcanvas/source/wrapper/vclfactory.cxx +++ b/cppcanvas/source/wrapper/vclfactory.cxx @@ -59,7 +59,7 @@ namespace cppcanvas OSL_ENSURE( rCanvas && rCanvas->getUNOCanvas().is(), "VCLFactory::createBitmap(): Invalid canvas" ); - if( rCanvas.get() == nullptr ) + if( !rCanvas ) return BitmapSharedPtr(); uno::Reference< rendering::XCanvas > xCanvas( rCanvas->getUNOCanvas() ); |