loplugin:nullptr (automatic rewrite)

Change-Id: I05e89f9896170d4df3d1377549ea074f06b884a0

5 files changed, 72 insertions, 72 deletions

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 11d53c72e1b4..bef54776e6b8 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -86,7 +86,7 @@ static void InitGammaTable()
     }
 }
 
-static FT_Library aLibFT = 0;
+static FT_Library aLibFT = nullptr;
 
 // enable linking with old FT versions
 static int nFTVERSION = 0;
@@ -110,7 +110,7 @@ static int nDefaultPrioAntiAlias   = 1;
 
 FtFontFile::FtFontFile( const OString& rNativeFileName )
 :   maNativeFileName( rNativeFileName ),
-    mpFileMap( NULL ),
+    mpFileMap( nullptr ),
     mnFileSize( 0 ),
     mnRefCount( 0 ),
     mnLangBoost( 0 )
@@ -121,7 +121,7 @@ FtFontFile::FtFontFile( const OString& rNativeFileName )
         mnLangBoost += 0x1000;     // no langinfo => good
     else
     {
-        static const char* pLangBoost = NULL;
+        static const char* pLangBoost = nullptr;
         static bool bOnce = true;
         if( bOnce )
         {
@@ -168,22 +168,22 @@ bool FtFontFile::Map()
         }
         mnFileSize = aStat.st_size;
         mpFileMap = static_cast<unsigned char*>(
-            mmap( NULL, mnFileSize, PROT_READ, MAP_SHARED, nFile, 0 ));
+            mmap( nullptr, mnFileSize, PROT_READ, MAP_SHARED, nFile, 0 ));
         if( mpFileMap == MAP_FAILED )
-            mpFileMap = NULL;
+            mpFileMap = nullptr;
         close( nFile );
     }
 
-    return (mpFileMap != NULL);
+    return (mpFileMap != nullptr);
 }
 
 void FtFontFile::Unmap()
 {
-    if( (--mnRefCount > 0) || (mpFileMap == NULL) )
+    if( (--mnRefCount > 0) || (mpFileMap == nullptr) )
         return;
 
     munmap( mpFileMap, mnFileSize );
-    mpFileMap = NULL;
+    mpFileMap = nullptr;
 }
 
 #if ENABLE_GRAPHITE
@@ -216,19 +216,19 @@ const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, siz
 FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes,
     const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId)
 :
-    maFaceFT( NULL ),
+    maFaceFT( nullptr ),
     mpFontFile( FtFontFile::FindFontFile( rNativeFileName ) ),
     mnFaceNum( nFaceNum ),
     mnRefCount( 0 ),
 #if ENABLE_GRAPHITE
     mbCheckedGraphite(false),
-    mpGraphiteFace(NULL),
+    mpGraphiteFace(nullptr),
 #endif
     mnFontId( nFontId ),
     maDevFontAttributes( rDevFontAttributes ),
-    mpFontCharMap( NULL ),
-    mpChar2Glyph( NULL ),
-    mpGlyph2Char( NULL )
+    mpFontCharMap( nullptr ),
+    mpChar2Glyph( nullptr ),
+    mpGlyph2Char( nullptr )
 {
     // prefer font with low ID
     maDevFontAttributes.mnQuality += 10000 - nFontId;
@@ -239,7 +239,7 @@ FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes,
 FtFontInfo::~FtFontInfo()
 {
     if( mpFontCharMap )
-        mpFontCharMap = 0;
+        mpFontCharMap = nullptr;
     delete mpChar2Glyph;
     delete mpGlyph2Char;
 #if ENABLE_GRAPHITE
@@ -262,7 +262,7 @@ FT_FaceRec_* FtFontInfo::GetFaceFT()
             mpFontFile->GetBuffer(),
             mpFontFile->GetFileSize(), mnFaceNum, &maFaceFT );
         if( (rc != FT_Err_Ok) || (maFaceFT->num_glyphs <= 0) )
-            maFaceFT = NULL;
+            maFaceFT = nullptr;
     }
 
    ++mnRefCount;
@@ -297,7 +297,7 @@ void FtFontInfo::ReleaseFaceFT()
     if (--mnRefCount <= 0)
     {
         FT_Done_Face( maFaceFT );
-        maFaceFT = NULL;
+        maFaceFT = nullptr;
         mpFontFile->Unmap();
     }
 }
@@ -315,7 +315,7 @@ const unsigned char* FtFontInfo::GetTable( const char* pTag, sal_uLong* pLength
     const unsigned char* pBuffer = mpFontFile->GetBuffer();
     int nFileSize = mpFontFile->GetFileSize();
     if( !pBuffer || nFileSize<1024 )
-        return NULL;
+        return nullptr;
 
     // we currently handle TTF, TTC and OTF headers
     unsigned nFormat = GetUInt( pBuffer );
@@ -324,18 +324,18 @@ const unsigned char* FtFontInfo::GetTable( const char* pTag, sal_uLong* pLength
     if( nFormat == T_ttcf )         // TTC_MAGIC
         p += GetUInt( p + 4 * mnFaceNum );
     else if( nFormat != 0x00010000 && nFormat != T_true && nFormat != T_otto) // TTF_MAGIC and Apple TTF Magic and PS-OpenType font
-        return NULL;
+        return nullptr;
 
     // walk table directory until match
     int nTables = GetUShort( p - 8 );
     if( nTables >= 64 )  // something fishy?
-        return NULL;
+        return nullptr;
     for( int i = 0; i < nTables; ++i, p+=16 )
     {
         if( p[0]==pTag[0] && p[1]==pTag[1] && p[2]==pTag[2] && p[3]==pTag[3] )
         {
             sal_uLong nLength = GetUInt( p + 12 );
-            if( pLength != NULL )
+            if( pLength != nullptr )
                 *pLength = nLength;
             const unsigned char* pTable = pBuffer + GetUInt( p + 8 );
             if( (pTable + nLength) <= (mpFontFile->GetBuffer() + nFileSize) )
@@ -343,7 +343,7 @@ const unsigned char* FtFontInfo::GetTable( const char* pTag, sal_uLong* pLength
         }
     }
 
-    return NULL;
+    return nullptr;
 }
 
 void FtFontInfo::AnnounceFont( PhysicalFontCollection* pFontCollection )
@@ -426,7 +426,7 @@ void FreetypeManager::ClearFontList( )
 
 ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD )
 {
-    FtFontInfo* pFontInfo = NULL;
+    FtFontInfo* pFontInfo = nullptr;
 
     // find a FontInfo matching to the font id
     sal_IntPtr nFontId = reinterpret_cast<sal_IntPtr>( rFSD.mpFontData );
@@ -435,7 +435,7 @@ ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD )
         pFontInfo = it->second;
 
     if( !pFontInfo )
-        return NULL;
+        return nullptr;
 
     ServerFont* pNew = new ServerFont( rFSD, pFontInfo );
 
@@ -463,8 +463,8 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI )
     maFontSelData(rFSD),
     mnRefCount(1),
     mnBytesUsed( sizeof(ServerFont) ),
-    mpPrevGCFont( NULL ),
-    mpNextGCFont( NULL ),
+    mpPrevGCFont( nullptr ),
+    mpNextGCFont( nullptr ),
     mnCos( 0x10000),
     mnSin( 0 ),
     mbCollectedZW( false ),
@@ -473,13 +473,13 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI )
     mnPrioAutoHint(nDefaultPrioAutoHint),
     mpFontInfo( pFI ),
     mnLoadFlags( 0 ),
-    maFaceFT( NULL ),
-    maSizeFT( NULL ),
+    maFaceFT( nullptr ),
+    maSizeFT( nullptr ),
     mbFaceOk( false ),
     mbArtItalic( false ),
     mbArtBold( false ),
     mbUseGamma( false ),
