summaryrefslogtreecommitdiff
path: root/include/vcl/salbtype.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:28:29 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:32:00 +0100
commitd3b6cb7ec2da4afb5687c9d28b2be2f96e6aa7b1 (patch)
treee9d209d6d5f06cacd8e0df78c7f6b8ad45d74be5 /include/vcl/salbtype.hxx
parent45979047abbd9da7a29401f298e8ef9ab58ad337 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I05e89f9896170d4df3d1377549ea074f06b884a0
Diffstat (limited to 'include/vcl/salbtype.hxx')
-rw-r--r--include/vcl/salbtype.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 9f2dd656c497..6037bdcfb1dc 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -289,7 +289,7 @@ BitmapAccessMode;
// - StretchAndConvert -
VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert(
const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect,
- sal_uLong nDstBitmapFormat, const BitmapPalette* pDstPal = NULL, const ColorMask* pDstMask = NULL );
+ sal_uLong nDstBitmapFormat, const BitmapPalette* pDstPal = nullptr, const ColorMask* pDstMask = nullptr );
inline BitmapColor::BitmapColor() :
mcBlueOrIndex ( 0 ),
@@ -442,7 +442,7 @@ inline sal_uInt16 BitmapColor::GetColorError( const BitmapColor& rBitmapColor )
}
inline BitmapPalette::BitmapPalette() :
- mpBitmapColor ( NULL ),
+ mpBitmapColor ( nullptr ),
mnCount ( 0 )
{
}
@@ -457,7 +457,7 @@ inline BitmapPalette::BitmapPalette( const BitmapPalette& rBitmapPalette ) :
memcpy( mpBitmapColor, rBitmapPalette.mpBitmapColor, nSize );
}
else
- mpBitmapColor = NULL;
+ mpBitmapColor = nullptr;
}
inline BitmapPalette::BitmapPalette( sal_uInt16 nCount ) :
@@ -470,7 +470,7 @@ inline BitmapPalette::BitmapPalette( sal_uInt16 nCount ) :
memset( mpBitmapColor, 0, nSize );
}
else
- mpBitmapColor = NULL;
+ mpBitmapColor = nullptr;
}
inline BitmapPalette::~BitmapPalette()
@@ -490,7 +490,7 @@ inline BitmapPalette& BitmapPalette::operator=( const BitmapPalette& rBitmapPale
memcpy( mpBitmapColor, rBitmapPalette.mpBitmapColor, nSize );
}
else
- mpBitmapColor = NULL;
+ mpBitmapColor = nullptr;
return *this;
}
@@ -536,7 +536,7 @@ inline void BitmapPalette::SetEntryCount( sal_uInt16 nCount )
if( !nCount )
{
delete[] reinterpret_cast<sal_uInt8*>(mpBitmapColor);
- mpBitmapColor = NULL;
+ mpBitmapColor = nullptr;
mnCount = 0;
}
else if( nCount != mnCount )