loplugin:nullptr (automatic rewrite)

Change-Id: I05e89f9896170d4df3d1377549ea074f06b884a0

33 files changed, 62 insertions, 62 deletions

diff --git a/vcl/inc/accmgr.hxx b/vcl/inc/accmgr.hxx
index 4f8e553d4bb4..aafe9c83160c 100644
--- a/vcl/inc/accmgr.hxx
+++ b/vcl/inc/accmgr.hxx
@@ -37,8 +37,8 @@ private:
 public:
                         ImplAccelManager()
                         {
-                            mpAccelList    = NULL;
-                            mpSequenceList = NULL;
+                            mpAccelList    = nullptr;
+                            mpSequenceList = nullptr;
                         }
                         ~ImplAccelManager();
 
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 29a1cc676e76..8d0d74919bd0 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -233,7 +233,7 @@ public:
     virtual void            GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                        sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const = 0;
     virtual long            CalcTitleWidth() const = 0;
-    virtual void            DrawWindow(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFlags, const Point* pOffset = NULL) = 0;
+    virtual void            DrawWindow(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFlags, const Point* pOffset = nullptr) = 0;
     virtual Rectangle       GetMenuRect() const;
 
     static void             ImplInitTitle( ImplBorderFrameData* pData );
diff --git a/vcl/inc/controldata.hxx b/vcl/inc/controldata.hxx
index 0ef77c809541..e2ce242d3935 100644
--- a/vcl/inc/controldata.hxx
+++ b/vcl/inc/controldata.hxx
@@ -33,8 +33,8 @@ namespace vcl
         VclPtr<OutputDevice>        mpReferenceDevice;
 
         ImplControlData()
-            :mpLayoutData( NULL )
-            ,mpReferenceDevice( NULL )
+            :mpLayoutData( nullptr )
+            ,mpReferenceDevice( nullptr )
         {
         }
 
diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx
index f2839de68616..e286807f6d52 100644
--- a/vcl/inc/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -271,7 +271,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
     OString getAfmFile( PrintFont* pFont ) const;
     OString getFontFile( PrintFont* pFont ) const;
 
-    bool analyzeFontFile( int nDirID, const OString& rFileName, std::list< PrintFont* >& rNewFonts, const char *pFormat=NULL ) const;
+    bool analyzeFontFile( int nDirID, const OString& rFileName, std::list< PrintFont* >& rNewFonts, const char *pFormat=nullptr ) const;
     static OUString convertTrueTypeName( void* pNameRecord ); // actually a NameRecord* formt font subsetting code
     static void analyzeTrueTypeFamilyName( void* pTTFont, std::list< OUString >& rnames ); // actually a TrueTypeFont* from font subsetting code
     bool analyzeTrueTypeFile( PrintFont* pFont ) const;
@@ -288,7 +288,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
     {
         std::unordered_map< fontID, PrintFont* >::const_iterator it;
         it = m_aFonts.find( nID );
-        return it == m_aFonts.end() ? NULL : it->second;
+        return it == m_aFonts.end() ? nullptr : it->second;
     }
     void fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const;
     void fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const;
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index a92b70519638..b341ad4daccc 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -56,7 +56,7 @@ public:
     bool        CreateFontSubset( int nOutFontTypeMask,
                     FILE* pOutFile, const char* pOutFontName,
                     const sal_GlyphId* pGlyphIds, const sal_uInt8* pEncodedIds,
-                    int nReqGlyphCount, sal_Int32* pOutGlyphWidths = NULL );
+                    int nReqGlyphCount, sal_Int32* pOutGlyphWidths = nullptr );
 
 public: // TODO: make subsetter results private and provide accessor methods instead
         // subsetter-provided subset details needed by e.g. Postscript or PDF
@@ -83,9 +83,9 @@ private:
     int                     mnReqGlyphCount;
 
 protected:
-    bool    CreateFontSubsetFromCff( sal_Int32* pOutGlyphWidths = NULL );
-    bool    CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths = NULL );
-    static bool CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths = NULL );
+    bool    CreateFontSubsetFromCff( sal_Int32* pOutGlyphWidths = nullptr );
+    bool    CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths = nullptr );
+    static bool CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths = nullptr );
 };
 
 #endif // INCLUDED_VCL_INC_FONTSUBSET_HXX
diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx
index 6c3422697238..b2223b5c934f 100644
--- a/vcl/inc/generic/gendata.hxx
+++ b/vcl/inc/generic/gendata.hxx
@@ -32,7 +32,7 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
     // for transient storage of unicode strings eg. 'u123' by input methods
     OUString      m_aUnicodeEntry;
  public:
-    SalGenericData( SalGenericDataType t, SalInstance *pInstance ) : SalData(), m_eType( t ), m_pDisplay( NULL ) { m_pInstance = pInstance; SetSalData( this ); }
+    SalGenericData( SalGenericDataType t, SalInstance *pInstance ) : SalData(), m_eType( t ), m_pDisplay( nullptr ) { m_pInstance = pInstance; SetSalData( this ); }
     virtual ~SalGenericData() {}
     virtual void Dispose() {}
 
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 61c9bcc76140..a780f88a0c14 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -135,7 +135,7 @@ struct ExtGlyphData
     basebmp::Format  meInfo;
     SvpGcpHelper*    mpData;
 
-    ExtGlyphData() : meInfo(basebmp::Format::NONE), mpData(NULL) {}
+    ExtGlyphData() : meInfo(basebmp::Format::NONE), mpData(nullptr) {}
 };
 
 class GlyphData
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx
index 703328304593..e6eec88e53ab 100644
--- a/vcl/inc/generic/printergfx.hxx
+++ b/vcl/inc/generic/printergfx.hxx
@@ -278,7 +278,7 @@ public:
     void            PSDeltaArray (const sal_Int32 *pArray, sal_Int16 nEntries);
     void            PSShowText (const unsigned char* pString,
                                 sal_Int16 nGlyphs, sal_Int16 nBytes,
-                                const sal_Int32* pDeltaArray = NULL);
+                                const sal_Int32* pDeltaArray = nullptr);
     void            PSComment (const sal_Char* pComment );
     void            LicenseWarning (const Point& rPoint, const sal_Unicode* pStr,
                                     sal_Int16 nLen, const sal_Int32* pDeltaArray);
@@ -293,7 +293,7 @@ public:
                                           const sal_Int32* pDeltaArray );
     void            drawText (const Point& rPoint,
                               const sal_Unicode* pStr, sal_Int16 nLen,
-                              const sal_Int32* pDeltaArray = NULL);
+                              const sal_Int32* pDeltaArray = nullptr);
 
     void            drawGlyphs( const Point& rPoint,
                                 sal_GlyphId* pGlyphIds,
@@ -378,7 +378,7 @@ public:
     { return maVirtualStatus.mbArtBold; }
     void            DrawText (const Point& rPoint,
                               const sal_Unicode* pStr, sal_Int16 nLen,
-                              const sal_Int32* pDeltaArray = NULL);
+                              const sal_Int32* pDeltaArray = nullptr);
     void            SetTextColor (PrinterColor& rTextColor)
     { maTextColor = rTextColor; }
     sal_Int32       GetCharWidth (sal_uInt16 nFrom, sal_uInt16 nTo,
diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx
index 39dbc7b5760f..c3738a5c3bef 100644
--- a/vcl/inc/generic/printerjob.hxx
+++ b/vcl/inc/generic/printerjob.hxx
@@ -83,7 +83,7 @@ public:             // for usage in PrinterGfx
     sal_uInt32      GetResolution () const { return mnResolution; }
     void            GetScale (double &rXScale, double &rYScale) const;
     sal_uInt16      GetDepth () const;
-    sal_uInt16      GetPostscriptLevel (const JobData *pJobData = NULL) const;
+    sal_uInt16      GetPostscriptLevel (const JobData *pJobData = nullptr) const;
     bool        IsColorPrinter () const;
 
     osl::File*      GetCurrentPageHeader ();
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index a51ff4acab9b..ff258bff3a1d 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -64,7 +64,7 @@ public:
         GrFontMap::const_iterator i = m_fonts.find(GrFontMapKey(ppm, styleKey));
         if (i != m_fonts.end())
             return i->second;
-        return NULL;
+        return nullptr;
     };
     void addFont(int ppm, gr_font * pFont, bool isBold, bool isItalic)
     {
@@ -104,8 +104,8 @@ private:
     const grutils::GrFeatureParser * mpFeatures;
 
 public:
-    GraphiteLayout(const gr_face * pFace, gr_font * pFont = NULL,
-        const grutils::GrFeatureParser * features = NULL) throw();
+    GraphiteLayout(const gr_face * pFace, gr_font * pFont = nullptr,
+        const grutils::GrFeatureParser * features = nullptr) throw();
 
     // used by upper layers
     virtual bool  LayoutText( ImplLayoutArgs& ) override;    // first step of layout
@@ -122,8 +122,8 @@ public:
 
     // methods using glyph indexing
     virtual int   GetNextGlyphs(int nLen, sal_GlyphId* pGlyphIdxAry, ::Point & rPos, int&,
-            long* pGlyphAdvAry = NULL, int* pCharPosAry = NULL,
-            const PhysicalFontFace** pFallbackFonts = NULL ) const override;
+            long* pGlyphAdvAry = nullptr, int* pCharPosAry = nullptr,
+            const PhysicalFontFace** pFallbackFonts = nullptr ) const override;
 
     // used by glyph+font+script fallback
     virtual void    MoveGlyph( int nStart, long nNewXPos ) override;
diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx
index 6bf33aea8279..0a5b9133acf7 100644
--- a/vcl/inc/graphite_serverfont.hxx
+++ b/vcl/inc/graphite_serverfont.hxx
@@ -87,8 +87,8 @@ public:
 
         // used by display layers
         virtual int     GetNextGlyphs( int l, sal_GlyphId* gia, Point& p, int& s,
-                        long* gaa = NULL, int* cpa = NULL,
-                        const PhysicalFontFace** pFallbackFonts = NULL ) const override
+                        long* gaa = nullptr, int* cpa = nullptr,
+                        const PhysicalFontFace** pFallbackFonts = nullptr ) const override
         {
             maImpl.DrawBase() = maDrawBase;
             maImpl.DrawOffset() = maDrawOffset;
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index dbe7d916742e..78c31fbdcd01 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -65,7 +65,7 @@ public:
                  SalFrameStyleFlags nSalFrameStyle,
                  bool      bTopDown,
                  basebmp::Format nScanlineFormat,
-                 SystemParentData* pSystemParent = NULL );
+                 SystemParentData* pSystemParent = nullptr );
     virtual ~SvpSalFrame();
 
     void GetFocus();
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 694b888bfff4..ac24df4cf086 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -92,7 +92,7 @@ public:
     SvpSalGraphics();
     virtual ~SvpSalGraphics();
 
-    virtual SalGraphicsImpl* GetImpl() const override { return NULL; };
+    virtual SalGraphicsImpl* GetImpl() const override { return nullptr; };
     virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override;
     virtual sal_uInt16      GetBitCount() const override;
     virtual long            GetGraphicsWidth() const override;
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index e113304df898..9599d3217ee5 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -129,7 +129,7 @@ public:
     // pData allows for using a system dependent graphics or device context
     virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
                                                      long &nDX, long &nDY,
-                                                     sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) override;
+                                                     sal_uInt16 nBitCount, const SystemGraphicsData *pData = nullptr ) override;
 
     // Printer
     // pSetupData->mpDriverData can be 0
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index aa6c216e2de7..e37296269398 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -75,7 +75,7 @@ public:
 
 void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle, QuickHelpFlags nStyle,
         const OUString& rHelpText, const OUString& rStatusText,
-        const Point& rScreenPos, const Rectangle* pHelpArea = NULL );
+        const Point& rScreenPos, const Rectangle* pHelpArea = nullptr );
 void ImplDestroyHelpWindow( bool bUpdateHideTime );
 void ImplSetHelpWindowPos( vcl::Window* pHelpWindow, sal_uInt16 nHelpWinStyle, QuickHelpFlags nStyle,
                             const Point& rPos, const Rectangle* pHelpArea );
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 12d45703df06..7552f00f3205 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -62,7 +62,7 @@ struct ImplEntryType
         mnHeight( 0 )
     {
         mbIsSelected = false;
-        mpUserData = NULL;
+        mpUserData = nullptr;
     }
 
     ImplEntryType( const OUString& rStr ) :
@@ -71,7 +71,7 @@ struct ImplEntryType
         mnHeight( 0 )
     {
         mbIsSelected = false;
-        mpUserData = NULL;
+        mpUserData = nullptr;
     }
 
     ImplEntryType( const Image& rImage ) :
