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

loplugin:nullptr (automatic rewrite)

Browse Source 
Change-Id: Ic8d478162bcdcadd068a22c6344e947da3cd1eab
This commit is contained in:
Stephan Bergmann
2015-11-10 10:10:23 +01:00
parent 4b0a3da4c5
commit c2ff1b9622
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
basebmp/source/bitmapdevice.cxx
View File

@@ -1969,7 +1969,7 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
pMem.reset( pMem.reset(
static_cast<sal_uInt8*>(rtl_allocateMemory( nMemSize )), static_cast<sal_uInt8*>(rtl_allocateMemory( nMemSize )),
&rtl_freeMemory ); &rtl_freeMemory );
if (pMem.get() == 0 && nMemSize != 0) if (pMem.get() == nullptr && nMemSize != 0)
return BitmapDeviceSharedPtr(); return BitmapDeviceSharedPtr();
if (bBlack) if (bBlack)
memset(pMem.get(), 0, nMemSize); memset(pMem.get(), 0, nMemSize);
@@ -2165,7 +2165,7 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize,
nScanlineStride, nScanlineStride,
boost::shared_array< sal_uInt8 >(), boost::shared_array< sal_uInt8 >(),
PaletteMemorySharedVector(), PaletteMemorySharedVector(),
NULL, nullptr,
IBitmapDeviceDamageTrackerSharedPtr() ); IBitmapDeviceDamageTrackerSharedPtr() );
} }
@@ -2181,7 +2181,7 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize
nScanlineStride, nScanlineStride,
boost::shared_array< sal_uInt8 >(), boost::shared_array< sal_uInt8 >(),
rPalette, rPalette,
NULL, nullptr,
IBitmapDeviceDamageTrackerSharedPtr() ); IBitmapDeviceDamageTrackerSharedPtr() );
} }
@@ -2198,7 +2198,7 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector& rSize
nScanlineStride, nScanlineStride,
rMem, rMem,
rPalette, rPalette,
NULL, nullptr,
IBitmapDeviceDamageTrackerSharedPtr() ); IBitmapDeviceDamageTrackerSharedPtr() );
} }
@@ -2211,7 +2211,7 @@ BitmapDeviceSharedPtr createClipDevice( const basegfx::B2IVector& rSize )
getBitmapDeviceStrideForWidth(basebmp::Format::OneBitMsbGrey, rSize.getX()), getBitmapDeviceStrideForWidth(basebmp::Format::OneBitMsbGrey, rSize.getX()),
boost::shared_array< sal_uInt8 >(), boost::shared_array< sal_uInt8 >(),
PaletteMemorySharedVector(), PaletteMemorySharedVector(),
NULL, nullptr,
IBitmapDeviceDamageTrackerSharedPtr(), IBitmapDeviceDamageTrackerSharedPtr(),
false /* white */) ); false /* white */) );
return xClip; return xClip;
@@ -2240,7 +2240,7 @@ BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector& rSize,
rProto->getScanlineStride(), rProto->getScanlineStride(),
boost::shared_array< sal_uInt8 >(), boost::shared_array< sal_uInt8 >(),
rProto->getPalette(), rProto->getPalette(),
NULL, nullptr,
rProto->getDamageTracker() ); rProto->getDamageTracker() );
} }

6
basebmp/test/bmpmasktest.cxx
View File