-    mpLayoutEngine( NULL )
+    mpLayoutEngine( nullptr )
 {
     // TODO: move update of mpFontEntry into FontEntry class when
     // it becomes responsible for the ServerFont instantiation
@@ -815,13 +815,13 @@ int ServerFont::ApplyGlyphTransform( int nGlyphFlags,
 
     if( pGlyphFT->format != FT_GLYPH_FORMAT_BITMAP )
     {
-        FT_Glyph_Transform( pGlyphFT, NULL, &aVector );
+        FT_Glyph_Transform( pGlyphFT, nullptr, &aVector );
 
         // orthogonal transforms are better handled by bitmap operations
         if( bStretched || (bForBitmapProcessing && (nAngle % 900) != 0) )
         {
             // apply non-orthogonal or stretch transformations
-            FT_Glyph_Transform( pGlyphFT, &aMatrix, NULL );
+            FT_Glyph_Transform( pGlyphFT, &aMatrix, nullptr );
             nAngle = 0;
         }
     }
@@ -1029,7 +1029,7 @@ bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
         FT_Matrix aMatrix;
         aMatrix.xx = aMatrix.yy = 0x10000L;
         aMatrix.xy = 0x6000L, aMatrix.yx = 0;
-        FT_Glyph_Transform( pGlyphFT, &aMatrix, NULL );
+        FT_Glyph_Transform( pGlyphFT, &aMatrix, nullptr );
     }
 
     // Check for zero area bounding boxes as this crashes some versions of FT.
@@ -1051,7 +1051,7 @@ bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
             reinterpret_cast<FT_OutlineGlyphRec*>(pGlyphFT)->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
         FT_Render_Mode nRenderMode = FT_RENDER_MODE_MONO;
 
-        rc = FT_Glyph_To_Bitmap( &pGlyphFT, nRenderMode, NULL, true );
+        rc = FT_Glyph_To_Bitmap( &pGlyphFT, nRenderMode, nullptr, true );
         if( rc != FT_Err_Ok )
         {
             FT_Done_Glyph( pGlyphFT );
@@ -1162,7 +1162,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
         FT_Matrix aMatrix;
         aMatrix.xx = aMatrix.yy = 0x10000L;
         aMatrix.xy = 0x6000L, aMatrix.yx = 0;
-        FT_Glyph_Transform( pGlyphFT, &aMatrix, NULL );
+        FT_Glyph_Transform( pGlyphFT, &aMatrix, nullptr );
     }
 
     if( pGlyphFT->format == FT_GLYPH_FORMAT_OUTLINE )
@@ -1171,7 +1171,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
     bool bEmbedded = (pGlyphFT->format == FT_GLYPH_FORMAT_BITMAP);
     if( !bEmbedded )
     {
-        rc = FT_Glyph_To_Bitmap( &pGlyphFT, FT_RENDER_MODE_NORMAL, NULL, true );
+        rc = FT_Glyph_To_Bitmap( &pGlyphFT, FT_RENDER_MODE_NORMAL, nullptr, true );
         if( rc != FT_Err_Ok )
         {
             FT_Done_Glyph( pGlyphFT );
@@ -1433,7 +1433,7 @@ void PolyArgs::ClosePolygon()
     DBG_ASSERT( (mpFlagAry[0]==POLY_NORMAL), "FTGlyphOutline: PolyFinishFE failed!" );
     DBG_ASSERT( (mpFlagAry[mnPoints]==POLY_NORMAL), "FTGlyphOutline: PolyFinishFS failed!" );
 
-    tools::Polygon aPoly( mnPoints, mpPointAry, (bHasOffline ? mpFlagAry : NULL) );
+    tools::Polygon aPoly( mnPoints, mpPointAry, (bHasOffline ? mpFlagAry : nullptr) );
 
     // #i35928#
     // This may be a invalid polygons, e.g. the last point is a control point.
@@ -1556,7 +1556,7 @@ bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId,
         FT_Matrix aMatrix;
         aMatrix.xx = aMatrix.yy = 0x10000L;
         aMatrix.xy = 0x6000L, aMatrix.yx = 0;
-        FT_Glyph_Transform( pGlyphFT, &aMatrix, NULL );
+        FT_Glyph_Transform( pGlyphFT, &aMatrix, nullptr );
     }
 
     FT_Outline& rOutline = reinterpret_cast<FT_OutlineGlyphRec*>(pGlyphFT)->outline;
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index cddddbc93065..82b52b30ee81 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -63,7 +63,7 @@ public:
                                int nFaceNum, sal_IntPtr nFontId);
                           ~FtFontInfo();
 
-    const unsigned char*  GetTable( const char*, sal_uLong* pLength=0 ) const;
+    const unsigned char*  GetTable( const char*, sal_uLong* pLength=nullptr ) const;
 
     FT_FaceRec_*          GetFaceFT();
 #if ENABLE_GRAPHITE
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index 976c339df5ea..83498f6bb8d5 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -57,7 +57,7 @@ void ServerFontLayout::AdjustLayout( ImplLayoutArgs& rArgs )
     // apply asian kerning if the glyphs are not already formatted
     if( (rArgs.mnFlags & SalLayoutFlags::KerningAsian)
     && !(rArgs.mnFlags & SalLayoutFlags::Vertical) )
-        if( (rArgs.mpDXArray != NULL) || (rArgs.mnLayoutWidth != 0) )
+        if( (rArgs.mpDXArray != nullptr) || (rArgs.mnLayoutWidth != 0) )
             ApplyAsianKerning(rArgs.mrStr);
 
     // insert kashidas where requested by the formatting array
@@ -131,9 +131,9 @@ static hb_blob_t *getFontTable(hb_face_t* /*face*/, hb_tag_t nTableTag, void* pU
     sal_uLong nLength;
     const unsigned char* pBuffer = pFont->GetTable(pTagName, &nLength);
 
-    hb_blob_t* pBlob = NULL;
-    if (pBuffer != NULL)
-        pBlob = hb_blob_create(reinterpret_cast<const char*>(pBuffer), nLength, HB_MEMORY_MODE_READONLY, const_cast<unsigned char *>(pBuffer), NULL);
+    hb_blob_t* pBlob = nullptr;
+    if (pBuffer != nullptr)
+        pBlob = hb_blob_create(reinterpret_cast<const char*>(pBuffer), nLength, HB_MEMORY_MODE_READONLY, const_cast<unsigned char *>(pBuffer), nullptr);
 
     return pBlob;
 }
@@ -276,15 +276,15 @@ static hb_font_funcs_t* getFontFuncs()
 {
     static hb_font_funcs_t* funcs = hb_font_funcs_create();
 
-    hb_font_funcs_set_glyph_func                (funcs, getFontGlyph, NULL, NULL);
-    hb_font_funcs_set_glyph_h_advance_func      (funcs, getGlyphAdvanceH, NULL, NULL);
-    hb_font_funcs_set_glyph_v_advance_func      (funcs, getGlyphAdvanceV, NULL, NULL);
-    hb_font_funcs_set_glyph_h_origin_func       (funcs, getGlyphOriginH, NULL, NULL);
-    hb_font_funcs_set_glyph_v_origin_func       (funcs, getGlyphOriginV, NULL, NULL);
-    hb_font_funcs_set_glyph_h_kerning_func      (funcs, getGlyphKerningH, NULL, NULL);
-    hb_font_funcs_set_glyph_v_kerning_func      (funcs, getGlyphKerningV, NULL, NULL);
-    hb_font_funcs_set_glyph_extents_func        (funcs, getGlyphExtents, NULL, NULL);
-    hb_font_funcs_set_glyph_contour_point_func  (funcs, getGlyphContourPoint, NULL, NULL);
+    hb_font_funcs_set_glyph_func                (funcs, getFontGlyph, nullptr, nullptr);
+    hb_font_funcs_set_glyph_h_advance_func      (funcs, getGlyphAdvanceH, nullptr, nullptr);
+    hb_font_funcs_set_glyph_v_advance_func      (funcs, getGlyphAdvanceV, nullptr, nullptr);
+    hb_font_funcs_set_glyph_h_origin_func       (funcs, getGlyphOriginH, nullptr, nullptr);
+    hb_font_funcs_set_glyph_v_origin_func       (funcs, getGlyphOriginV, nullptr, nullptr);
+    hb_font_funcs_set_glyph_h_kerning_func      (funcs, getGlyphKerningH, nullptr, nullptr);
+    hb_font_funcs_set_glyph_v_kerning_func      (funcs, getGlyphKerningV, nullptr, nullptr);
+    hb_font_funcs_set_glyph_extents_func        (funcs, getGlyphExtents, nullptr, nullptr);
+    hb_font_funcs_set_glyph_contour_point_func  (funcs, getGlyphContourPoint, nullptr, nullptr);
 
     return funcs;
 }
@@ -301,7 +301,7 @@ static unsigned int unicodeDecomposeCompatibility(hb_unicode_funcs_t* /*ufuncs*/
 static hb_unicode_funcs_t* getUnicodeFuncs()
 {
     static hb_unicode_funcs_t* ufuncs = hb_unicode_funcs_create(hb_icu_get_unicode_funcs());
-    hb_unicode_funcs_set_decompose_compatibility_func(ufuncs, unicodeDecomposeCompatibility, NULL, NULL);
+    hb_unicode_funcs_set_decompose_compatibility_func(ufuncs, unicodeDecomposeCompatibility, nullptr, nullptr);
     return ufuncs;
 }
 
@@ -321,13 +321,13 @@ public:
 
 HbLayoutEngine::HbLayoutEngine(ServerFont& rServerFont)
 :   maHbScript(HB_SCRIPT_INVALID),
-    mpHbFace(NULL),
+    mpHbFace(nullptr),
     mnUnitsPerEM(0)
 {
     FT_Face aFtFace = rServerFont.GetFtFace();
     mnUnitsPerEM = rServerFont.GetEmUnits();
 
-    mpHbFace = hb_face_create_for_tables(getFontTable, &rServerFont, NULL);
+    mpHbFace = hb_face_create_for_tables(getFontTable, &rServerFont, nullptr);
     hb_face_set_index(mpHbFace, aFtFace->face_index);
     hb_face_set_upem(mpHbFace, mnUnitsPerEM);
 }
@@ -396,7 +396,7 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
     static hb_font_funcs_t* pHbFontFuncs = getFontFuncs();
 
     hb_font_t *pHbFont = hb_font_create(mpHbFace);
-    hb_font_set_funcs(pHbFont, pHbFontFuncs, &rFont, NULL);
+    hb_font_set_funcs(pHbFont, pHbFontFuncs, &rFont, nullptr);
     hb_font_set_scale(pHbFont,
             ((uint64_t) aFtFace->size->metrics.x_scale * (uint64_t) mnUnitsPerEM) >> 16,
             ((uint64_t) aFtFace->size->metrics.y_scale * (uint64_t) mnUnitsPerEM) >> 16);
@@ -484,11 +484,11 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
             hb_buffer_set_language(pHbBuffer, hb_language_from_string(sLanguage.getStr(), -1));
             hb_buffer_set_flags(pHbBuffer, (hb_buffer_flags_t) nHbFlags);
             hb_buffer_add_utf16(pHbBuffer, pStr, nLength, nMinRunPos, nRunLen);
-            hb_shape(pHbFont, pHbBuffer, NULL, 0);
+            hb_shape(pHbFont, pHbBuffer, nullptr, 0);
 
             int nRunGlyphCount = hb_buffer_get_length(pHbBuffer);
-            hb_glyph_info_t *pHbGlyphInfos = hb_buffer_get_glyph_infos(pHbBuffer, NULL);
-            hb_glyph_position_t *pHbPositions = hb_buffer_get_glyph_positions(pHbBuffer, NULL);
+            hb_glyph_info_t *pHbGlyphInfos = hb_buffer_get_glyph_infos(pHbBuffer, nullptr);
+            hb_glyph_position_t *pHbPositions = hb_buffer_get_glyph_positions(pHbBuffer, nullptr);
 
             for (int i = 0; i < nRunGlyphCount; ++i) {
                 int32_t nGlyphIndex = pHbGlyphInfos[i].codepoint;
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index 6f9e6114327f..79c827966cc7 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -34,7 +34,7 @@
 #include <osl/file.hxx>
 #include <tools/debug.hxx>
 
-static GlyphCache* pInstance = NULL;
+static GlyphCache* pInstance = nullptr;
 
 GlyphCache::GlyphCache( GlyphCachePeer& rPeer )
 :   mrPeer( rPeer ),
@@ -42,8 +42,8 @@ GlyphCache::GlyphCache( GlyphCachePeer& rPeer )
     mnBytesUsed(sizeof(GlyphCache)),
     mnLruIndex(0),
     mnGlyphCount(0),
-    mpCurrentGCFont(NULL),
-    mpFtManager(NULL)
+    mpCurrentGCFont(nullptr),
+    mpFtManager(nullptr)
 {
     pInstance = this;
     mpFtManager = new FreetypeManager;
@@ -67,7 +67,7 @@ void GlyphCache::InvalidateAllGlyphs()
     }
 
     maFontList.clear();
-    mpCurrentGCFont = NULL;
+    mpCurrentGCFont = nullptr;
 }
 
 inline
@@ -170,12 +170,12 @@ void GlyphCache::ClearFontCache()
 ServerFont* GlyphCache::CacheFont( const FontSelectPattern& rFontSelData )
 {
     // a serverfont request has pFontData
-    if( rFontSelData.mpFontData == NULL )
-        return NULL;
+    if( rFontSelData.mpFontData == nullptr )
+        return nullptr;
     // a serverfont request has a fontid > 0
     sal_IntPtr nFontId = rFontSelData.mpFontData->GetFontId();
     if( nFontId <= 0 )
-        return NULL;
+        return nullptr;
 
     // the FontList's key mpFontData member is reinterpreted as font id
     FontSelectPattern aFontSelData = rFontSelData;
@@ -190,7 +190,7 @@ ServerFont* GlyphCache::CacheFont( const FontSelectPattern& rFontSelData )
     }
 
     // font not cached yet => create new font item
-    ServerFont* pNew = NULL;
+    ServerFont* pNew = nullptr;
     if( mpFtManager )
         pNew = mpFtManager->CreateFont( aFontSelData );
 
@@ -259,7 +259,7 @@ void GlyphCache::GarbageCollect()
         // free all pServerFont related data
         pServerFont->GarbageCollect( mnLruIndex+0x10000000 );
         if( pServerFont == mpCurrentGCFont )
-            mpCurrentGCFont = NULL;
+            mpCurrentGCFont = nullptr;
         const FontSelectPattern& rIFSD = pServerFont->GetFontSelData();
         maFontList.erase( rIFSD );
         mrPeer.RemovingFont( *pServerFont );
@@ -271,7 +271,7 @@ void GlyphCache::GarbageCollect()
         if( pServerFont->mpNextGCFont )
             pServerFont->mpNextGCFont->mpPrevGCFont = pServerFont->mpPrevGCFont;
         if( pServerFont == mpCurrentGCFont )
-            mpCurrentGCFont = NULL;
+            mpCurrentGCFont = nullptr;
 
         delete pServerFont;
     }
@@ -310,8 +310,8 @@ void ServerFont::ReleaseFromGarbageCollect()
     ServerFont* pNext = mpNextGCFont;
     if( pPrev ) pPrev->mpNextGCFont = pNext;
     if( pNext ) pNext->mpPrevGCFont = pPrev;
-    mpPrevGCFont = NULL;
-    mpNextGCFont = NULL;
+    mpPrevGCFont = nullptr;
+    mpNextGCFont = nullptr;
 }
 
 long ServerFont::Release() const