@@ -80,7 +80,7 @@ struct ImplEntryType
         mnHeight( 0 )
     {
         mbIsSelected = false;
-        mpUserData = NULL;
+        mpUserData = nullptr;
     }
 };
 
@@ -102,7 +102,7 @@ private:
     ImplEntryType*  GetEntry( sal_Int32  nPos ) const
     {
         if (nPos < 0 || static_cast<size_t>(nPos) >= maEntries.size())
-            return NULL;
+            return nullptr;
         return const_cast<ImplEntryType*>(&maEntries[nPos]);
     }
 
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index fd9fb347516c..ab2bd21ffe0d 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -139,7 +139,7 @@ public:
                             meAutoHint(AUTOHINT_DONTKNOW),
                             meHinting(HINTING_DONTKNOW),
                             meHintStyle(HINT_SLIGHT),
-                            mpPattern(0) {}
+                            mpPattern(nullptr) {}
                         FontConfigFontOptions(FcPattern* pPattern) :
                             meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW),
                             meAntiAlias(ANTIALIAS_DONTKNOW),
@@ -205,8 +205,8 @@ class VCL_PLUGIN_PUBLIC CmapResult
 {
 public:
     explicit            CmapResult( bool bSymbolic = false,
-                            const sal_uInt32* pRangeCodes = NULL, int nRangeCount = 0,
-                            const int* pStartGlyphs = 0, const sal_uInt16* pGlyphIds = NULL );
+                            const sal_uInt32* pRangeCodes = nullptr, int nRangeCount = 0,
+                            const int* pStartGlyphs = nullptr, const sal_uInt16* pGlyphIds = nullptr );
 
     const sal_uInt32*   mpRangeCodes;
     const int*          mpStartGlyphs;
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index fdcbb9ec4e99..739834ef286e 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -114,8 +114,8 @@ private:
                                             const Point& rDestPt,
                                             const Size& rDestSize,
                                             long nExtraData = 0,
-                                            OutputDevice* pFirstFrameOutDev = NULL );
-    void                ImplStopAnimation( OutputDevice* pOutputDevice = NULL,
+                                            OutputDevice* pFirstFrameOutDev = nullptr );
+    void                ImplStopAnimation( OutputDevice* pOutputDevice = nullptr,
                                            long nExtraData = 0 );
 
     void                ImplSetAnimationNotifyHdl( const Link<Animation*,void>& rLink );
diff --git a/vcl/inc/impoct.hxx b/vcl/inc/impoct.hxx
index 4183fc7fb5bc..87bfea22c120 100644
--- a/vcl/inc/impoct.hxx
+++ b/vcl/inc/impoct.hxx
@@ -130,7 +130,7 @@ inline OctreeNode* ImpNodeCache::ImplGetFreeNode()
     if ( !pActNode )
     {
         pActNode = new NODE;
-        pActNode->pNextInCache = NULL;
+        pActNode->pNextInCache = nullptr;
     }
 
     pNode = pActNode;
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 0c284bd328c1..edf8875f4ba8 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -142,7 +142,7 @@ public:
     virtual sal_uInt16          SetFont( FontSelectPattern*, int nFallbackLevel ) = 0;
 
     // release the fonts
-    void                        ReleaseFonts() { SetFont( NULL, 0 ); }
+    void                        ReleaseFonts() { SetFont( nullptr, 0 ); }
 
     // get the current font's metrics
     virtual void                GetFontMetric( ImplFontMetricData*, int nFallbackLevel = 0 ) = 0;
@@ -438,7 +438,7 @@ public:
                                     sal_uInt8 nTransparency,
                                     const OutputDevice *pOutDev );
 
-    virtual OpenGLContext      *BeginPaint() { return NULL; }
+    virtual OpenGLContext      *BeginPaint() { return nullptr; }
 
     virtual SystemGraphicsData  GetGraphicsData() const = 0;
 
diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx
index 86575a4cbc4b..406f0ce15ba1 100644
--- a/vcl/inc/salgdiimpl.hxx
+++ b/vcl/inc/salgdiimpl.hxx
@@ -212,7 +212,7 @@ public:
 
     virtual bool drawGradient(const tools::PolyPolygon& rPolygon, const Gradient& rGradient) = 0;
 
