summaryrefslogtreecommitdiff
path: root/filter/source/graphicfilter/icgm/bitmap.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:15:32 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:25 +0100
commit3cdda9af2c12a9ae2a1f0bdf8ca898f1f5c69bfb (patch)
treeba25525cbc9661509d8f01e93164e0febb8a0894 /filter/source/graphicfilter/icgm/bitmap.cxx
parent7702e3128768f1b4b8a1ee9e87e397887e151af4 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I61e494952df8cc40fff3ccad0936adf06035dbeb
Diffstat (limited to 'filter/source/graphicfilter/icgm/bitmap.cxx')
-rw-r--r--filter/source/graphicfilter/icgm/bitmap.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx
index b8acf4f2215d..2243ed849f4f 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -45,7 +45,7 @@ void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc )
if ( ImplGetDimensions( rDesc ) && rDesc.mpBuf )
{
rDesc.mpBitmap = new Bitmap( Size( rDesc.mnX, rDesc.mnY ), (sal_uInt16)rDesc.mnDstBitsPerPixel );
- if ( ( rDesc.mpAcc = rDesc.mpBitmap->AcquireWriteAccess() ) != NULL )
+ if ( ( rDesc.mpAcc = rDesc.mpBitmap->AcquireWriteAccess() ) != nullptr )
{
// the picture may either be read from left to right or right to left, from top to bottom ...
@@ -204,14 +204,14 @@ void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc )
if ( rDesc.mpAcc )
{
Bitmap::ReleaseAccess( rDesc.mpAcc );
- rDesc.mpAcc = NULL;
+ rDesc.mpAcc = nullptr;
}
if ( !rDesc.mbStatus )
{
if ( rDesc.mpBitmap )
{
delete rDesc.mpBitmap;
- rDesc.mpBitmap = NULL;
+ rDesc.mpBitmap = nullptr;
}
}
}
@@ -367,7 +367,7 @@ CGMBitmap* CGMBitmap::GetNext()
{
ImplInsert( *(pCGMTempBitmap->pCGMBitmapDescriptor), *(pCGMBitmapDescriptor) );
delete pCGMTempBitmap;
- return NULL;
+ return nullptr;
}
CGMBitmapDescriptor* pTempBD = pCGMBitmapDescriptor;
@@ -376,7 +376,7 @@ CGMBitmap* CGMBitmap::GetNext()
return pCGMTempBitmap;
}
else
- return NULL;
+ return nullptr;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */