loplugin:simplifypointertobool improve

to look for the
x.get() != null
pattern, which can be simplified to
x

I'll do the
x.get() == nullptr
pattern in a separate patch, to reduce the chances of a mistake

Change-Id: I45e0d178e75359857cdf50d712039cb526016555
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95354
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 9 insertions, 17 deletions

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 4109e21635d1..8e7b03559447 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -2853,7 +2853,7 @@ namespace cppcanvas::internal
         {
             SAL_INFO( "cppcanvas.emf", "::cppcanvas::internal::ImplRenderer::ImplRenderer(mtf)" );
 
-            OSL_ENSURE( rCanvas.get() != nullptr && rCanvas->getUNOCanvas().is(),
+            OSL_ENSURE( rCanvas && rCanvas->getUNOCanvas().is(),
                         "ImplRenderer::ImplRenderer(): Invalid canvas" );
             OSL_ENSURE( rCanvas->getUNOCanvas()->getDevice().is(),
                         "ImplRenderer::ImplRenderer(): Invalid graphic device" );
diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx
index 2ccc1f0cbae5..f7a91d38d361 100644
--- a/cppcanvas/source/tools/canvasgraphichelper.cxx
+++ b/cppcanvas/source/tools/canvasgraphichelper.cxx
@@ -37,8 +37,7 @@ namespace cppcanvas::internal
             maClipPolyPolygon(),
             mpCanvas( rParentCanvas )
         {
-            OSL_ENSURE( mpCanvas.get() != nullptr &&
-                        mpCanvas->getUNOCanvas().is(),
+            OSL_ENSURE( mpCanvas && mpCanvas->getUNOCanvas().is(),
                         "CanvasGraphicHelper::CanvasGraphicHelper: no valid canvas" );
 
             ::canvas::tools::initRenderState( maRenderState );
diff --git a/cppcanvas/source/wrapper/basegfxfactory.cxx b/cppcanvas/source/wrapper/basegfxfactory.cxx
index 0549c4e12175..8f11c6bb4a49 100644
--- a/cppcanvas/source/wrapper/basegfxfactory.cxx
+++ b/cppcanvas/source/wrapper/basegfxfactory.cxx
@@ -37,8 +37,7 @@ namespace cppcanvas
     PolyPolygonSharedPtr BaseGfxFactory::createPolyPolygon( const CanvasSharedPtr&          rCanvas,
                                                             const ::basegfx::B2DPolygon&    rPoly )
     {
-        OSL_ENSURE( rCanvas.get() != nullptr &&
-                    rCanvas->getUNOCanvas().is(),
+        OSL_ENSURE( rCanvas &&  rCanvas->getUNOCanvas().is(),
                     "BaseGfxFactory::createPolyPolygon(): Invalid canvas" );
 
         if( rCanvas.get() == nullptr )
@@ -57,8 +56,7 @@ namespace cppcanvas
     BitmapSharedPtr BaseGfxFactory::createBitmap( const CanvasSharedPtr&    rCanvas,
                                                   const ::basegfx::B2ISize& rSize )
     {
-        OSL_ENSURE( rCanvas.get() != nullptr &&
-                    rCanvas->getUNOCanvas().is(),
+        OSL_ENSURE( rCanvas && rCanvas->getUNOCanvas().is(),
                     "BaseGfxFactory::createBitmap(): Invalid canvas" );
 
         if( rCanvas.get() == nullptr )
@@ -76,8 +74,7 @@ namespace cppcanvas
     BitmapSharedPtr BaseGfxFactory::createAlphaBitmap( const CanvasSharedPtr&   rCanvas,
                                                        const ::basegfx::B2ISize& rSize )
     {
-        OSL_ENSURE( rCanvas.get() != nullptr &&
-                    rCanvas->getUNOCanvas().is(),
+        OSL_ENSURE( rCanvas && rCanvas->getUNOCanvas().is(),
                     "BaseGfxFactory::createBitmap(): Invalid canvas" );
 
         if( rCanvas.get() == nullptr )
diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx
index 8ce319539523..4ca8980a1b15 100644
--- a/cppcanvas/source/wrapper/implbitmap.cxx
+++ b/cppcanvas/source/wrapper/implbitmap.cxx
@@ -53,8 +53,7 @@ namespace cppcanvas::internal
         {
             CanvasSharedPtr pCanvas( getCanvas() );
 
-            OSL_ENSURE( pCanvas.get() != nullptr &&
-                        pCanvas->getUNOCanvas().is(),
+            OSL_ENSURE( pCanvas && pCanvas->getUNOCanvas().is(),
                         "ImplBitmap::draw: invalid canvas" );
 
             if( pCanvas.get() == nullptr ||
@@ -75,8 +74,7 @@ namespace cppcanvas::internal
         {
             CanvasSharedPtr pCanvas( getCanvas() );
 
-            OSL_ENSURE( pCanvas.get() != nullptr &&
-                        pCanvas->getUNOCanvas().is(),
+            OSL_ENSURE( pCanvas && pCanvas->getUNOCanvas().is(),
                         "ImplBitmap::drawAlphaModulated(): invalid canvas" );
 
             if( pCanvas.get() == nullptr ||
diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx
index 1e8fc7c8b5f5..54f0fe30818c 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.cxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.cxx
@@ -88,8 +88,7 @@ namespace cppcanvas::internal
         {
             CanvasSharedPtr pCanvas( getCanvas() );
 
-            OSL_ENSURE( pCanvas.get() != nullptr &&
-                        pCanvas->getUNOCanvas().is(),
+            OSL_ENSURE( pCanvas && pCanvas->getUNOCanvas().is(),
                         "ImplBitmap::draw: invalid canvas" );
 
             if( pCanvas.get() == nullptr ||
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx
index c90d91b23de8..9d286ec7d8d3 100644
--- a/cppcanvas/source/wrapper/vclfactory.cxx
+++ b/cppcanvas/source/wrapper/vclfactory.cxx
@@ -56,8 +56,7 @@ namespace cppcanvas
     BitmapSharedPtr VCLFactory::createBitmap( const CanvasSharedPtr&    rCanvas,
                                               const ::BitmapEx&         rBmpEx )
     {
-        OSL_ENSURE( rCanvas.get() != nullptr &&
-                    rCanvas->getUNOCanvas().is(),
+        OSL_ENSURE( rCanvas && rCanvas->getUNOCanvas().is(),
                     "VCLFactory::createBitmap(): Invalid canvas" );
 
         if( rCanvas.get() == nullptr )