-    virtual OpenGLContext *beginPaint() { return NULL; }
+    virtual OpenGLContext *beginPaint() { return nullptr; }
 };
 
 #endif
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index ec429b99e00c..34be18878dd3 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -90,7 +90,7 @@ public:
     virtual SalVirtualDevice*
                             CreateVirtualDevice( SalGraphics* pGraphics,
                                                  long &rDX, long &rDY,
-                                                 sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) = 0;
+                                                 sal_uInt16 nBitCount, const SystemGraphicsData *pData = nullptr ) = 0;
 
     // Printer
     // pSetupData->mpDriverData can be 0
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index a0c87e18efbc..f2b274461230 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -178,14 +178,14 @@ public:
     // methods using string indexing
     virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra=0, int nFactor=1) const = 0;
     virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const = 0;
-    virtual DeviceCoordinate GetTextWidth() const { return FillDXArray( NULL ); }
+    virtual DeviceCoordinate GetTextWidth() const { return FillDXArray( nullptr ); }
     virtual void    GetCaretPositions( int nArraySize, long* pCaretXArray ) const = 0;
     virtual bool    IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594
 
     // methods using glyph indexing
     virtual int     GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdAry, Point& rPos, int&,
-                                   DeviceCoordinate* pGlyphAdvAry = NULL, int* pCharPosAry = NULL,
-                                   const PhysicalFontFace** pFallbackFonts = NULL ) const = 0;
+                                   DeviceCoordinate* pGlyphAdvAry = nullptr, int* pCharPosAry = nullptr,
+                                   const PhysicalFontFace** pFallbackFonts = nullptr ) const = 0;
     virtual bool    GetOutline( SalGraphics&, ::basegfx::B2DPolyPolygonVector& ) const;
     virtual bool    GetBoundRect( SalGraphics&, Rectangle& ) const;
 
@@ -246,7 +246,7 @@ public:
 
     // used only by OutputDevice::ImplLayout, TODO: make friend
     explicit        MultiSalLayout( SalLayout& rBaseLayout,
-                                    const PhysicalFontFace* pBaseFont = NULL );
+                                    const PhysicalFontFace* pBaseFont = nullptr );
     bool            AddFallback( SalLayout& rFallbackLayout,
                                  ImplLayoutRuns&, const PhysicalFontFace* pFallbackFont );
     virtual bool    LayoutText( ImplLayoutArgs& ) override;
@@ -349,8 +349,8 @@ public:
 
     // used by display layers
     virtual int     GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos, int&,
-                                   DeviceCoordinate* pGlyphAdvAry = NULL, int* pCharPosAry = NULL,
-                                   const PhysicalFontFace** pFallbackFonts = NULL ) const override;
+                                   DeviceCoordinate* pGlyphAdvAry = nullptr, int* pCharPosAry = nullptr,
+                                   const PhysicalFontFace** pFallbackFonts = nullptr ) const override;
 
 protected:
                     GenericSalLayout();
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index 943cefe514a4..948c36d43367 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -40,7 +40,7 @@ class VCL_PLUGIN_PUBLIC SalObject
     bool                m_bMouseTransparent:1,
                         m_bEraseBackground:1;
 public:
-            SalObject() : m_pInst( NULL ), m_pCallback( NULL ), m_bMouseTransparent( false ), m_bEraseBackground( true ) {}
+            SalObject() : m_pInst( nullptr ), m_pCallback( nullptr ), m_bMouseTransparent( false ), m_bEraseBackground( true ) {}
             virtual ~SalObject();
 
     virtual void                    ResetClipRegion() = 0;
diff --git a/vcl/inc/salsession.hxx b/vcl/inc/salsession.hxx
index 8da8dc60e0aa..67481176968a 100644
--- a/vcl/inc/salsession.hxx
+++ b/vcl/inc/salsession.hxx
@@ -83,8 +83,8 @@ class VCL_PLUGIN_PUBLIC SalSession
     void *              m_pProcData;
 public:
     SalSession()
-        : m_aProc(0)
-        , m_pProcData(NULL)
+        : m_aProc(nullptr)
+        , m_pProcData(nullptr)
     {
     }
     virtual ~SalSession();