@@ -115,7 +115,7 @@ public:
OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); OUString aSvg( "m 0 0h5v10h5v-5h-10z" );
basegfx::B2DPolyPolygon aPoly; basegfx::B2DPolyPolygon aPoly;
basegfx::tools::importFromSvgD( aPoly, aSvg, false, NULL ); basegfx::tools::importFromSvgD( aPoly, aSvg, false, nullptr );
const Color aColWhite(0xFFFFFFFF); const Color aColWhite(0xFFFFFFFF);
const Color aColBlack(0); const Color aColBlack(0);
mpBmp1bpp->fillPolyPolygon( mpBmp1bpp->fillPolyPolygon(
@@ -130,7 +130,7 @@ public:
aSvg = "m 0 0 h6 v10 h-6z" ; aSvg = "m 0 0 h6 v10 h-6z" ;
aPoly.clear(); aPoly.clear();
basegfx::tools::importFromSvgD( aPoly, aSvg, false, NULL ); basegfx::tools::importFromSvgD( aPoly, aSvg, false, nullptr );
mpMaskBmp1bpp->clear(aColWhite); mpMaskBmp1bpp->clear(aColWhite);
mpMaskBmp1bpp->fillPolyPolygon( mpMaskBmp1bpp->fillPolyPolygon(
aPoly, aPoly,
@@ -178,7 +178,7 @@ public:
// punch out another piece not to copy // punch out another piece not to copy
basegfx::B2DPolyPolygon aPoly; basegfx::B2DPolyPolygon aPoly;
basegfx::tools::importFromSvgD( aPoly, "m 2 2 h4 v8 h-4z", basegfx::tools::importFromSvgD( aPoly, "m 2 2 h4 v8 h-4z",
false, NULL ); false, nullptr );
xMask->fillPolyPolygon( aPoly, basebmp::Color( 0xff, 0xff, 0xff ), xMask->fillPolyPolygon( aPoly, basebmp::Color( 0xff, 0xff, 0xff ),
DrawMode::Paint ); DrawMode::Paint );

2
basebmp/test/bmptest.cxx
View File

@@ -169,7 +169,7 @@ public:
OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); OUString aSvg( "m 0 0h5v10h5v-5h-10z" );
basegfx::B2DPolyPolygon aPoly; basegfx::B2DPolyPolygon aPoly;
basegfx::tools::importFromSvgD( aPoly, aSvg, false, NULL ); basegfx::tools::importFromSvgD( aPoly, aSvg, false, nullptr );
const Color aCol(0xFFFFFFFF); const Color aCol(0xFFFFFFFF);
mpBmp1bpp->fillPolyPolygon( mpBmp1bpp->fillPolyPolygon(
aPoly, aPoly,

4
basebmp/test/cliptest.cxx
View File

@@ -162,7 +162,7 @@ private:
OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); OUString aSvg( "m 0 0h5v10h5v-5h-10z" );
basegfx::B2DPolyPolygon aPoly; basegfx::B2DPolyPolygon aPoly;
basegfx::tools::importFromSvgD( aPoly, aSvg, false, NULL ); basegfx::tools::importFromSvgD( aPoly, aSvg, false, nullptr );
const basebmp::Color aCol(0xFF); const basebmp::Color aCol(0xFF);
pBmp->clear( basebmp::Color(0) ); pBmp->clear( basebmp::Color(0) );
pBmp->fillPolyPolygon( pBmp->fillPolyPolygon(
@@ -204,7 +204,7 @@ public:
OUString aSvg( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" ); OUString aSvg( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" );
basegfx::B2DPolyPolygon aPoly; basegfx::B2DPolyPolygon aPoly;
basegfx::tools::importFromSvgD( aPoly, aSvg, false, NULL ); basegfx::tools::importFromSvgD( aPoly, aSvg, false, nullptr );
mpClipMask->clear(Color(0)); mpClipMask->clear(Color(0));
mpClipMask->drawPolygon( mpClipMask->drawPolygon(
aPoly.getB2DPolygon(0), aPoly.getB2DPolygon(0),

2
basebmp/test/filltest.cxx
View File

@@ -149,7 +149,7 @@ private:
OUString aSvg( "m 0 0l7 7h-1z" ); OUString aSvg( "m 0 0l7 7h-1z" );
basegfx::B2DPolyPolygon aPoly; basegfx::B2DPolyPolygon aPoly;
basegfx::tools::importFromSvgD( aPoly, aSvg, false, NULL ); basegfx::tools::importFromSvgD( aPoly, aSvg, false, nullptr );
rDevice->fillPolyPolygon( rDevice->fillPolyPolygon(
aPoly, aPoly,
aCol, aCol,

2
basebmp/test/masktest.cxx
View File

@@ -119,7 +119,7 @@ public:
OUString aSvg( "m 0 0h5v10h5v-5h-10z" ); OUString aSvg( "m 0 0h5v10h5v-5h-10z" );
basegfx::B2DPolyPolygon aPoly; basegfx::B2DPolyPolygon aPoly;
basegfx::tools::importFromSvgD( aPoly, aSvg, false, NULL ); basegfx::tools::importFromSvgD( aPoly, aSvg, false, nullptr );
const Color aCol(0xFF); const Color aCol(0xFF);
mpMask->fillPolyPolygon( mpMask->fillPolyPolygon(
aPoly, aPoly,

18
basebmp/test/polytest.cxx
View File

@@ -54,7 +54,7 @@ private:
basegfx::tools::importFromSvgD( basegfx::tools::importFromSvgD(
aPoly, aPoly,
"M2 2 l7 7 z", false, NULL ); "M2 2 l7 7 z", false, nullptr );
rDevice->fillPolyPolygon( rDevice->fillPolyPolygon(
aPoly, aPoly,
aCol, aCol,
@@ -68,7 +68,7 @@ private:
aPoly.clear(); aPoly.clear();
basegfx::tools::importFromSvgD( basegfx::tools::importFromSvgD(
aPoly, aPoly,
"M7 2 l-6 6 z", false, NULL ); "M7 2 l-6 6 z", false, nullptr );
rDevice->fillPolyPolygon( rDevice->fillPolyPolygon(
aPoly, aPoly,
aCol, aCol,
@@ -86,7 +86,7 @@ private:
basegfx::tools::importFromSvgD( basegfx::tools::importFromSvgD(
aPoly, aPoly,
"M2 2 h1 l7 7 h-1 z", false, NULL ); "M2 2 h1 l7 7 h-1 z", false, nullptr );
rDevice->fillPolyPolygon( rDevice->fillPolyPolygon(
aPoly, aPoly,
aCol, aCol,
@@ -100,7 +100,7 @@ private:
aPoly.clear(); aPoly.clear();
basegfx::tools::importFromSvgD( basegfx::tools::importFromSvgD(
aPoly, 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( rDevice->fillPolyPolygon(
aPoly, aPoly,
aCol, aCol,
@@ -114,7 +114,7 @@ private:
aPoly.clear(); aPoly.clear();
basegfx::tools::importFromSvgD( basegfx::tools::importFromSvgD(
aPoly, 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( rDevice->fillPolyPolygon(
aPoly, aPoly,
aCol, aCol,
@@ -132,7 +132,7 @@ private:
basegfx::tools::importFromSvgD( aPoly, basegfx::tools::importFromSvgD( aPoly,
"M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z", "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z",
false, NULL ); false, nullptr );
rDevice->fillPolyPolygon( rDevice->fillPolyPolygon(
aPoly, aPoly,
@@ -151,7 +151,7 @@ private:
basegfx::tools::importFromSvgD( aPoly, basegfx::tools::importFromSvgD( aPoly,
"M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z", "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z",
false, NULL ); false, nullptr );
basegfx::B2DHomMatrix aMat; basegfx::B2DHomMatrix aMat;
aMat.translate(-3,-3); aMat.translate(-3,-3);
aMat.rotate( 1.7 ); aMat.rotate( 1.7 );
@@ -252,7 +252,7 @@ private:
// generate a single pixel, due to the rasterization effect. // generate a single pixel, due to the rasterization effect.
basegfx::tools::importFromSvgD( aPoly, 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", "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=( BitmapDeviceSharedPtr pClippedDevice=(
subsetBitmapDevice( rDevice, subsetBitmapDevice( rDevice,
basegfx::B2IBox(3,3,5,9) )); basegfx::B2IBox(3,3,5,9) ));
@@ -280,7 +280,7 @@ private:
"M1 0 h1 v10 h-1 z" "M1 0 h1 v10 h-1 z"
"M4 0 h1 v10 h-1 z" "M4 0 h1 v10 h-1 z"
"M8 0 h1 v10 h-1 z", "M8 0 h1 v10 h-1 z",
false, NULL ); false, nullptr );
rDevice->fillPolyPolygon( rDevice->fillPolyPolygon(
aPoly, aPoly,
aCol, aCol,