loplugin:nullptr (automatic rewrite)

Change-Id: I7fc4b4d5c895f241cfb052b009e943e073f3befe

20 files changed, 147 insertions, 147 deletions

diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx
index c6280d5070e8..1622d9dedc0e 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -336,7 +336,7 @@ void SAL_CALL SvtRulerAccessible::disposing()
     {
         {
             ::osl::MutexGuard   aGuard( m_aMutex );
-            mpRepr = NULL;      // object dies with representation
+            mpRepr = nullptr;      // object dies with representation
 
         }
 
diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx
index 66390cfefe15..c2803024c0aa 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.cxx
@@ -80,7 +80,7 @@ AsynchronLink::~AsynchronLink()
 IMPL_LINK_NOARG_TYPED( AsynchronLink, HandleCall_Idle, Idle*, void )
 {
     if( _pMutex ) _pMutex->acquire();
-    _nEventId = 0;
+    _nEventId = nullptr;
     if( _pMutex ) _pMutex->release();
     Call_Impl( _pArg );
 }
@@ -96,7 +96,7 @@ void AsynchronLink::ClearPendingCall()
     if( _nEventId )
     {
         Application::RemoveUserEvent( _nEventId );
-        _nEventId = 0;
+        _nEventId = nullptr;
     }
     if( _pMutex ) _pMutex->release();
     if( _pIdle ) _pIdle->Stop();
@@ -111,7 +111,7 @@ void AsynchronLink::Call_Impl( void* pArg )
     if( !bDeleted )
     {
         _bInCall = false;
-        _pDeleted = 0;
+        _pDeleted = nullptr;
     }
 }
 
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index ccd41253f7bf..13c14468a50a 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -150,11 +150,11 @@ inline void ImplCalendarClearSelectDate( IntDateSet* pTable )
 void Calendar::ImplInit( WinBits nWinStyle )
 {
     mpSelectTable           = new IntDateSet;
-    mpOldSelectTable        = NULL;
-    mpRestoreSelectTable    = NULL;
-    mpStandardColor         = NULL;
-    mpSaturdayColor         = NULL;
-    mpSundayColor           = NULL;
+    mpOldSelectTable        = nullptr;
+    mpRestoreSelectTable    = nullptr;
+    mpStandardColor         = nullptr;
+    mpSaturdayColor         = nullptr;
+    mpSundayColor           = nullptr;
     mnDayCount              = 0;
     mnWinStyle              = nWinStyle;
     mnFirstYear             = 0;
@@ -686,7 +686,7 @@ void Calendar::ImplDrawDate(vcl::RenderContext& rRenderContext,
                             DayOfWeek eDayOfWeek,
                             bool bBack, bool bOther, sal_uLong nToday )
 {
-    Color* pTextColor = NULL;
+    Color* pTextColor = nullptr;
     const OUString& rDay = maDayTexts[nDay - 1];
     Rectangle aDateRect(nX, nY, nX + mnDayWidth - 1, nY + mnDayHeight - 1);
 
@@ -1241,10 +1241,10 @@ void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate )
     mbMenuDown = false;
 
     // destroy menu
-    aPopupMenu.SetPopupMenu( 2, NULL );
+    aPopupMenu.SetPopupMenu( 2, nullptr );
     for ( i = 0; i < MENU_YEAR_COUNT; i++ )
     {
-        aPopupMenu.SetPopupMenu( 10+i, NULL );
+        aPopupMenu.SetPopupMenu( 10+i, nullptr );
         delete pYearPopupMenus[i];
     }
 
@@ -1346,9 +1346,9 @@ void Calendar::ImplEndTracking( bool bCancel )
             GrabFocus();
 
         delete mpOldSelectTable;
-        mpOldSelectTable = NULL;
+        mpOldSelectTable = nullptr;
         delete mpRestoreSelectTable;
-        mpRestoreSelectTable = NULL;
+        mpRestoreSelectTable = nullptr;
     }
 }
 
@@ -2064,10 +2064,10 @@ public:
 ImplCFieldFloatWin::ImplCFieldFloatWin( vcl::Window* pParent ) :
     FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW  )
 {
-    mpCalendar  = NULL;
-    mpTodayBtn  = NULL;
-    mpNoneBtn   = NULL;
-    mpFixedLine = NULL;
+    mpCalendar  = nullptr;
+    mpTodayBtn  = nullptr;
+    mpNoneBtn   = nullptr;
+    mpFixedLine = nullptr;
 }
 
 ImplCFieldFloatWin::~ImplCFieldFloatWin()
@@ -2210,11 +2210,11 @@ bool ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt )
 
 CalendarField::CalendarField(vcl::Window* pParent, WinBits nWinStyle)
     : DateField(pParent, nWinStyle)
-    , mpFloatWin(NULL)
-    , mpCalendar(NULL)
+    , mpFloatWin(nullptr)
+    , mpCalendar(nullptr)
     , mnCalendarStyle(0)
-    , mpTodayBtn(NULL)
-    , mpNoneBtn(NULL)
+    , mpTodayBtn(nullptr)
+    , mpNoneBtn(nullptr)
     , maDefaultDate( 0, 0, 0 )
     , mbToday(false)
     , mbNone(false)
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 9b52255e0ca7..09be79df18da 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -123,7 +123,7 @@ void ColorListBox::dispose()
     {
         ImplDestroyColorEntries();
         delete pColorList;
-        pColorList = NULL;
+        pColorList = nullptr;
     }
     ListBox::dispose();
 }