diff --git a/vcl/inc/saltimer.hxx b/vcl/inc/saltimer.hxx
index 1e1a941c1287..01a3012ec00b 100644
--- a/vcl/inc/saltimer.hxx
+++ b/vcl/inc/saltimer.hxx
@@ -34,7 +34,7 @@ class VCL_PLUGIN_PUBLIC SalTimer
 {
     SALTIMERPROC        m_pProc;
 public:
-    SalTimer() : m_pProc( NULL ) {}
+    SalTimer() : m_pProc( nullptr ) {}
     virtual ~SalTimer();
 
     // AutoRepeat and Restart
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index b464b5c27131..222c8c85a54a 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -110,7 +110,7 @@ struct SalMenuEvent
     sal_uInt16      mnId;           // Menu item ID
     void*           mpMenu;         // pointer to VCL menu (class Menu)
 
-    SalMenuEvent() : mnId( 0 ), mpMenu( NULL ) {}
+    SalMenuEvent() : mnId( 0 ), mpMenu( nullptr ) {}
     SalMenuEvent( sal_uInt16 i_nId, void* i_pMenu )
     : mnId( i_nId ), mpMenu( i_pMenu ) {}
 };
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 10fda4952fc4..5cac95e73312 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -398,7 +398,7 @@ struct ImplDelData
     VclPtr<vcl::Window> mpWindow;
     bool                mbDel;
 
-                        ImplDelData( vcl::Window* pWindow = NULL );
+                        ImplDelData( vcl::Window* pWindow = nullptr );
     virtual             ~ImplDelData();
 
     bool                IsDead() const
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index 5b7a122adf13..27cc5f1a0646 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -94,7 +94,7 @@ namespace vcl
 
         Rectangle   DrawText( const Rectangle& _rRect,
                               const OUString& _rText, DrawTextFlags _nStyle = DrawTextFlags::NONE,
-                              MetricVector* _pVector = NULL, OUString* _pDisplayText = NULL );
+                              MetricVector* _pVector = nullptr, OUString* _pDisplayText = nullptr );
 
     private:
         ControlTextRenderer( const ControlTextRenderer& ) = delete;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 41cd6aafc5e0..df54508d4640 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -69,7 +69,7 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
         GtkSalGraphics*     pGraphics;
         bool                bInUse;
         GraphicsHolder()
-                : pGraphics( NULL ),
+                : pGraphics( nullptr ),
                   bInUse( false )
         {}
         ~GraphicsHolder();
@@ -96,7 +96,7 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
             guint8  group;
 
             PreviousKeyPress (GdkEventKey *event)
-            :   window (NULL),
+            :   window (nullptr),
                 send_event (0),
                 time (0),
                 state (0),
@@ -128,7 +128,7 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
 
             bool operator== (GdkEventKey *event) const
             {
-                return (event != NULL)
+                return (event != nullptr)
                     && (event->window == window)
                     && (event->send_event == send_event)
                     // ignore non-Gdk state bits, e.g., these used by IBus
@@ -317,7 +317,7 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
     void TriggerPaintEvent();
 
     void updateWMClass();
-    void SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSize = NULL );
+    void SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSize = nullptr );
 
 public:
 #if GTK_CHECK_VERSION(3,0,0)
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 6c8c274313f0..b1a01e04eb34 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -300,7 +300,7 @@ public:
                                int            *pLen,
                                KeySym         *pUnmodifiedKeySym,
                                Status         *pStatus,
-                               XIC = NULL ) const;
+                               XIC = nullptr ) const;
 
     Cursor                GetPointer( PointerStyle ePointerStyle );
     virtual int           CaptureMouse( SalFrame *pCapture );
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index fc8f0d3563d4..9ba19574cbbf 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -181,7 +181,7 @@ public:
     ::Window                GetShellWindow() const { return mhShellWindow; }
     ::Window                GetForeignParent() const { return mhForeignParent; }
     ::Window                GetStackingWindow() const { return mhStackingWindow; }
-    long                    Close() const { return CallCallback( SALEVENT_CLOSE, 0 ); }
+    long                    Close() const { return CallCallback( SALEVENT_CLOSE, NULL ); }
     SalFrameStyleFlags      GetStyle() const { return nStyle_; }
 
     Cursor                  GetCursor() const { return hCursor_; }
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index 5eab4d5be1dd..c50542797314 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -261,7 +261,7 @@ public:
      *  set hints what decoration is needed;
      *  must be called before showing the frame
      */
-    virtual void setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eType, int nDecorationFlags, X11SalFrame* pTransientFrame = NULL ) const;
+    virtual void setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eType, int nDecorationFlags, X11SalFrame* pTransientFrame = nullptr ) const;
 
     /*
      *  tells whether there is WM support for splash screens