@@ -358,7 +358,7 @@ void ServerFont::GarbageCollect( long nMinLruIndex )
 
 ImplServerFontEntry::ImplServerFontEntry( FontSelectPattern& rFSD )
 :   ImplFontEntry( rFSD )
-,   mpServerFont( NULL )
+,   mpServerFont( nullptr )
 ,   mbGotFontOptions( false )
 {}
 
diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx
index d92195e2f194..763846971715 100644
--- a/vcl/generic/glyphs/graphite_serverfont.cxx
+++ b/vcl/generic/glyphs/graphite_serverfont.cxx
@@ -45,7 +45,7 @@ float freetypeServerFontAdvance(const void* appFontHandle, gr_uint16 glyphId)
 GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont& rServerFont) throw()
     : ServerFontLayout(rServerFont),
         maImpl(rServerFont.GetGraphiteFace()->face(), rServerFont)
-    , mpFeatures(NULL)
+    , mpFeatures(nullptr)
 {
     gr_font * pFont = rServerFont.GetGraphiteFace()->font(rServerFont.GetFontSelData().mnHeight, rServerFont.NeedsArtificialBold(), rServerFont.NeedsArtificialItalic());
     if (!pFont)
@@ -102,7 +102,7 @@ GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont& rServerFont) thro
 GraphiteServerFontLayout::~GraphiteServerFontLayout() throw()
 {
     delete mpFeatures;
-    mpFeatures = NULL;
+    mpFeatures = nullptr;
 }
 
 bool GraphiteServerFontLayout::IsGraphiteEnabledFont(ServerFont& rServerFont)