@@ -237,7 +237,7 @@ Color ColorListBox::GetEntryColor( sal_Int32 nPos ) const
 {
     Color aColor;
     ImplColorListData* pData = ( 0 <= nPos && static_cast<size_t>(nPos) < pColorList->size() ) ?
-        (*pColorList)[ nPos ] : NULL;
+        (*pColorList)[ nPos ] : nullptr;
     if ( pData && pData->bColor )
         aColor = pData->aColor;
     return aColor;
@@ -246,7 +246,7 @@ Color ColorListBox::GetEntryColor( sal_Int32 nPos ) const
 void ColorListBox::UserDraw( const UserDrawEvent& rUDEvt )
 {
     size_t nPos = rUDEvt.GetItemId();
-    ImplColorListData* pData = ( nPos < pColorList->size() ) ? (*pColorList)[ nPos ] : NULL;
+    ImplColorListData* pData = ( nPos < pColorList->size() ) ? (*pColorList)[ nPos ] : nullptr;
     if ( pData )
     {
         if ( pData->bColor )
@@ -822,7 +822,7 @@ sal_Int32 LineListBox::GetEntryPos( sal_uInt16 nStyle ) const
 
 sal_uInt16 LineListBox::GetEntryStyle( sal_Int32 nPos ) const
 {
-    ImpLineListData* pData = (0 <= nPos && static_cast<size_t>(nPos) < pLineList->size()) ? (*pLineList)[ nPos ] : NULL;
+    ImpLineListData* pData = (0 <= nPos && static_cast<size_t>(nPos) < pLineList->size()) ? (*pLineList)[ nPos ] : nullptr;
     return ( pData ) ? pData->GetStyle() : table::BorderLineStyle::NONE;
 }
 
@@ -931,7 +931,7 @@ void LineListBox::DataChanged( const DataChangedEvent& rDCEvt )
 FontNameBox::FontNameBox( vcl::Window* pParent, WinBits nWinStyle ) :
     ComboBox( pParent, nWinStyle )
 {
-    mpFontList = NULL;
+    mpFontList = nullptr;
     mbWYSIWYG = false;
     InitFontMRUEntriesFile();
 }
@@ -1018,7 +1018,7 @@ void FontNameBox::InitFontMRUEntriesFile()
 void FontNameBox::ImplDestroyFontList()
 {
     delete mpFontList;
-    mpFontList = NULL;
+    mpFontList = nullptr;
 }
 
 void FontNameBox::Fill( const FontList* pList )
@@ -1538,7 +1538,7 @@ void FontSizeBox::ImplInit()
     bPtRelative     = false;
     bRelative       = false;
     bStdSize        = false;
-    pFontList       = NULL;
+    pFontList       = nullptr;
 
     SetShowTrailingZeros( false );
     SetDecimalDigits( 1 );
@@ -1626,7 +1626,7 @@ void FontSizeBox::Fill( const vcl::FontInfo* pInfo, const FontList* pList )
 
     // query font sizes
     const sal_IntPtr* pTempAry;
-    const sal_IntPtr* pAry = 0;
+    const sal_IntPtr* pAry = nullptr;
 
     if( pInfo )
     {
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index ef263e7ea607..de4c2155828e 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -80,7 +80,7 @@ private:
 public:
                             ImplFontListFontInfo( const vcl::FontInfo& rInfo,
                                                   OutputDevice* pDev ) :
-                                vcl::FontInfo( rInfo ), mpNext(NULL)
+                                vcl::FontInfo( rInfo ), mpNext(nullptr)
                             {
                                 mpDevice = pDev;
                             }
@@ -110,7 +110,7 @@ private:
 
     ImplFontListNameInfo(const OUString& rSearchName)
         : maSearchName(rSearchName)
-        , mpFirst(NULL)
+        , mpFirst(nullptr)
         , mnType(FontListFontNameType::NONE)
     {
     }
@@ -172,7 +172,7 @@ ImplFontListNameInfo* FontList::ImplFind(const OUString& rSearchName, sal_uLong*
     {
         if ( pIndex )
             *pIndex = ULONG_MAX;
-        return NULL;
+        return nullptr;
     }
     else
     {
@@ -182,7 +182,7 @@ ImplFontListNameInfo* FontList::ImplFind(const OUString& rSearchName, sal_uLong*
         {
             if ( pIndex )
                 *pIndex = ULONG_MAX;
-            return NULL;
+            return nullptr;
         }
         else if (nComp == 0)
             return const_cast<ImplFontListNameInfo*>(pCmpData);
@@ -190,7 +190,7 @@ ImplFontListNameInfo* FontList::ImplFind(const OUString& rSearchName, sal_uLong*
 
     // search fonts in the list
     const ImplFontListNameInfo* pCompareData;
-    const ImplFontListNameInfo* pFoundData = NULL;
+    const ImplFontListNameInfo* pFoundData = nullptr;
     size_t                      nLow = 0;
     size_t                      nHigh = m_Entries.size() - 1;
     size_t                      nMid;
@@ -234,7 +234,7 @@ ImplFontListNameInfo* FontList::ImplFind(const OUString& rSearchName, sal_uLong*
 ImplFontListNameInfo* FontList::ImplFindByName(const OUString& rStr) const
 {
     OUString aSearchName = ImplMakeSearchStringFromName(rStr);
-    return ImplFind( aSearchName, NULL );
+    return ImplFind( aSearchName, nullptr );
 }
 
 void FontList::ImplInsertFonts( OutputDevice* pDevice, bool bAll,
@@ -272,7 +272,7 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, bool bAll,
                 ImplFontListFontInfo* pNewInfo = new ImplFontListFontInfo( aFontInfo, pDevice );
                 pData = new ImplFontListNameInfo( aSearchName );
                 pData->mpFirst      = pNewInfo;
-                pNewInfo->mpNext    = NULL;
+                pNewInfo->mpNext    = nullptr;
 
                 if (nIndex < m_Entries.size())
                     m_Entries.insert(m_Entries.begin()+nIndex,
@@ -286,7 +286,7 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, bool bAll,
             if ( bInsertData )
             {
                 bool                    bInsert = true;
-                ImplFontListFontInfo*   pPrev = NULL;
+                ImplFontListFontInfo*   pPrev = nullptr;
                 ImplFontListFontInfo*   pTemp = pData->mpFirst;
                 ImplFontListFontInfo*   pNewInfo = new ImplFontListFontInfo( aFontInfo, pDevice );
                 while ( pTemp )
@@ -337,7 +337,7 @@ FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, bool bAll )
     // initialise variables
     mpDev = pDevice;
     mpDev2 = pDevice2;
-    mpSizeAry = NULL;
+    mpSizeAry = nullptr;
 
     // store style names
     maLight         = SVT_RESSTR(STR_SVT_STYLE_LIGHT);
@@ -577,8 +577,8 @@ namespace
 vcl::FontInfo FontList::Get(const OUString& rName, const OUString& rStyleName) const
 {
     ImplFontListNameInfo* pData = ImplFindByName( rName );
-    ImplFontListFontInfo* pFontInfo = NULL;
-    ImplFontListFontInfo* pFontNameInfo = NULL;
+    ImplFontListFontInfo* pFontInfo = nullptr;
+    ImplFontListFontInfo* pFontNameInfo = nullptr;
     if ( pData )
     {
         ImplFontListFontInfo* pSearchInfo = pData->mpFirst;
@@ -659,8 +659,8 @@ vcl::FontInfo FontList::Get(const OUString& rName,
                         FontWeight eWeight, FontItalic eItalic) const
 {
     ImplFontListNameInfo* pData = ImplFindByName( rName );
-    ImplFontListFontInfo* pFontInfo = NULL;
-    ImplFontListFontInfo* pFontNameInfo = NULL;
+    ImplFontListFontInfo* pFontInfo = nullptr;
+    ImplFontListFontInfo* pFontNameInfo = nullptr;
     if ( pData )
     {
         ImplFontListFontInfo* pSearchInfo = pData->mpFirst;
@@ -693,7 +693,7 @@ vcl::FontInfo FontList::Get(const OUString& rName,
 
 bool FontList::IsAvailable(const OUString& rName) const
 {
-    return (ImplFindByName( rName ) != 0);
+    return (ImplFindByName( rName ) != nullptr);
 }
 
 const vcl::FontInfo& FontList::GetFontName( sal_uInt16 nFont ) const
@@ -730,7 +730,7 @@ const sal_IntPtr* FontList::GetSizeAry( const vcl::FontInfo& rInfo ) const
     if ( mpSizeAry )
     {
         delete[] const_cast<FontList*>(this)->mpSizeAry;
-        const_cast<FontList*>(this)->mpSizeAry = NULL;
+        const_cast<FontList*>(this)->mpSizeAry = nullptr;
     }
 
     // use standarad sizes if no name
@@ -813,7 +813,7 @@ FontSizeNames::FontSizeNames( LanguageType eLanguage )
     }
     else
     {
-        mpArray = NULL;
+        mpArray = nullptr;
         mnElem = 0;
     }
 }
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 84bc9d7dfd0a..987ad98d3dc2 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -265,7 +265,7 @@ namespace validation
     }
 }
 
-SvNumberFormatter* FormattedField::StaticFormatter::s_cFormatter = NULL;
+SvNumberFormatter* FormattedField::StaticFormatter::s_cFormatter = nullptr;
 sal_uLong FormattedField::StaticFormatter::s_nReferences = 0;
 
 SvNumberFormatter* FormattedField::StaticFormatter::GetFormatter()
@@ -291,7 +291,7 @@ FormattedField::StaticFormatter::~StaticFormatter()
     if (--s_nReferences == 0)
     {
         delete s_cFormatter;
-        s_cFormatter = NULL;
+        s_cFormatter = nullptr;
     }
 }
 
@@ -311,12 +311,12 @@ FormattedField::FormattedField(vcl::Window* pParent, WinBits nStyle, SvNumberFor
     ,m_dCurrentValue(0)
     ,m_dDefaultValue(0)
     ,m_nFormatKey(0)
-    ,m_pFormatter(NULL)
+    ,m_pFormatter(nullptr)
     ,m_dSpinSize(1)
     ,m_dSpinFirst(-1000000)
     ,m_dSpinLast(1000000)
     ,m_bTreatAsNumber(true)
-    ,m_pLastOutputColor(NULL)
+    ,m_pLastOutputColor(nullptr)
     ,m_bUseInputStringForFormatting(false)
 {
 
@@ -532,7 +532,7 @@ void FormattedField::ImplSetFormatKey(sal_uLong nFormatKey)
 {
 
     m_nFormatKey = nFormatKey;
-    bool bNeedFormatter = (m_pFormatter == NULL) && (nFormatKey != 0);
+    bool bNeedFormatter = (m_pFormatter == nullptr) && (nFormatKey != 0);
     if (bNeedFormatter)
     {
         ImplGetFormatter(); // this creates a standard formatter
@@ -543,15 +543,15 @@ void FormattedField::ImplSetFormatKey(sal_uLong nFormatKey)
         m_nFormatKey = nFormatKey;
         // When calling SetFormatKey without a formatter, the key must be one of the standard values
         // that is available for all formatters (and, thus, also in this new one).
-        DBG_ASSERT(m_pFormatter->GetEntry(nFormatKey) != NULL, "FormattedField::ImplSetFormatKey : invalid format key !");
+        DBG_ASSERT(m_pFormatter->GetEntry(nFormatKey) != nullptr, "FormattedField::ImplSetFormatKey : invalid format key !");
     }
 }
 
 void FormattedField::SetFormatKey(sal_uLong nFormatKey)
 {
-    bool bNoFormatter = (m_pFormatter == NULL);
+    bool bNoFormatter = (m_pFormatter == nullptr);
     ImplSetFormatKey(nFormatKey);
-    FormatChanged((bNoFormatter && (m_pFormatter != NULL)) ? FORMAT_CHANGE_TYPE::FORMATTER : FORMAT_CHANGE_TYPE::KEYONLY);
+    FormatChanged((bNoFormatter && (m_pFormatter != nullptr)) ? FORMAT_CHANGE_TYPE::FORMATTER : FORMAT_CHANGE_TYPE::KEYONLY);
 }
 
 void FormattedField::SetFormatter(SvNumberFormatter* pFormatter, bool bResetFormat)
@@ -599,7 +599,7 @@ void FormattedField::SetFormatter(SvNumberFormatter* pFormatter, bool bResetForm
 OUString FormattedField::GetFormat(LanguageType& eLang) const
 {
     const SvNumberformat* pFormatEntry = ImplGetFormatter()->GetEntry(m_nFormatKey);
-    DBG_ASSERT(pFormatEntry != NULL, "FormattedField::GetFormat: no number format for the given format key.");
+    DBG_ASSERT(pFormatEntry != nullptr, "FormattedField::GetFormat: no number format for the given format key.");
     OUString sFormatString = pFormatEntry ? pFormatEntry->GetFormatstring() : OUString();
     eLang = pFormatEntry ? pFormatEntry->GetLanguage() : LANGUAGE_DONTKNOW;
 
@@ -708,7 +708,7 @@ void FormattedField::SetDecimalDigits(sal_uInt16 _nPrecision)
 
 void FormattedField::FormatChanged( FORMAT_CHANGE_TYPE _nWhat )
 {
-    m_pLastOutputColor = NULL;
+    m_pLastOutputColor = nullptr;
 
     if ( (_nWhat == FORMAT_CHANGE_TYPE::FORMATTER) && m_pFormatter )
         m_pFormatter->SetEvalDateFormat( NF_EVALDATEFORMAT_INTL_FORMAT );
@@ -868,7 +868,7 @@ void FormattedField::ImplSetValue(double dVal, bool bForce)
     if (!bForce && (dVal == GetValue()))
         return;
 
-    DBG_ASSERT(ImplGetFormatter() != NULL, "FormattedField::ImplSetValue : can't set a value without a formatter !");
+    DBG_ASSERT(ImplGetFormatter() != nullptr, "FormattedField::ImplSetValue : can't set a value without a formatter !");
 
     m_ValueState = valueDouble;
     m_dCurrentValue = dVal;
@@ -894,7 +894,7 @@ void FormattedField::ImplSetValue(double dVal, bool bForce)
         }
     }
 
-    ImplSetTextImpl(sNewText, NULL);
+    ImplSetTextImpl(sNewText, nullptr);
     m_ValueState = valueDouble;
     DBG_ASSERT(CheckText(sNewText), "FormattedField::ImplSetValue : formatted string doesn't match the criteria !");
 }
@@ -911,7 +911,7 @@ bool FormattedField::ImplGetValue(double& dNewVal)
     if (sText.isEmpty())
         return true;
 
-    DBG_ASSERT(ImplGetFormatter() != NULL, "FormattedField::ImplGetValue : can't give you a current value without a formatter !");
+    DBG_ASSERT(ImplGetFormatter() != nullptr, "FormattedField::ImplGetValue : can't give you a current value without a formatter !");
 
     sal_uInt32 nFormatKey = m_nFormatKey; // IsNumberFormat changes the FormatKey!
 
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index 4391d6a3afbb..b0d6192d115b 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -73,7 +73,7 @@ void HeaderBar::ImplInit( WinBits nWinStyle )
     mbOutDrag       = false;
     mbItemMode      = false;
 
-    m_pVCLXHeaderBar = NULL;
+    m_pVCLXHeaderBar = nullptr;
     // StyleBits auswerten
     if ( nWinStyle & WB_DRAG )
         mbDragable = true;
@@ -116,7 +116,7 @@ void HeaderBar::dispose()
         for ( size_t i = 0, n = mpItemList->size(); i < n; ++i )
             delete (*mpItemList)[ i ];
         delete mpItemList;
-        mpItemList = NULL;
+        mpItemList = nullptr;
     }
     Window::dispose();
 }
@@ -1233,7 +1233,7 @@ sal_uInt16 HeaderBar::GetItemPos( sal_uInt16 nItemId ) const
 
 sal_uInt16 HeaderBar::GetItemId( sal_uInt16 nPos ) const
 {
-    ImplHeadItem* pItem = (nPos < mpItemList->size() ) ? (*mpItemList)[ nPos ] : NULL;
+    ImplHeadItem* pItem = (nPos < mpItemList->size() ) ? (*mpItemList)[ nPos ] : nullptr;
     if ( pItem )
         return pItem->mnId;
     else
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 60c459a77f71..330a7c7ca505 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -1307,7 +1307,7 @@ bool SvtURLBox_Impl::TildeParsing(
             sal_Int32 nNameEnd = aText.indexOf( '/' );
             OUString aUserName = aText.copy( 1, ( nNameEnd != -1 ) ? nNameEnd : ( aText.getLength() - 1 ) );
 
-            struct passwd* pPasswd = NULL;
+            struct passwd* pPasswd = nullptr;
 #ifdef SOLARIS
             Sequence< sal_Int8 > sBuf( 1024 );
             struct passwd aTmp;
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index 9201731ebb20..216d3db6bd43 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -105,7 +105,7 @@ public:
         , m_bInteractive(true)
         , m_bComplete(true)
         , m_bPaintInitialized(false)
-        , InCompleteHyperLabel(NULL)
+        , InCompleteHyperLabel(nullptr)
     {}
 
     RoadmapItem* InCompleteHyperLabel;
@@ -212,7 +212,7 @@ void ORoadmap::implInit(vcl::RenderContext& rRenderContext)
     aFont.SetUnderline(UNDERLINE_SINGLE);
     rRenderContext.SetFont(aFont);
     rRenderContext.SetBackground(Wallpaper(rStyleSettings.GetFieldColor()));
-    m_pImpl->InCompleteHyperLabel = NULL;
+    m_pImpl->InCompleteHyperLabel = nullptr;
     m_pImpl->setCurItemID(-1);
     m_pImpl->setComplete(true);
     m_pImpl->m_bPaintInitialized = true;
@@ -250,7 +250,7 @@ void ORoadmap::dispose()
     if ( ! m_pImpl->isComplete() )
         delete m_pImpl->InCompleteHyperLabel;
     delete m_pImpl;
-    m_pImpl = NULL;
+    m_pImpl = nullptr;
     Control::dispose();
 }
 
@@ -261,7 +261,7 @@ RoadmapTypes::ItemId ORoadmap::GetCurrentRoadmapItemID() const
 
 RoadmapItem* ORoadmap::GetPreviousHyperLabel(ItemIndex _Index)
 {
-    RoadmapItem* pOldItem = NULL;
+    RoadmapItem* pOldItem = nullptr;
     if ( _Index > 0 )
         pOldItem = m_pImpl->getHyperLabels().at( _Index - 1 );
     return pOldItem;
@@ -272,7 +272,7 @@ RoadmapItem* ORoadmap::InsertHyperLabel(ItemIndex _Index, const OUString& _sLabe
     if (m_pImpl->getItemCount() == 0)
         m_pImpl->initItemSize();
 
-    RoadmapItem* pItem = NULL;
+    RoadmapItem* pItem = nullptr;
     RoadmapItem* pOldItem = GetPreviousHyperLabel( _Index );
 
     pItem = new RoadmapItem( *this, m_pImpl->getItemSize() );
@@ -327,10 +327,10 @@ void ORoadmap::SetRoadmapComplete(bool _bComplete)
     m_pImpl->setComplete( _bComplete );
     if (_bComplete)
     {
-        if (m_pImpl->InCompleteHyperLabel != NULL)
+        if (m_pImpl->InCompleteHyperLabel != nullptr)
         {
             delete m_pImpl->InCompleteHyperLabel;
-            m_pImpl->InCompleteHyperLabel = NULL;
+            m_pImpl->InCompleteHyperLabel = nullptr;
         }
     }
     else if (bWasComplete)
@@ -364,7 +364,7 @@ void ORoadmap::UpdatefollowingHyperLabels(ItemIndex _nIndex)
 void ORoadmap::ReplaceRoadmapItem(ItemIndex _Index, const OUString& _RoadmapItem, ItemId _RMID, bool _bEnabled)
 {
     RoadmapItem* pItem = GetByIndex( _Index);
-    if ( pItem != NULL )
+    if ( pItem != nullptr )
     {
         pItem->Update( _Index,  _RoadmapItem );
         pItem->SetID( _RMID );
@@ -409,14 +409,14 @@ bool ORoadmap::IsRoadmapComplete() const
 void ORoadmap::EnableRoadmapItem( ItemId _nItemId, bool _bEnable, ItemIndex _nStartIndex )
 {
     RoadmapItem* pItem = GetByID( _nItemId, _nStartIndex );
-    if ( pItem != NULL )
+    if ( pItem != nullptr )
         pItem->Enable( _bEnable );
 }
 
 void ORoadmap::ChangeRoadmapItemLabel( ItemId _nID, const OUString& _sLabel, ItemIndex _nStartIndex )
 {
     RoadmapItem* pItem = GetByID( _nID, _nStartIndex );
-    if ( pItem != NULL )
+    if ( pItem != nullptr )
     {
         pItem->Update( pItem->GetIndex(), _sLabel );
 
@@ -434,7 +434,7 @@ void ORoadmap::ChangeRoadmapItemLabel( ItemId _nID, const OUString& _sLabel, Ite
 void ORoadmap::ChangeRoadmapItemID(ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex)
 {
     RoadmapItem* pItem = GetByID( _nID, _nStartIndex );
-    if ( pItem != NULL )
+    if ( pItem != nullptr )
         pItem->SetID( _NewID );
 }
 
@@ -451,7 +451,7 @@ RoadmapItem* ORoadmap::GetByID(ItemId _nID, ItemIndex _nStartIndex)
         if ( nLocID == _nID )
             return *i;
     }
-    return NULL;
+    return nullptr;
 }
 
 const RoadmapItem* ORoadmap::GetByID(ItemId _nID, ItemIndex _nStartIndex) const
@@ -466,7 +466,7 @@ RoadmapItem* ORoadmap::GetByIndex(ItemIndex _nItemIndex)
     {
         return rItems.at( _nItemIndex );
     }
-    return NULL;
+    return nullptr;
 }
 
 const RoadmapItem* ORoadmap::GetByIndex(ItemIndex _nItemIndex) const
@@ -533,7 +533,7 @@ void ORoadmap::Select()
 void ORoadmap::GetFocus()
 {
     RoadmapItem* pCurHyperLabel = GetByID( GetCurrentRoadmapItemID() );
-    if ( pCurHyperLabel != NULL )
+    if ( pCurHyperLabel != nullptr )
         pCurHyperLabel->GrabFocus();
 }
 
@@ -541,7 +541,7 @@ bool ORoadmap::SelectRoadmapItemByID( ItemId _nNewID )
 {
     DeselectOldRoadmapItems();
     RoadmapItem* pItem = GetByID( _nNewID );
-    if ( pItem != NULL )
+    if ( pItem != nullptr )
     {
         if ( pItem->IsEnabled() )
         {
@@ -606,7 +606,7 @@ RoadmapItem* ORoadmap::GetByPointer(vcl::Window* pWindow)
         if ( (*i)->Contains( pWindow ) )
             return *i;
     }
-    return NULL;
+    return nullptr;
 }
 
 bool ORoadmap::PreNotify(NotifyEvent& _rNEvt)
@@ -616,7 +616,7 @@ bool ORoadmap::PreNotify(NotifyEvent& _rNEvt)
     {
         vcl::Window* pWindow = _rNEvt.GetWindow();
         RoadmapItem* pItem = GetByPointer( pWindow );
-        if ( pItem != NULL )
+        if ( pItem != nullptr )
         {
             sal_Int16 nKeyCode = _rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
             switch( nKeyCode )
@@ -664,7 +664,7 @@ void ORoadmap::DataChanged(const DataChangedEvent& rDCEvt)
         SetFont( aFont );
         RoadmapTypes::ItemId curItemID = GetCurrentRoadmapItemID();
         RoadmapItem* pLabelItem = GetByID( curItemID );
-        if (pLabelItem != NULL)
+        if (pLabelItem != nullptr)
         {
             pLabelItem->ToggleBackgroundColor(rStyleSettings.GetHighlightColor());
         }
@@ -740,7 +740,7 @@ RoadmapTypes::ItemIndex RoadmapItem::GetIndex() const
 void RoadmapItem::SetPosition(RoadmapItem* _pOldItem)
 {
     Point aIDPos;
-    if ( _pOldItem == NULL )
+    if ( _pOldItem == nullptr )
     {
         aIDPos = mpID->LogicToPixel( Point( ROADMAP_INDENT_X, ROADMAP_INDENT_Y ), MAP_APPFONT );
     }
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 40328b708fae..b48f1e84f6fd 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -235,7 +235,7 @@ void Ruler::ImplInit( WinBits nWinBits )
     mnVirWidth      = 0;                    // width or height from VirtualDevice
     mnVirHeight     = 0;                    // height of width from VirtualDevice
     mnDragPos       = 0;                    // Drag-Position (Null point)
-    mnUpdateEvtId   = 0;                    // Update event was not sent yet
+    mnUpdateEvtId   = nullptr;                    // Update event was not sent yet
     mnDragAryPos    = 0;                    // Drag-Array-Index
     mnDragSize      = 0;                    // Did size change at dragging
     mnDragModifier  = 0;                    // Modifier key at dragging
@@ -283,7 +283,7 @@ void Ruler::ImplInit( WinBits nWinBits )
         aDefSize.Width() = nDefHeight;
     SetOutputSizePixel( aDefSize );
     SetType(WINDOW_RULER);
-    pAccContext = NULL;
+    pAccContext = nullptr;
 }
 
 Ruler::Ruler( vcl::Window* pParent, WinBits nWinStyle ) :
@@ -291,7 +291,7 @@ Ruler::Ruler( vcl::Window* pParent, WinBits nWinStyle ) :
     maVirDev( VclPtr<VirtualDevice>::Create(*this) ),
     maMapMode( MAP_100TH_MM ),
     mpSaveData(new ImplRulerData),
-    mpData(NULL),
+    mpData(nullptr),
     mpDragData(new ImplRulerData)
 {
     // Check to see if the ruler constructor has
@@ -331,13 +331,13 @@ void Ruler::dispose()
     if ( mnUpdateEvtId )
         Application::RemoveUserEvent( mnUpdateEvtId );
     delete mpSaveData;
-    mpSaveData = NULL;
+    mpSaveData = nullptr;
     delete mpDragData;
-    mpDragData = NULL;
+    mpDragData = nullptr;
     if( pAccContext )
     {
         pAccContext->release();
-        pAccContext = NULL;
+        pAccContext = nullptr;
     }
     Window::dispose();
 }
@@ -861,7 +861,7 @@ void Ruler::ImplDrawIndents(vcl::RenderContext& rRenderContext, long nMin, long
             if (RULER_INDENT_BORDER != nIndentStyle)
             {
                 bool bIsHit = false;
-                if(mxCurrentHitTest.get() != NULL && mxCurrentHitTest->eType == RULER_TYPE_INDENT)
+                if(mxCurrentHitTest.get() != nullptr && mxCurrentHitTest->eType == RULER_TYPE_INDENT)
                 {
                     bIsHit = mxCurrentHitTest->nAryPos == j;
                 }
@@ -2109,7 +2109,7 @@ void Ruler::MouseMove( const MouseEvent& rMEvt )
         }
     }
 
-    if (mxPreviousHitTest.get() != NULL && mxPreviousHitTest->eType != mxCurrentHitTest->eType)
+    if (mxPreviousHitTest.get() != nullptr && mxPreviousHitTest->eType != mxCurrentHitTest->eType)
     {
         mbFormat = true;
     }
@@ -2724,7 +2724,7 @@ void Ruler::SetIndents( sal_uInt32 aIndentArraySize, const RulerIndent* pIndentA
 
 void Ruler::SetTabs( sal_uInt32 aTabArraySize, const RulerTab* pTabArray )
 {
-    if ( aTabArraySize == 0 || pTabArray == NULL )
+    if ( aTabArraySize == 0 || pTabArray == nullptr )
     {
         if ( mpData->pTabs.empty() )
             return;
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index f74ba8c5f276..cc2760efd840 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -305,7 +305,7 @@ void SvtScriptedTextHelper_Impl::DrawText( const Point& _rPos )
 
 
 SvtScriptedTextHelper::SvtScriptedTextHelper( OutputDevice& _rOutDevice ) :
-    mpImpl( new SvtScriptedTextHelper_Impl( _rOutDevice, NULL, NULL, NULL ) )
+    mpImpl( new SvtScriptedTextHelper_Impl( _rOutDevice, nullptr, nullptr, nullptr ) )
 {
 }
 
@@ -326,7 +326,7 @@ void SvtScriptedTextHelper::SetFonts( vcl::Font* _pLatinFont, vcl::Font* _pAsian
 
 void SvtScriptedTextHelper::SetDefaultFont()
 {
-    mpImpl->SetFonts( NULL, NULL, NULL );
+    mpImpl->SetFonts( nullptr, nullptr, nullptr );
 }
 
 void SvtScriptedTextHelper::SetText( const OUString& _rText, const uno::Reference< i18n::XBreakIterator >& _xBreakIter )
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index c7fe5c767c06..35a7f1e02321 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -76,11 +76,11 @@ void ScrollableWindow::Command( const CommandEvent& rCEvt )
         if ( aHScroll->IsVisible() )
             pHScrBar = aHScroll.get();
         else
-            pHScrBar = NULL;
+            pHScrBar = nullptr;
         if ( aVScroll->IsVisible() )
             pVScrBar = aVScroll.get();
         else
-            pVScrBar = NULL;
+            pVScrBar = nullptr;
         if ( HandleScrollCommand( rCEvt, pHScrBar, pVScrBar ) )
             return;
     }
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index cf006a8e0885..4296dbb3b093 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -102,7 +102,7 @@ void FontNameMenu::SetCurName(const OUString& rName)
 }
 
 FontSizeMenu::FontSizeMenu()
-:    mpHeightAry( NULL )
+:    mpHeightAry( nullptr )
 ,    mnCurHeight( 100 )
 {
     SetMenuFlags( GetMenuFlags() | MenuFlags::NoAutoMnemonics );
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index dec6f6fd9ef3..eb2f5aacb0a5 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -472,7 +472,7 @@ IMPL_LINK_TYPED( TabBarEdit, ImplEndEditHdl, void*, pCancel, void )
         maLoseFocusIdle.Start();
     }
     else
-        GetParent()->EndEditMode( pCancel != 0 );
+        GetParent()->EndEditMode( pCancel != nullptr );
 }
 
 IMPL_LINK_NOARG_TYPED(TabBarEdit, ImplEndTimerHdl, Idle *, void)
@@ -599,7 +599,7 @@ ImplTabBarItem* TabBar::seek( size_t i )
         maCurrentItemList = i;
         return mpImpl->mpItemList[maCurrentItemList];
     }
-    return NULL;
+    return nullptr;
 }
 
 ImplTabBarItem* TabBar::prev()
@@ -608,7 +608,7 @@ ImplTabBarItem* TabBar::prev()
     {
         return mpImpl->mpItemList[--maCurrentItemList];
     }
-    return NULL;
+    return nullptr;
 }
 
 ImplTabBarItem* TabBar::next()
@@ -617,7 +617,7 @@ ImplTabBarItem* TabBar::next()
     {
         return mpImpl->mpItemList[++maCurrentItemList];
     }
-    return NULL;
+    return nullptr;
 }
 
 void TabBar::ImplInitSettings( bool bFont, bool bBackground )
@@ -1222,7 +1222,7 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rect)
     // Now, start drawing the tabs.
 
     ImplTabBarItem* pItem = ImplGetLastTabBarItem(nItemCount);
-    ImplTabBarItem* pCurItem = NULL;
+    ImplTabBarItem* pCurItem = nullptr;
     while (pItem)
     {
         // emit CurrentItem last, as it covers all others
@@ -1291,7 +1291,7 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rect)
             if (bCurrent)
                 break;
 
-            pItem = NULL;
+            pItem = nullptr;
         }
 
         if (!pItem)
@@ -1923,7 +1923,7 @@ void TabBar::SetCurPageId(sal_uInt16 nPageId)
         if (mnCurPageId)
             pOldItem = mpImpl->mpItemList[GetPagePos(mnCurPageId)];
         else
-            pOldItem = NULL;
+            pOldItem = nullptr;
 
         // deselect previous page if page was not selected, if this is the
         // only selected page
@@ -2176,7 +2176,7 @@ bool TabBar::StartEditMode(sal_uInt16 nPageId)
 
 bool TabBar::IsInEditMode() const
 {
-    return mpImpl->mpEdit.get() != NULL;
+    return mpImpl->mpEdit.get() != nullptr;
 }
 
 void TabBar::EndEditMode(bool bCancel)
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index e1871b8c372e..08503e372f1a 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -47,7 +47,7 @@ static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow )
         // ->manually search topmost system window
         // required because their might be another system window between this and the top window
         pWindow = pWindow->GetParent();
-        SystemWindow* pTopMostSysWin = NULL;
+        SystemWindow* pTopMostSysWin = nullptr;
         while ( pWindow )
         {
             if ( pWindow->IsSystemWindow() )
@@ -59,7 +59,7 @@ static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow )
         return pWindow;
     }
 
-    return NULL;
+    return nullptr;
 }
 
 
@@ -74,7 +74,7 @@ void ToolbarMenuEntry::init( int nEntryId, MenuItemBits nBits )
     mbChecked = false;
     mbEnabled = true;
 
-    mpControl = NULL;
+    mpControl = nullptr;
 }
 
 
@@ -204,7 +204,7 @@ ToolbarMenu_Impl::ToolbarMenu_Impl( ToolbarMenu& rMenu, const css::uno::Referenc
 
 ToolbarMenu_Impl::~ToolbarMenu_Impl()
 {
-    setAccessible( 0 );
+    setAccessible( nullptr );
 }
 
 
@@ -418,7 +418,7 @@ void ToolbarMenu_Impl::notifyHighlightedEntry()
 ToolbarMenuEntry* ToolbarMenu_Impl::implGetEntry( int nEntry ) const
 {
     if( (nEntry < 0) || (nEntry >= (int)maEntryVector.size() ) )
-        return NULL;
+        return nullptr;
 
     return maEntryVector[nEntry];
 }
@@ -479,7 +479,7 @@ void ToolbarMenu::dispose()
     }
 
     delete mpImpl;
-    mpImpl = NULL;
+    mpImpl = nullptr;
 
     DockingWindow::dispose();
 }
@@ -803,7 +803,7 @@ void ToolbarMenu::appendEntry( ToolbarMenuEntry* pEntry )
 
 void ToolbarMenu::appendSeparator()
 {
-    appendEntry( 0 );
+    appendEntry( nullptr );
 }
 
 
@@ -840,7 +840,7 @@ ToolbarMenuEntry* ToolbarMenu::implSearchEntry( int nEntryId ) const
         }
     }
 
-    return NULL;
+    return nullptr;
 }
 
 
@@ -945,7 +945,7 @@ void ToolbarMenu::implSelectEntry( int nSelectedEntry )
 {
     mpImpl->mnSelectedEntry = nSelectedEntry;
 
-    ToolbarMenuEntry* pEntry = NULL;
+    ToolbarMenuEntry* pEntry = nullptr;
     if( nSelectedEntry != -1 )
         pEntry = mpImpl->maEntryVector[ nSelectedEntry ];
 
@@ -1139,7 +1139,7 @@ ToolbarMenuEntry* ToolbarMenu::implCursorUpDown( bool bUp, bool bHomeEnd )
         }
     } while ( n != nLoop );
 
-    return 0;
+    return nullptr;
 }
 
 
@@ -1179,7 +1179,7 @@ void ToolbarMenu_Impl::implHighlightControl( sal_uInt16 nCode, Control* pControl
 
 void ToolbarMenu::KeyInput( const KeyEvent& rKEvent )
 {
-    Control* pForwardControl = 0;
+    Control* pForwardControl = nullptr;
     sal_uInt16 nCode = rKEvent.GetKeyCode().GetCode();
     switch ( nCode )
     {
@@ -1273,7 +1273,7 @@ static void ImplPaintCheckBackground(vcl::RenderContext& rRenderContext, vcl::Wi
     {
         const StyleSettings& rSettings = rRenderContext.GetSettings().GetStyleSettings();
         Color aColor(i_bHighlight ? rSettings.GetMenuHighlightTextColor() : rSettings.GetHighlightColor());
-        vcl::RenderTools::DrawSelectionBackground(rRenderContext, rWindow, i_rRect, 0, i_bHighlight, true, false, NULL, 2, &aColor);
+        vcl::RenderTools::DrawSelectionBackground(rRenderContext, rWindow, i_rRect, 0, i_bHighlight, true, false, nullptr, 2, &aColor);
     }
 }
 
@@ -1304,7 +1304,7 @@ void ToolbarMenu::implPaint(vcl::RenderContext& rRenderContext, ToolbarMenuEntry
         aPos.Y() += nBorder;
         aPos.Y() += nStartY;
 
-        if ((pEntry == 0) && !pThisOnly)
+        if ((pEntry == nullptr) && !pThisOnly)
         {
             // Separator
             aTmpPos.Y() = aPos.Y() + ((SEPARATOR_HEIGHT - 2) / 2);
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index c27c689f665a..73d1cf1108d6 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -86,7 +86,7 @@ void ToolbarMenuAcc::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
         case VCLEVENT_OBJECT_DYING:
         {
             mpParent->mrMenu.RemoveEventListener( LINK( this, ToolbarMenuAcc, WindowEventListener ) );
-            mpParent = 0;
+            mpParent = nullptr;
         }
         break;
 
@@ -538,7 +538,7 @@ void SAL_CALL ToolbarMenuAcc::disposing()
 
         // Reset the pointer to the parent.  It has to be the one who has
         // disposed us because he is dying.
-        mpParent = NULL;
+        mpParent = nullptr;
     }
 
     // Inform all listeners that this objects is disposing.
@@ -598,7 +598,7 @@ void SAL_CALL ToolbarMenuEntryAcc::disposing()
 
         // Reset the pointer to the parent.  It has to be the one who has
         // disposed us because he is dying.
-        mpParent = NULL;
+        mpParent = nullptr;
     }
 
     // Inform all listeners that this objects is disposing.
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 89eb0756073f..24c3b27edef4 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -40,7 +40,7 @@ ValueSetItem::ValueSetItem( ValueSet& rParent )
     , mnId(0)
     , meType(VALUESETITEM_NONE)
     , mbVisible(true)
-    , mpData(NULL)
+    , mpData(nullptr)
     , mbSelected(false)
     , mxAcc()
 {
@@ -130,11 +130,11 @@ ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterfa
     try
     {
         uno::Reference< lang::XUnoTunnel > xUnoTunnel( rxData, uno::UNO_QUERY );
-        return( xUnoTunnel.is() ? reinterpret_cast<ValueSetAcc*>(sal::static_int_cast<sal_IntPtr>(xUnoTunnel->getSomething( ValueSetAcc::getUnoTunnelId() ))) : NULL );
+        return( xUnoTunnel.is() ? reinterpret_cast<ValueSetAcc*>(sal::static_int_cast<sal_IntPtr>(xUnoTunnel->getSomething( ValueSetAcc::getUnoTunnelId() ))) : nullptr );
     }
     catch(const css::uno::Exception&)
     {
-        return NULL;
+        return nullptr;
     }
 }
 
@@ -554,7 +554,7 @@ void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex )
     const SolarMutexGuard aSolarGuard;
     ValueSetItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(nChildIndex));
 
-    if(pItem != NULL)
+    if(pItem != nullptr)
     {
         mpParent->SelectItem( pItem->mnId );
         mpParent->Select ();
@@ -573,7 +573,7 @@ sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex
     ValueSetItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(nChildIndex));
     bool            bRet = false;
 
-    if (pItem != NULL)
+    if (pItem != nullptr)
         bRet = mpParent->IsItemSelected( pItem->mnId );
     else
         throw lang::IndexOutOfBoundsException();
@@ -683,7 +683,7 @@ void SAL_CALL ValueSetAcc::disposing()
 
         // Reset the pointer to the parent.  It has to be the one who has
         // disposed us because he is dying.
-        mpParent = NULL;
+        mpParent = nullptr;
     }
 
     // Inform all listeners that this objects is disposing.
@@ -719,7 +719,7 @@ sal_uInt16 ValueSetAcc::getItemCount() const
 
 ValueSetItem* ValueSetAcc::getItem (sal_uInt16 nIndex) const
 {
-    ValueSetItem* pItem = NULL;
+    ValueSetItem* pItem = nullptr;
 
     if (HasNoneField())
     {
@@ -730,7 +730,7 @@ ValueSetItem* ValueSetAcc::getItem (sal_uInt16 nIndex) const
             // Shift down the index to compensate for the none field.
             nIndex -= 1;
     }
-    if (pItem == NULL)
+    if (pItem == nullptr)
         pItem = mpParent->ImplGetItem (static_cast<sal_uInt16>(nIndex));
 
     return pItem;
@@ -797,7 +797,7 @@ void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValu
 void ValueItemAcc::ParentDestroyed()
 {
     const ::osl::MutexGuard aGuard( maMutex );
-    mpParent = NULL;
+    mpParent = nullptr;
 }
 
 namespace
@@ -818,11 +818,11 @@ ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInter
     try
     {
         uno::Reference< lang::XUnoTunnel > xUnoTunnel( rxData, uno::UNO_QUERY );
-        return( xUnoTunnel.is() ? reinterpret_cast<ValueItemAcc*>(sal::static_int_cast<sal_IntPtr>(xUnoTunnel->getSomething( ValueItemAcc::getUnoTunnelId() ))) : NULL );
+        return( xUnoTunnel.is() ? reinterpret_cast<ValueItemAcc*>(sal::static_int_cast<sal_IntPtr>(xUnoTunnel->getSomething( ValueItemAcc::getUnoTunnelId() ))) : nullptr );
     }
     catch(const css::uno::Exception&)
     {
-        return NULL;
+        return nullptr;
     }
 }
 
@@ -890,11 +890,11 @@ sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent()
             }
             catch (const lang::IndexOutOfBoundsException&)
             {
-                pItem = NULL;
+                pItem = nullptr;
             }
 
             // Do not create an accessible object for the test.
-            if (pItem != NULL && pItem->mxAcc.is())
+            if (pItem != nullptr && pItem->mxAcc.is())
                 if (pItem->GetAccessible( mbIsTransientChildrenDisabled ).get() == this )
                 {
                     nIndexInParent = i;
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 5f780ca34592..5696b8ac4a41 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -57,8 +57,8 @@ enum
 
 void ValueSet::ImplInit()
 {
-    mpNoneItem.reset(NULL);
-    mxScrollBar.reset(NULL);
+    mpNoneItem.reset(nullptr);
+    mxScrollBar.reset(nullptr);
 
     mnItemWidth         = 0;
     mnItemHeight        = 0;
@@ -408,7 +408,7 @@ void ValueSet::Format(vcl::RenderContext& rRenderContext)
         nNoneSpace = 0;
 
         if (mpNoneItem.get())
-            mpNoneItem.reset(NULL);
+            mpNoneItem.reset(nullptr);
     }
 
     // calculate ScrollBar width
@@ -585,7 +585,7 @@ void ValueSet::Format(vcl::RenderContext& rRenderContext)
         // create NoSelection field and show it
         if (nStyle & WB_NONEFIELD)
         {
-            if (mpNoneItem.get() == NULL)
+            if (mpNoneItem.get() == nullptr)
                 mpNoneItem.reset(new ValueSetItem(*this));
 
             mpNoneItem->mnId = 0;
@@ -910,7 +910,7 @@ void ValueSet::ImplHideSelect( sal_uInt16 nItemId )
     }
     else
     {
-        if (mpNoneItem.get() == NULL)
+        if (mpNoneItem.get() == nullptr)
         {
             return;
         }
@@ -1079,12 +1079,12 @@ ValueSetItem* ValueSet::ImplGetItem( size_t nPos )
     if (nPos == VALUESET_ITEM_NONEITEM)
         return mpNoneItem.get();
     else
-        return (nPos < mItemList.size()) ? mItemList[nPos] : NULL;
+        return (nPos < mItemList.size()) ? mItemList[nPos] : nullptr;
 }
 
 ValueSetItem* ValueSet::ImplGetFirstItem()
 {
-    return mItemList.size() ? mItemList[0] : NULL;
+    return mItemList.size() ? mItemList[0] : nullptr;
 }
 
 sal_uInt16 ValueSet::ImplGetVisibleItemCount() const
@@ -1169,7 +1169,7 @@ void ValueSet::ImplEndTracking( const Point& rPos, bool bCancel )
 
     // restore the old status in case of termination
     if ( bCancel )
-        pItem = NULL;
+        pItem = nullptr;
     else
         pItem = ImplGetItem( ImplGetItem( rPos ) );
 
@@ -1419,7 +1419,7 @@ void ValueSet::Command( const CommandEvent& rCommandEvent )
          rCommandEvent.GetCommand() == CommandEventId::StartAutoScroll ||
          rCommandEvent.GetCommand() == CommandEventId::AutoScroll )
     {
-        if ( HandleScrollCommand( rCommandEvent, NULL, mxScrollBar.get() ) )
+        if ( HandleScrollCommand( rCommandEvent, nullptr, mxScrollBar.get() ) )
             return;
     }
 
@@ -1896,8 +1896,8 @@ void ValueSet::SelectItem( sal_uInt16 nItemId )
             else
                 pItem = mpNoneItem.get();
 
-            ValueItemAcc* pItemAcc = NULL;
-            if (pItem != NULL)
+            ValueItemAcc* pItemAcc = nullptr;
+            if (pItem != nullptr)
                 pItemAcc = ValueItemAcc::getImplementation( pItem->GetAccessible( mbIsTransientChildrenDisabled ) );
 
             if( pItemAcc )
@@ -2024,7 +2024,7 @@ void* ValueSet::GetItemData( sal_uInt16 nItemId ) const
     if ( nPos != VALUESET_ITEM_NOTFOUND )
         return mItemList[nPos]->mpData;
     else
-        return NULL;
+        return nullptr;
 }
 
 void ValueSet::SetItemText(sal_uInt16 nItemId, const OUString& rText)
diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx
index aa1470553671..7430cbd5153c 100644
--- a/svtools/source/control/vclxaccessibleheaderbar.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbar.cxx
@@ -54,7 +54,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXHeaderBar::Cre
 
 VCLXAccessibleHeaderBar::VCLXAccessibleHeaderBar( VCLXWindow* pVCLWindow )
     :VCLXAccessibleComponent( pVCLWindow )
-    ,m_pHeadBar(NULL)
+    ,m_pHeadBar(nullptr)
 {
     m_pHeadBar = GetAs< HeaderBar >();
 }
diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
index c55bf0be9e73..fd4fe47d9268 100644
--- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
@@ -58,7 +58,7 @@ VCLXAccessibleHeaderBarItem::VCLXAccessibleHeaderBarItem( HeaderBar*    pHeadBar
 VCLXAccessibleHeaderBarItem::~VCLXAccessibleHeaderBarItem()
 {
     delete m_pExternalLock;
-    m_pExternalLock = NULL;
+    m_pExternalLock = nullptr;
 }
 
 void VCLXAccessibleHeaderBarItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )