diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:28:29 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:32:00 +0100 |
commit | d3b6cb7ec2da4afb5687c9d28b2be2f96e6aa7b1 (patch) | |
tree | e9d209d6d5f06cacd8e0df78c7f6b8ad45d74be5 /vcl/source/gdi/salmisc.cxx | |
parent | 45979047abbd9da7a29401f298e8ef9ab58ad337 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I05e89f9896170d4df3d1377549ea074f06b884a0
Diffstat (limited to 'vcl/source/gdi/salmisc.cxx')
-rw-r--r-- | vcl/source/gdi/salmisc.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx index 43e450398f5f..a28c4b0fd51b 100644 --- a/vcl/source/gdi/salmisc.cxx +++ b/vcl/source/gdi/salmisc.cxx @@ -185,7 +185,7 @@ static void ImplTCToTC( const BitmapBuffer& rSrcBuffer, BitmapBuffer& rDstBuffer if( BMP_SCANLINE_FORMAT( rSrcBuffer.mnFormat ) == BMP_FORMAT_24BIT_TC_BGR ) { BitmapColor aCol; - sal_uInt8* pPixel = NULL; + sal_uInt8* pPixel = nullptr; for (long nActY = 0; nActY < rDstBuffer.mnHeight; ++nActY) { @@ -338,9 +338,9 @@ BitmapBuffer* StretchAndConvert( catch( const std::bad_alloc& ) { // memory exception, clean up - pDstBuffer->mpBits = NULL; + pDstBuffer->mpBits = nullptr; delete pDstBuffer; - return NULL; + return nullptr; } // do we need a destination palette or color mask? @@ -354,7 +354,7 @@ BitmapBuffer* StretchAndConvert( if (!pDstPal) { delete pDstBuffer; - return NULL; + return nullptr; } pDstBuffer->maPalette = *pDstPal; } @@ -368,7 +368,7 @@ BitmapBuffer* StretchAndConvert( if (!pDstMask) { delete pDstBuffer; - return NULL; + return nullptr; } pDstBuffer->maColorMask = *pDstMask; } @@ -378,10 +378,10 @@ BitmapBuffer* StretchAndConvert( if( bFastConvert ) return pDstBuffer; - Scanline* pSrcScan = NULL; - Scanline* pDstScan = NULL; - long* pMapX = NULL; - long* pMapY = NULL; + Scanline* pSrcScan = nullptr; + Scanline* pDstScan = nullptr; + long* pMapX = nullptr; + long* pMapY = nullptr; try { @@ -400,7 +400,7 @@ BitmapBuffer* StretchAndConvert( delete[] pMapX; delete[] pMapY; delete pDstBuffer; - return NULL; + return nullptr; } // horizontal mapping table |