diff options
| -rw-r--r-- | filter/source/graphicfilter/icgm/bitmap.hxx | 3 | ||||
| -rw-r--r-- | filter/source/graphicfilter/ios2met/ios2met.cxx | 3 | ||||
| -rw-r--r-- | package/source/xstor/owriteablestream.cxx | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/filter/source/graphicfilter/icgm/bitmap.hxx b/filter/source/graphicfilter/icgm/bitmap.hxx index 9db74c981578..3b6a80d2d7c1 100644 --- a/filter/source/graphicfilter/icgm/bitmap.hxx +++ b/filter/source/graphicfilter/icgm/bitmap.hxx @@ -67,8 +67,7 @@ class CGMBitmapDescriptor { if ( mpAcc ) mpBitmap->ReleaseAccess( mpAcc ); - if ( mpBitmap ) - delete mpBitmap; + delete mpBitmap; }; }; diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 214e655a6e15..e72a9d6799ec 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -730,7 +730,6 @@ void OS2METReader::SetRasterOp(RasterOp eROP) if (pVirDev->GetRasterOp()!=eROP) pVirDev->SetRasterOp(eROP); } - void OS2METReader::SetPalette0RGB(sal_uInt16 nIndex, sal_uLong nCol) { if (pPaletteStack==NULL) { @@ -751,7 +750,7 @@ void OS2METReader::SetPalette0RGB(sal_uInt16 nIndex, sal_uLong nCol) else if (i==0) pPaletteStack->p0RGB[i]=0x00ffffff; else pPaletteStack->p0RGB[i]=0; } - if (pOld0RGB!=NULL) delete[] pOld0RGB; + delete[] pOld0RGB; } pPaletteStack->p0RGB[nIndex]=nCol; } diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index 00b8d58b2b63..31a99df4d141 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -1731,8 +1731,7 @@ OWriteStream::~OWriteStream() if ( m_pData && m_pData->m_pTypeCollection ) delete m_pData->m_pTypeCollection; - if ( m_pData ) - delete m_pData; + delete m_pData; } void OWriteStream::DeInit() |