From c2ff1b9622a1c67612719c87af593b59b9534119 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 10 Nov 2015 10:10:23 +0100 Subject: loplugin:nullptr (automatic rewrite) Change-Id: Ic8d478162bcdcadd068a22c6344e947da3cd1eab --- basebmp/source/bitmapdevice.cxx | 12 ++++++------ basebmp/test/bmpmasktest.cxx | 6 +++--- basebmp/test/bmptest.cxx | 2 +- basebmp/test/cliptest.cxx | 4 ++-- basebmp/test/filltest.cxx | 2 +- basebmp/test/masktest.cxx | 2 +- basebmp/test/polytest.cxx | 18 +++++++++--------- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'basebmp') diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index 2100710bec69..4260edb95bdd 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -1969,7 +1969,7 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector& pMem.reset( static_cast(rtl_allocateMemory( nMemSize )), &rtl_freeMemory ); - if (pMem.get() == 0 && nMemSize != 0) + if (pMem.get() == nullptr && nMemSize != 0) return BitmapDeviceSharedPtr(); if (bBlack) memset(pMem.get(), 0, nMemSize); @@ -2165,7 +2165,7 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize, nScanlineStride, boost::shared_array< sal_uInt8 >(), PaletteMemorySharedVector(), - NULL, + nullptr, IBitmapDeviceDamageTrackerSharedPtr() ); } @@ -2181,7 +2181,7 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize nScanlineStride, boost::shared_array< sal_uInt8 >(), rPalette, - NULL, + nullptr, IBitmapDeviceDamageTrackerSharedPtr() ); } @@ -2198,7 +2198,7 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize nScanlineStride, rMem, rPalette, - NULL, + nullptr, IBitmapDeviceDamageTrackerSharedPtr() ); } @@ -2211,7 +2211,7 @@ BitmapDeviceSharedPtr createClipDevice( const basegfx::B2IVector& rSize ) getBitmapDeviceStrideForWidth(basebmp::Format::OneBitMsbGrey, rSize.getX()), boost::shared_array< sal_uInt8 >(), PaletteMemorySharedVector(), - NULL, + nullptr, IBitmapDeviceDamageTrackerSharedPtr(), false /* white */) ); return xClip; @@ -2240,7 +2240,7 @@ BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector& rSize, rProto->getScanlineStride(), boost::shared_array< sal_uInt8 >(), rProto->getPalette(), - NULL, + nullptr, rProto->getDamageTracker() ); } diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 531991c99632..7e4440e22eb6 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -115,7 +115,7 @@ public: OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD( aPoly, aSvg, false, NULL ); + basegfx::tools::importFromSvgD( aPoly, aSvg, false, nullptr ); const Color aColWhite(0xFFFFFFFF); const Color aColBlack(0); mpBmp1bpp->fillPolyPolygon( @@ -130,7 +130,7 @@ public: aSvg = "m 0 0 h6 v10 h-6z" ; aPoly.clear(); - basegfx::tools::importFromSvgD( aPoly, aSvg, false, NULL ); + basegfx::tools::importFromSvgD( aPoly, aSvg, false, nullptr ); mpMaskBmp1bpp->clear(aColWhite); mpMaskBmp1bpp->fillPolyPolygon( aPoly, @@ -178,7 +178,7 @@ public: // punch out another piece not to copy basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, "m 2 2 h4 v8 h-4z", - false, NULL ); + false, nullptr ); xMask->fillPolyPolygon( aPoly, basebmp::Color( 0xff, 0xff, 0xff ), DrawMode::Paint ); diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index 3d1436786996..7a45a49f5ab7 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -169,7 +169,7 @@ public: OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD( aPoly, aSvg, false, NULL ); + basegfx::tools::importFromSvgD( aPoly, aSvg, false, nullptr ); const Color aCol(0xFFFFFFFF); mpBmp1bpp->fillPolyPolygon( aPoly, diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index e6a1bdc6f099..c1599147dc0a 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -162,7 +162,7 @@ private: OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD( aPoly, aSvg, false, NULL ); + basegfx::tools::importFromSvgD( aPoly, aSvg, false, nullptr ); const basebmp::Color aCol(0xFF); pBmp->clear( basebmp::Color(0) ); pBmp->fillPolyPolygon( @@ -204,7 +204,7 @@ public: OUString aSvg( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" ); basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD( aPoly, aSvg, false, NULL ); + basegfx::tools::importFromSvgD( aPoly, aSvg, false, nullptr ); mpClipMask->clear(Color(0)); mpClipMask->drawPolygon( aPoly.getB2DPolygon(0), diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index 3462108334c6..8f2ec81c1f15 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -149,7 +149,7 @@ private: OUString aSvg( "m 0 0l7 7h-1z" ); basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD( aPoly, aSvg, false, NULL ); + basegfx::tools::importFromSvgD( aPoly, aSvg, false, nullptr ); rDevice->fillPolyPolygon( aPoly, aCol, diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index b4598ae7c3ed..b1556f0e12a5 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -119,7 +119,7 @@ public: OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD( aPoly, aSvg, false, NULL ); + basegfx::tools::importFromSvgD( aPoly, aSvg, false, nullptr ); const Color aCol(0xFF); mpMask->fillPolyPolygon( aPoly, diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index 3ea37da6ba4a..d027e8ee2501 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -54,7 +54,7 @@ private: basegfx::tools::importFromSvgD( aPoly, - "M2 2 l7 7 z", false, NULL ); + "M2 2 l7 7 z", false, nullptr ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -68,7 +68,7 @@ private: aPoly.clear(); basegfx::tools::importFromSvgD( aPoly, - "M7 2 l-6 6 z", false, NULL ); + "M7 2 l-6 6 z", false, nullptr ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -86,7 +86,7 @@ private: basegfx::tools::importFromSvgD( aPoly, - "M2 2 h1 l7 7 h-1 z", false, NULL ); + "M2 2 h1 l7 7 h-1 z", false, nullptr ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -100,7 +100,7 @@ private: aPoly.clear(); basegfx::tools::importFromSvgD( aPoly, - "M7 2 h-1 l-6 6 h1 z", false, NULL ); + "M7 2 h-1 l-6 6 h1 z", false, nullptr ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -114,7 +114,7 @@ private: aPoly.clear(); basegfx::tools::importFromSvgD( aPoly, - "M0 0 l7 7 h-1 l-5-7 z", false, NULL ); + "M0 0 l7 7 h-1 l-5-7 z", false, nullptr ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -132,7 +132,7 @@ private: basegfx::tools::importFromSvgD( aPoly, "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z", - false, NULL ); + false, nullptr ); rDevice->fillPolyPolygon( aPoly, @@ -151,7 +151,7 @@ private: basegfx::tools::importFromSvgD( aPoly, "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z", - false, NULL ); + false, nullptr ); basegfx::B2DHomMatrix aMat; aMat.translate(-3,-3); aMat.rotate( 1.7 ); @@ -252,7 +252,7 @@ private: // generate a single pixel, due to the rasterization effect. basegfx::tools::importFromSvgD( aPoly, "M2 3 l1 -1 M4 2 l1 1 M2 8 l1 1 M5 8 l-1 1 M2 5 h4 M3 0 v10", - false, NULL ); + false, nullptr ); BitmapDeviceSharedPtr pClippedDevice=( subsetBitmapDevice( rDevice, basegfx::B2IBox(3,3,5,9) )); @@ -280,7 +280,7 @@ private: "M1 0 h1 v10 h-1 z" "M4 0 h1 v10 h-1 z" "M8 0 h1 v10 h-1 z", - false, NULL ); + false, nullptr ); rDevice->fillPolyPolygon( aPoly, aCol, -- cgit