1 files changed, 13 insertions, 13 deletions

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 )
 {}