summaryrefslogtreecommitdiff
path: root/filter/source/graphicfilter/icgm
diff options
context:
space:
mode:
Diffstat (limited to 'filter/source/graphicfilter/icgm')
-rw-r--r--filter/source/graphicfilter/icgm/bitmap.cxx10
-rw-r--r--filter/source/graphicfilter/icgm/bitmap.hxx6
-rw-r--r--filter/source/graphicfilter/icgm/bundles.cxx8
-rw-r--r--filter/source/graphicfilter/icgm/cgm.cxx22
-rw-r--r--filter/source/graphicfilter/icgm/chart.cxx2
-rw-r--r--filter/source/graphicfilter/icgm/class0.cxx6
-rw-r--r--filter/source/graphicfilter/icgm/class4.cxx4
-rw-r--r--filter/source/graphicfilter/icgm/class7.cxx6
-rw-r--r--filter/source/graphicfilter/icgm/elements.cxx2
-rw-r--r--filter/source/graphicfilter/icgm/outact.cxx2
10 files changed, 34 insertions, 34 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: */
diff --git a/filter/source/graphicfilter/icgm/bitmap.hxx b/filter/source/graphicfilter/icgm/bitmap.hxx
index d60a7d825009..96639d12ebcd 100644
--- a/filter/source/graphicfilter/icgm/bitmap.hxx
+++ b/filter/source/graphicfilter/icgm/bitmap.hxx
@@ -47,9 +47,9 @@ class CGMBitmapDescriptor
sal_uInt32 mnCompressionMode;
CGMBitmapDescriptor()
- : mpBuf(NULL)
- , mpBitmap(NULL)
- , mpAcc(NULL)
+ : mpBuf(nullptr)
+ , mpBitmap(nullptr)
+ , mpAcc(nullptr)
, mbStatus(false)
, mbVMirror(false)
, mbHMirror(false)
diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx
index 6062b9b3a9c5..f59182d7a7f2 100644
--- a/filter/source/graphicfilter/icgm/bundles.cxx
+++ b/filter/source/graphicfilter/icgm/bundles.cxx
@@ -84,9 +84,9 @@ FillBundle& FillBundle::operator=( FillBundle& rSource )
};
FontEntry::FontEntry() :
- pFontName ( NULL ),
+ pFontName ( nullptr ),
eCharSetType ( CST_CCOMPLETE ),
- pCharSetValue ( NULL ),
+ pCharSetValue ( nullptr ),
nFontType ( 0 )
{
}
@@ -148,7 +148,7 @@ FontEntry* CGMFList::GetFontEntry( sal_uInt32 nIndex )
sal_uInt32 nInd = nIndex;
if ( nInd )
nInd--;
- return ( nInd < aFontEntryList.size() ) ? aFontEntryList[ nInd ] : NULL;
+ return ( nInd < aFontEntryList.size() ) ? aFontEntryList[ nInd ] : nullptr;
}
@@ -167,7 +167,7 @@ static sal_Int8* ImplSearchEntry( sal_Int8* pSource, sal_Int8 const * pDest, sal
return pSource;
pSource++;
}
- return NULL;
+ return nullptr;
}
void CGMFList::InsertName( sal_uInt8* pSource, sal_uInt32 nSize )
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index 5a7395fffd06..ead44f8fc411 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -44,7 +44,7 @@ CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > const & rModel )
, mnXFraction(0)
, mnYFraction(0)
, mbAngReverse(false)
- , mpGraphic(NULL)
+ , mpGraphic(nullptr)
, mbStatus(true)
, mbMetaFile(false)
, mbIsFinished(false)
@@ -53,20 +53,20 @@ CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > const & rModel )
, mbFigure(false)
, mbFirstOutPut(false)
, mnAct4PostReset(0)
- , mpBitmapInUse(NULL)
- , mpChart(NULL)
+ , mpBitmapInUse(nullptr)
+ , mpChart(nullptr)
, mpOutAct(new CGMImpressOutAct(*this, rModel))
- , mpSource(NULL)
- , mpEndValidSource(NULL)
+ , mpSource(nullptr)
+ , mpEndValidSource(nullptr)
, mnParaSize(0)
, mnActCount(0)
- , mpBuf(NULL)
+ , mpBuf(nullptr)
, mnMode(nMode | CGM_EXPORT_IMPRESS)
, mnEscape(0)
, mnElementClass(0)
, mnElementID(0)
, mnElementSize(0)
- , mpGDIMetaFile(NULL)
+ , mpGDIMetaFile(nullptr)
{
pElement = new CGMElements( *this );
pCopyOfE = new CGMElements( *this );
@@ -102,7 +102,7 @@ sal_uInt32 CGM::ImplGetUI16( sal_uInt32 /*nAlign*/ )
{
sal_uInt8* pSource = mpSource + mnParaSize;
if (pSource + 2 > mpEndValidSource)
- throw css::uno::Exception("attempt to read past end of input", 0);
+ throw css::uno::Exception("attempt to read past end of input", nullptr);
mnParaSize += 2;
return ( pSource[ 0 ] << 8 ) + pSource[ 1 ];
};
@@ -116,7 +116,7 @@ sal_Int32 CGM::ImplGetI( sal_uInt32 nPrecision )
{
sal_uInt8* pSource = mpSource + mnParaSize;
if (pSource + nPrecision > mpEndValidSource)
- throw css::uno::Exception("attempt to read past end of input", 0);
+ throw css::uno::Exception("attempt to read past end of input", nullptr);
mnParaSize += nPrecision;
switch( nPrecision )
{
@@ -148,7 +148,7 @@ sal_uInt32 CGM::ImplGetUI( sal_uInt32 nPrecision )
{
sal_uInt8* pSource = mpSource + mnParaSize;
if (pSource + nPrecision > mpEndValidSource)
- throw css::uno::Exception("attempt to read past end of input", 0);
+ throw css::uno::Exception("attempt to read past end of input", nullptr);
mnParaSize += nPrecision;
switch( nPrecision )
{
@@ -203,7 +203,7 @@ double CGM::ImplGetFloat( RealPrecision eRealPrecision, sal_uInt32 nRealSize )
#endif
if (mpSource + mnParaSize + nRealSize > mpEndValidSource)
- throw css::uno::Exception("attempt to read past end of input", 0);
+ throw css::uno::Exception("attempt to read past end of input", nullptr);
if ( bCompatible )
{
diff --git a/filter/source/graphicfilter/icgm/chart.cxx b/filter/source/graphicfilter/icgm/chart.cxx
index f5e179afd4de..73961fe64e14 100644
--- a/filter/source/graphicfilter/icgm/chart.cxx
+++ b/filter/source/graphicfilter/icgm/chart.cxx
@@ -49,7 +49,7 @@ void CGMChart::DeleteTextEntry( TextEntry* pTextEntry )
if ( pTextEntry )
{
delete pTextEntry->pText;
- for ( TextAttribute* pTAttr = pTextEntry->pAttribute; pTAttr != NULL ; )
+ for ( TextAttribute* pTAttr = pTextEntry->pAttribute; pTAttr != nullptr ; )
{
TextAttribute* pTempTAttr = pTAttr;
pTAttr = pTAttr->pNextAttribute;
diff --git a/filter/source/graphicfilter/icgm/class0.cxx b/filter/source/graphicfilter/icgm/class0.cxx
index 76691416eb73..12305f9c8bc6 100644
--- a/filter/source/graphicfilter/icgm/class0.cxx
+++ b/filter/source/graphicfilter/icgm/class0.cxx
@@ -40,7 +40,7 @@ void CGM::ImplDoClass0()
// do anything with the bitmap
mpOutAct->DrawBitmap( pBmpDesc );
delete mpBitmapInUse;
- mpBitmapInUse = NULL;
+ mpBitmapInUse = nullptr;
}
mbIsFinished = true;
mbPictureBody = false;
@@ -59,7 +59,7 @@ void CGM::ImplDoClass0()
mbPicture = mbFirstOutPut = true;
mbFigure = false;
mnAct4PostReset = 0;
- if ( mpChart == NULL ) // normal CGM Files determines "BeginPic"
+ if ( mpChart == nullptr ) // normal CGM Files determines "BeginPic"
mpOutAct->InsertPage(); // as the next slide
}
}
@@ -77,7 +77,7 @@ void CGM::ImplDoClass0()
// do anything with the bitmap
mpOutAct->DrawBitmap( pBmpDesc );
delete mpBitmapInUse;
- mpBitmapInUse = NULL;
+ mpBitmapInUse = nullptr;
}
mpOutAct->EndFigure(); // close potential figures
mpOutAct->EndGrouping(); // finish potential groups
diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx
index c5c05db5f99a..fbd800c38779 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -116,10 +116,10 @@ void CGM::ImplDoClass4()
// do anything with the bitmap
mpOutAct->DrawBitmap( pBmpDesc );
delete mpBitmapInUse;
- mpBitmapInUse = NULL;
+ mpBitmapInUse = nullptr;
}
- if ( ( mpChart == NULL ) || mpChart->IsAnnotation() )
+ if ( ( mpChart == nullptr ) || mpChart->IsAnnotation() )
{
switch ( mnElementID )
{
diff --git a/filter/source/graphicfilter/icgm/class7.cxx b/filter/source/graphicfilter/icgm/class7.cxx
index 7a9c79a81169..21951e8fc79f 100644
--- a/filter/source/graphicfilter/icgm/class7.cxx
+++ b/filter/source/graphicfilter/icgm/class7.cxx
@@ -41,7 +41,7 @@ void CGM::ImplDoClass7()
{
case 0x000 : /*AppData - Beginning of File Opcodes*/
{
- if ( mpChart == NULL )
+ if ( mpChart == nullptr )
mpChart = new CGMChart( *this );
mpChart->mnCurrentFileType = pAppData[ 3 ];
}
@@ -120,14 +120,14 @@ void CGM::ImplDoClass7()
memcpy( pTextEntry->pText, pAppData, nLen );
pAppData += nLen;
- TextAttribute* pTextOld = 0;
+ TextAttribute* pTextOld = nullptr;
for ( sal_uInt16 i = 0; i < nAttributes; i++ )
{
TextAttribute* pTextAttr = new TextAttribute;
*pTextAttr = *reinterpret_cast<TextAttribute*>( pAppData );
- pTextAttr->pNextAttribute = NULL;
+ pTextAttr->pNextAttribute = nullptr;
if ( i == 0 )
pTextEntry->pAttribute = pTextAttr;
else
diff --git a/filter/source/graphicfilter/icgm/elements.cxx b/filter/source/graphicfilter/icgm/elements.cxx
index fc85f2870ac3..2be1308355aa 100644
--- a/filter/source/graphicfilter/icgm/elements.cxx
+++ b/filter/source/graphicfilter/icgm/elements.cxx
@@ -341,7 +341,7 @@ Bundle* CGMElements::GetBundle( BundleList& rList, long nIndex )
return rList[ i ];
}
}
- return NULL;
+ return nullptr;
}
diff --git a/filter/source/graphicfilter/icgm/outact.cxx b/filter/source/graphicfilter/icgm/outact.cxx
index c731fbb40815..028ed60463a4 100644
--- a/filter/source/graphicfilter/icgm/outact.cxx
+++ b/filter/source/graphicfilter/icgm/outact.cxx
@@ -33,7 +33,7 @@ CGMOutAct::CGMOutAct( CGM& rCGM )
mpFlags = new sal_uInt8[ 0x2000 ];
mnIndex = 0;
- mpGradient = NULL;
+ mpGradient = nullptr;
}
CGMOutAct::~CGMOutAct()
generated by cgit (git 2.34.1) at 2024-07-16 23:35:21 +0000