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

loplugin:simplifypointertobool improve

Browse Source 
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>
This commit is contained in:
Noel Grandin
2020-06-02 10:40:26 +02:00
parent 0f499af8c2
commit 054c0e7177
113 changed files with 466 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cppcanvas/source/mtfrenderer/implrenderer.cxx
View File

@@ -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" );

3
cppcanvas/source/tools/canvasgraphichelper.cxx
View File

@@ -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 );

9
cppcanvas/source/wrapper/basegfxfactory.cxx
View File

@@ -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 )

6
cppcanvas/source/wrapper/implbitmap.cxx
View File

@@ -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 ||

3
cppcanvas/source/wrapper/implpolypolygon.cxx
View File

@@ -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 ||

3
cppcanvas/source/wrapper/vclfactory.cxx
View File

@@ -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 )