loplugin:nullptr (automatic rewrite)

Change-Id: Id11454397abad090741c5d98e2ae585531c886f6
author: Stephan Bergmann <sbergman@redhat.com> 2015-11-10 10:19:46 +0100
committer: Stephan Bergmann <sbergman@redhat.com> 2015-11-10 10:31:31 +0100
commit: 822a0b7046d8f0a8325ad158ea6756d33846c83e (patch)
tree: e1683caf123afd514361f85c389db52514d02890 /lotuswordpro
parent: 53a2e93fc5a4872b36fb8e76ddd4b722a18cb49b (diff)
104 files changed, 520 insertions, 520 deletions
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx
index 22b5ed6dc2e9..9c45a0c9b444 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -74,9 +74,9 @@ sal_uLong BenOpenContainer(LwpSvStream * pStream, pLtcBenContainer * ppContainer
 {
     BenError Err;
 
-    *ppContainer = NULL;
+    *ppContainer = nullptr;
 
-    if (NULL == pStream)
+    if (nullptr == pStream)
     {
         return BenErr_ContainerWithNoObjects;
     }
@@ -116,7 +116,7 @@ LtcBenContainer::RegisterPropertyName(const char * sPropertyName,
     pCBenNamedObject pNamedObject = FindNamedObject(&cNamedObjects,
       sPropertyName, &pPrevNamedObjectListElmt);
 
-    if (pNamedObject != NULL)
+    if (pNamedObject != nullptr)
     {
         if (! pNamedObject->IsPropertyName())
             return BenErr_NameConflict;
@@ -125,7 +125,7 @@ LtcBenContainer::RegisterPropertyName(const char * sPropertyName,
     else
     {
         pCUtListElmt pPrevObject;
-        if (FindID(&cObjects, cNextAvailObjectID, &pPrevObject) != NULL)
+        if (FindID(&cObjects, cNextAvailObjectID, &pPrevObject) != nullptr)
             return BenErr_DuplicateObjectID;
 
         *ppPropertyName = new CBenPropertyName(this, cNextAvailObjectID,
@@ -146,11 +146,11 @@ pCBenObject
 LtcBenContainer::FindNextObjectWithProperty(pCBenObject pCurrObject,
   BenObjectID PropertyID)
 {
-    while ((pCurrObject = GetNextObject(pCurrObject)) != NULL)
-        if (pCurrObject->UseProperty(PropertyID) != NULL)
+    while ((pCurrObject = GetNextObject(pCurrObject)) != nullptr)
+        if (pCurrObject->UseProperty(PropertyID) != nullptr)
             return pCurrObject;
 
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -229,19 +229,19 @@ LtcUtBenValueStream * LtcBenContainer::FindNextValueStreamWithPropertyName(const
     CBenPropertyName * pPropertyName;
     RegisterPropertyName(sPropertyName, &pPropertyName);        // Get property name object
 
-    if (NULL == pPropertyName)
-        return NULL;                                            // Property not exist
+    if (nullptr == pPropertyName)
+        return nullptr;                                            // Property not exist
 
     // Get current object
-    CBenObject * pObj = NULL;
-    if (pCurrentValueStream != NULL)
+    CBenObject * pObj = nullptr;
+    if (pCurrentValueStream != nullptr)
     {
         pObj = pCurrentValueStream->GetValue()->GetProperty()->GetBenObject();
     }
 
     pObj =FindNextObjectWithProperty(pObj, pPropertyName->GetID()); // Get next object with same property name
-    if (NULL == pObj)
-        return NULL;
+    if (nullptr == pObj)
+        return nullptr;
 
     CBenValue * pValue;
     LtcUtBenValueStream * pValueStream;
@@ -260,7 +260,7 @@ LtcUtBenValueStream * LtcBenContainer::FindNextValueStreamWithPropertyName(const
 */
 LtcUtBenValueStream * LtcBenContainer::FindValueStreamWithPropertyName(const char * sPropertyName)
 {
-    return FindNextValueStreamWithPropertyName(sPropertyName, NULL);
+    return FindNextValueStreamWithPropertyName(sPropertyName, nullptr);
 }
 /**
 *   <description>
@@ -292,7 +292,7 @@ BenError LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char *p
 {
     if (!pObjectName)
     {
-        pStream = NULL;
+        pStream = nullptr;
         return BenErr_NamedObjectError;
     }
     // construct the string of property name
@@ -303,9 +303,9 @@ BenError LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char *p
     sprintf(sDName, "%s-D", pObjectName);
 
     /* traverse the found properties and construct the stream vectors */
-    SvMemoryStream * pMemStream = NULL;
+    SvMemoryStream * pMemStream = nullptr;
     // get S&D's stream and merge them together
-    SvStream *pD = NULL, *pS = NULL;
+    SvStream *pD = nullptr, *pS = nullptr;
 
     pS = FindValueStreamWithPropertyName(sSName);
     pD = FindValueStreamWithPropertyName(sDName);
@@ -325,12 +325,12 @@ BenError LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char *p
     // the 'D' stream is NULL or it has invalid length
     if (nLen <= 0)
     {
-        pStream = NULL;
+        pStream = nullptr;
         return BenErr_NamedObjectError;
     }
 
     char * pBuf = new char[nLen];
-    assert(pBuf != NULL);
+    assert(pBuf != nullptr);
     char * pPointer = pBuf;
     if(pD)
     {
@@ -345,7 +345,7 @@ BenError LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char *p
     }
 
     pMemStream = new SvMemoryStream(pBuf, nLen, StreamMode::READ);
-    assert(pMemStream != NULL);
+    assert(pMemStream != nullptr);
 
     pStream = pMemStream;
     return BenErr_OK;
diff --git a/lotuswordpro/source/filter/benlist.cxx b/lotuswordpro/source/filter/benlist.cxx
index 17acf1971be6..242d8d14f07e 100644
--- a/lotuswordpro/source/filter/benlist.cxx
+++ b/lotuswordpro/source/filter/benlist.cxx
@@ -77,15 +77,15 @@ FindNamedObject(pCUtList pList, const char * sName,
             continue;
         else
         {
-            if (ppPrev != NULL)
+            if (ppPrev != nullptr)
                 *ppPrev = pCurrNamedObjectListElmt;
-            return NULL;
+            return nullptr;
         }
     }
 
-    if (ppPrev != NULL)
+    if (ppPrev != nullptr)
         *ppPrev = &rTerminating;
-    return NULL;
+    return nullptr;
 }
 
 // Assume list is of BenIDListElmt list elements, sorted by ID
@@ -104,15 +104,15 @@ FindID(pCUtList pList, BenObjectID ObjectID, pCUtListElmt * ppPrev)
             continue;
         else
         {
-            if (ppPrev != NULL)
+            if (ppPrev != nullptr)
                 *ppPrev = pCurrIDListElmt;
-            return NULL;
+            return nullptr;
         }
     }
 
-    if (ppPrev != NULL)
+    if (ppPrev != nullptr)
         *ppPrev = &rTerminating;
-    return NULL;
+    return nullptr;
 }
 } //end namespace OpenStormBento
 
diff --git a/lotuswordpro/source/filter/benobj.cxx b/lotuswordpro/source/filter/benobj.cxx
index 8b5d2d574d3a..b16c0928572f 100644
--- a/lotuswordpro/source/filter/benobj.cxx
+++ b/lotuswordpro/source/filter/benobj.cxx
@@ -70,8 +70,8 @@ pCBenValue
 CBenObject::UseValue(BenObjectID PropertyID)
 {
     pCBenProperty pProperty = UseProperty(PropertyID);
-    if (pProperty == NULL)
-        return NULL;
+    if (pProperty == nullptr)
+        return nullptr;
     return &pProperty->UseValue();
 }
 
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index 35ce91c484d8..75c94fe59cc0 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -156,7 +156,7 @@ class CBenNamedObjectListElmt : public CUtListElmt
 public: // Methods
     // added to remove warning
     explicit CBenNamedObjectListElmt(pCUtListElmt pPrev) : CUtListElmt(pPrev)
-      { cpNamedObject = NULL; }
+      { cpNamedObject = nullptr; }
     void SetNamedObject(pCBenNamedObject pObj)
     {
         cpNamedObject = pObj;
@@ -267,8 +267,8 @@ public: // Internal methods
     // added to remove WARNING
     explicit CBenValue(BenObjectID TypeID):CBenIDListElmt(TypeID)
     {
-        cpProperty = NULL;
-        cpReferencedList = NULL;
+        cpProperty = nullptr;
+        cpReferencedList = nullptr;
     }
 
     void SetProperty(pCBenProperty pProperty)
@@ -280,7 +280,7 @@ public: // Internal methods
       CBenIDListElmt(TypeID)
     {
         cpProperty = pProperty;
-        cpReferencedList = NULL;
+        cpReferencedList = nullptr;
     }
     inline pCBenValueSegment GetNextValueSegment(pCBenValueSegment
       pCurrValueSegment);
@@ -330,10 +330,10 @@ public: // Internal methods
       { cpValue = pValue; cImmediate = true;
       UtHugeMemcpy(cImmData, pImmData, Size); cSize = Size; }
     CBenValueSegment(BenContainerPos Pos, unsigned long Size)
-      { cpValue = NULL; cImmediate = false; cPos = Pos;
+      { cpValue = nullptr; cImmediate = false; cPos = Pos;
       cSize = Size; }
     CBenValueSegment(const void  * pImmData, unsigned short Size)
-      { cpValue = NULL; cImmediate = true;
+      { cpValue = nullptr; cImmediate = true;
       UtHugeMemcpy(cImmData, pImmData, Size); cSize = Size; }
     bool IsImmediate() { return cImmediate; }
     BenContainerPos GetPosition() { return cPos; }
diff --git a/lotuswordpro/source/filter/benval.cxx b/lotuswordpro/source/filter/benval.cxx
index 239159eb9047..8c6a08f64263 100644
--- a/lotuswordpro/source/filter/benval.cxx
+++ b/lotuswordpro/source/filter/benval.cxx
@@ -62,8 +62,8 @@ unsigned long
 CBenValue::GetValueSize()
 {
     unsigned long Size = 0;
-    pCBenValueSegment pCurr = NULL;
-    while ((pCurr = GetNextValueSegment(pCurr)) != NULL)
+    pCBenValueSegment pCurr = nullptr;
+    while ((pCurr = GetNextValueSegment(pCurr)) != nullptr)
         Size += pCurr->GetSize();
     return Size;
 }
@@ -75,7 +75,7 @@ CBenValue::ReadValueData(void * pReadBuffer, unsigned long Offset,
     BenError Err;
     unsigned long SegOffset = 0;
     *pAmtRead = 0;
-    pCBenValueSegment pCurrSeg = NULL;
+    pCBenValueSegment pCurrSeg = nullptr;
     pLtcBenContainer pContainer = GetContainer();
     BenByte* pBuffer = static_cast<BenByte*>(pReadBuffer);
 
@@ -86,7 +86,7 @@ CBenValue::ReadValueData(void * pReadBuffer, unsigned long Offset,
 
     /// SegOffset     -- current segment's start address offset, relative value in the whole value stream
 
-    while ((pCurrSeg = GetNextValueSegment(pCurrSeg)) != NULL)
+    while ((pCurrSeg = GetNextValueSegment(pCurrSeg)) != nullptr)
     {
         if (Amt == 0)               /// whole buffer is full now, so return
             return BenErr_OK;
diff --git a/lotuswordpro/source/filter/explode.cxx b/lotuswordpro/source/filter/explode.cxx
index 14a066383c02..356cc543fd51 100644
--- a/lotuswordpro/source/filter/explode.cxx
+++ b/lotuswordpro/source/filter/explode.cxx
@@ -462,12 +462,12 @@ HuffmanTreeNode::~HuffmanTreeNode()
     if (left)
     {
         delete left;
-        left = NULL;
+        left = nullptr;
     }
     if (right)
     {
         delete right;
-        right = NULL;
+        right = nullptr;
     }
 }
 
diff --git a/lotuswordpro/source/filter/explode.hxx b/lotuswordpro/source/filter/explode.hxx
index d5b0f51c899b..04c4cf5b455f 100644
--- a/lotuswordpro/source/filter/explode.hxx
+++ b/lotuswordpro/source/filter/explode.hxx
@@ -67,7 +67,7 @@ public:
     HuffmanTreeNode * right;
     sal_uInt32 value;
 
-    HuffmanTreeNode(sal_uInt32 value = 0xffffffff, HuffmanTreeNode * left = NULL, HuffmanTreeNode * right = NULL) ;
+    HuffmanTreeNode(sal_uInt32 value = 0xffffffff, HuffmanTreeNode * left = nullptr, HuffmanTreeNode * right = nullptr) ;
     ~HuffmanTreeNode() ;
     HuffmanTreeNode * InsertNode(sal_uInt32 nValue, const sal_Char * pInCode);
     HuffmanTreeNode * QueryNode(const sal_Char *pCode);
diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx
index 0a6e43c92804..862f332dc5f2 100644
--- a/lotuswordpro/source/filter/genericfilter.cxx
+++ b/lotuswordpro/source/filter/genericfilter.cxx
@@ -16,7 +16,7 @@ extern "C"
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL lotuswordpro_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
-    void * pRet = 0;
+    void * pRet = nullptr;
 
     OUString implName = OUString::createFromAscii( pImplName );
     if ( pServiceManager && implName.equals(LotusWordProImportFilter_getImplementationName()) )
diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx
index c947c60cd8a1..c9267e87addc 100644
--- a/lotuswordpro/source/filter/lwp9reader.cxx
+++ b/lotuswordpro/source/filter/lwp9reader.cxx
@@ -68,7 +68,7 @@
 Lwp9Reader::Lwp9Reader (LwpSvStream* pInputStream, IXFStream* pStream)
     : m_pDocStream(pInputStream)
     , m_pStream(pStream)
-    , m_pObjMgr(NULL)
+    , m_pObjMgr(nullptr)
     , m_LwpFileHdr()
 {}
 
@@ -143,7 +143,7 @@ void Lwp9Reader::ParseDocument()
 
     //Parse Doc Data
     LwpDocData *pDocData = dynamic_cast<LwpDocData*>(doc->GetDocData().obj().get());
-    if (pDocData!=NULL)
+    if (pDocData!=nullptr)
         pDocData->Parse(m_pStream);
 
     //Register Styles
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
index 98af13df5741..d54dfc4f4e4e 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
@@ -106,7 +106,7 @@ XFBGImage* LwpBackgroundStuff::GetFillPattern()
     // not pattern fill?
     if (!this->IsPatternFill())
     {
-        return NULL;
+        return nullptr;
     }
 
     // get pattern array from pattern table
@@ -160,7 +160,7 @@ XFBGImage* LwpBackgroundStuff::GetFillPattern()
     pXFBGImage->SetImageData(pImageBuff, nSize);
 
     delete [] pImageBuff;
-    pImageBuff = NULL;
+    pImageBuff = nullptr;
 
     pXFBGImage->SetRepeate();
 
diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.cxx b/lotuswordpro/source/filter/lwpbreaksoverride.cxx
index d5015902d53e..69514f975dad 100644
--- a/lotuswordpro/source/filter/lwpbreaksoverride.cxx
+++ b/lotuswordpro/source/filter/lwpbreaksoverride.cxx
@@ -71,7 +71,7 @@ LwpBreaksOverride::LwpBreaksOverride()
 
 LwpBreaksOverride::LwpBreaksOverride(LwpBreaksOverride const& rOther)
     : LwpOverride(rOther)
-    , m_pNextStyle(0)
+    , m_pNextStyle(nullptr)
 {
     std::unique_ptr<LwpAtomHolder> pNextStyle(::clone(rOther.m_pNextStyle));
     m_pNextStyle = pNextStyle.release();
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 763fa20577f2..48cb7379a579 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -72,8 +72,8 @@
 #include "lwpglobalmgr.hxx"
 
 LwpBulletStyleMgr::LwpBulletStyleMgr()
-    : m_pFoundry(NULL)
-    , m_pBulletList(NULL)
+    : m_pFoundry(nullptr)
+    , m_pBulletList(nullptr)
     , m_bContinue(true)
     , m_bIsBulletSkipped(false)
 {
@@ -120,7 +120,7 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverrid
     }
 
     LwpParaProperty* pProp = pPara->GetProperty(PP_LOCAL_INDENT);
-    LwpParaIndentProperty* pIndentProp = NULL;
+    LwpParaIndentProperty* pIndentProp = nullptr;
     LwpObjectID aIndentID;
     if (pProp)
     {
@@ -150,7 +150,7 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverrid
     OUString aStyleName;
 
     LwpFribPtr& rBulletParaFribs = pBulletPara->GetFribs();
-    bool bIsNumbering = (rBulletParaFribs.HasFrib(FRIB_TAG_PARANUMBER) != 0);
+    bool bIsNumbering = (rBulletParaFribs.HasFrib(FRIB_TAG_PARANUMBER) != nullptr);
 
     enumXFAlignType eAlign = enumXFAlignStart;
     if (pBullOver->IsRightAligned())
@@ -263,9 +263,9 @@ XFContentContainer* LwpBulletStyleMgr::AddBulletList(
     bool bContinue = m_bContinue;
 
     XFList* theList;
-    XFList* prevList = NULL;
+    XFList* prevList = nullptr;
     XFListItem* theItem;
-    XFListItem* InnerItem = NULL;
+    XFListItem* InnerItem = nullptr;
     for (sal_Int8 nC = nLevel-1; nC >= 0; nC--)
     {
         theList = new XFList();
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index fcf84ef77055..cd61beac6df5 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -94,7 +94,7 @@ LwpTableLayout * LwpCellLayout::GetTableLayout()
     LwpRowLayout * pRow = dynamic_cast<LwpRowLayout *>(GetParent().obj().get());
     if(!pRow)
     {
-        return NULL;
+        return nullptr;
     }
     LwpTableLayout * pTableLayout = pRow->GetParentTableLayout();
     return pTableLayout;
@@ -109,7 +109,7 @@ LwpTable * LwpCellLayout::GetTable()
     LwpTableLayout * pTableLayout = GetTableLayout();
     if(!pTableLayout)
     {
-        return NULL;
+        return nullptr;
     }
     LwpTable *pTable = pTableLayout->GetTable();
     return pTable;
@@ -134,7 +134,7 @@ double LwpCellLayout::GetActualWidth()
     //Get table layout
     LwpTableLayout * pTableLayout = GetTableLayout();
 
-    if (pTableLayout == NULL)
+    if (pTableLayout == nullptr)
     {
         return GetGeometryWidth();
     }
@@ -317,7 +317,7 @@ XFCell* LwpCellLayout::ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uI
     if (!pTable)
     {
         assert(false);
-        return NULL;
+        return nullptr;
     }
     XFCell * pXFCell = new XFCell();
     OUString aStyleName = m_StyleName;
@@ -351,7 +351,7 @@ LwpPara* LwpCellLayout::GetLastParaOfPreviousStory()
     }
     else
     {
-        return NULL;
+        return nullptr;
     }
 }
 
@@ -366,7 +366,7 @@ LwpObjectID * LwpCellLayout::GetPreviousCellStory()
     if (!pTable)
     {
         assert(false);
-        return NULL;
+        return nullptr;
     }
     sal_uInt16 nRow = crowid;
     sal_uInt16 nCol = ccolid;
@@ -376,7 +376,7 @@ LwpObjectID * LwpCellLayout::GetPreviousCellStory()
     {
         if (nRow == 0)
         {
-            return NULL;
+            return nullptr;
         }
         nRow -=1;
     }
@@ -387,7 +387,7 @@ LwpObjectID * LwpCellLayout::GetPreviousCellStory()
         {
             if (nRow == 0)
             {
-                return NULL;
+                return nullptr;
             }
             else
             {
@@ -406,7 +406,7 @@ LwpObjectID * LwpCellLayout::GetPreviousCellStory()
     if (!pTableLayout)
     {
         assert(false);
-        return NULL;
+        return nullptr;
     }
     return pTableLayout->SearchCellStoryMap(nRow, nCol);
 }
@@ -663,8 +663,8 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, LwpObjectID aTableID)
         {
             // judge whole table
             LwpTable * pTable = dynamic_cast<LwpTable *>(aTableID.obj().get());
-            LwpTableLayout * pTableLayout = pTable ? static_cast<LwpTableLayout *>(pTable->GetTableLayout()) : NULL;
-            LwpSuperTableLayout * pSuper = pTableLayout ? pTableLayout->GetSuperTableLayout() : NULL;
+            LwpTableLayout * pTableLayout = pTable ? static_cast<LwpTableLayout *>(pTable->GetTableLayout()) : nullptr;
+            LwpSuperTableLayout * pSuper = pTableLayout ? pTableLayout->GetSuperTableLayout() : nullptr;
             if (pSuper && pSuper->IsProtected())
             {
                 bProtected = true;
@@ -875,14 +875,14 @@ void LwpHiddenCellLayout::Read()
 XFCell* LwpHiddenCellLayout::ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol)
 {
     if (!cconnectedlayout.obj().is())
-        return NULL;
+        return nullptr;
     LwpConnectedCellLayout* pConnCell = dynamic_cast<LwpConnectedCellLayout* >(cconnectedlayout.obj().get());
 
     if (!pConnCell || nRow < (pConnCell->GetNumrows()+pConnCell->GetRowID()))
-        return NULL;
+        return nullptr;
     // if the hidden cell should be displayed for limit of SODC
     // use the default cell layout
-    XFCell* pXFCell = NULL;
+    XFCell* pXFCell = nullptr;
     LwpTable *pTable = dynamic_cast<LwpTable *>(aTableID.obj().get());
     if (pTable)
     {
diff --git a/lotuswordpro/source/filter/lwpchangemgr.cxx b/lotuswordpro/source/filter/lwpchangemgr.cxx
index 2e15210870dc..ee1906865eb0 100644
--- a/lotuswordpro/source/filter/lwpchangemgr.cxx
+++ b/lotuswordpro/source/filter/lwpchangemgr.cxx
@@ -91,7 +91,7 @@ LwpChangeMgr::LwpChangeMgr()
 }
 LwpChangeMgr::~LwpChangeMgr()
 {
-    m_pFribMap=NULL;
+    m_pFribMap=nullptr;
     m_DocFribMap.clear();
     m_HeadFootFribMap.clear();
     m_ChangeList.clear();
@@ -150,7 +150,7 @@ void LwpChangeMgr::ConvertAllChange(IXFStream* pStream)
     for (iter1=m_ChangeList.begin();iter1 !=m_ChangeList.end();++iter1)
     {
         delete *iter1;
-        *iter1=NULL;
+        *iter1=nullptr;
     }
     m_ChangeList.clear();
 }
diff --git a/lotuswordpro/source/filter/lwpcharborderoverride.cxx b/lotuswordpro/source/filter/lwpcharborderoverride.cxx
index 33f112b47448..d7cb9bc281cd 100644
--- a/lotuswordpro/source/filter/lwpcharborderoverride.cxx
+++ b/lotuswordpro/source/filter/lwpcharborderoverride.cxx
@@ -75,8 +75,8 @@ LwpCharacterBorderOverride::LwpCharacterBorderOverride()
 
 LwpCharacterBorderOverride::LwpCharacterBorderOverride(LwpCharacterBorderOverride const& rOther)
     : LwpOverride(rOther)
-    , m_pBorderStuff(0)
-    , m_pMargins(0)
+    , m_pBorderStuff(nullptr)
+    , m_pMargins(nullptr)
     , m_nAboveWidth(rOther.m_nAboveWidth)
     , m_nBelowWidth(rOther.m_nBelowWidth)
 {
diff --git a/lotuswordpro/source/filter/lwpcharsetmgr.cxx b/lotuswordpro/source/filter/lwpcharsetmgr.cxx
index 84e270d84297..46abee27da75 100644
--- a/lotuswordpro/source/filter/lwpcharsetmgr.cxx
+++ b/lotuswordpro/source/filter/lwpcharsetmgr.cxx
@@ -61,11 +61,11 @@
 //Added for SS migration
 #include <rtl/textenc.h>
 
-LwpCharSetMgr* LwpCharSetMgr::Instance = NULL;
+LwpCharSetMgr* LwpCharSetMgr::Instance = nullptr;
 
 LwpCharSetMgr* LwpCharSetMgr::GetInstance()
 {
-   if (Instance == NULL)
+   if (Instance == nullptr)
        Instance = new LwpCharSetMgr;
    return Instance;
 }
diff --git a/lotuswordpro/source/filter/lwpcontent.cxx b/lotuswordpro/source/filter/lwpcontent.cxx
index 7544bfc22880..addc3f2f257c 100644
--- a/lotuswordpro/source/filter/lwpcontent.cxx
+++ b/lotuswordpro/source/filter/lwpcontent.cxx
@@ -128,7 +128,7 @@ LwpVirtualLayout* LwpContent::GetLayout(LwpVirtualLayout* pStartLayout)
 
 bool LwpContent::HasNonEmbeddedLayouts()
 {
-    LwpVirtualLayout* pLayout = NULL;
+    LwpVirtualLayout* pLayout = nullptr;
     while( (pLayout = GetLayout(pLayout)) )
     {
         if(!pLayout->NoContentReference())
@@ -139,7 +139,7 @@ bool LwpContent::HasNonEmbeddedLayouts()
 
 bool LwpContent::IsStyleContent()
 {
-    LwpVirtualLayout* pLayout = NULL;
+    LwpVirtualLayout* pLayout = nullptr;
     while( (pLayout = GetLayout(pLayout)) )
     {
         if(pLayout->IsStyleLayout())
diff --git a/lotuswordpro/source/filter/lwpdllist.cxx b/lotuswordpro/source/filter/lwpdllist.cxx
index 6726bcef9884..5834be2f3509 100644
--- a/lotuswordpro/source/filter/lwpdllist.cxx
+++ b/lotuswordpro/source/filter/lwpdllist.cxx
@@ -62,7 +62,7 @@
 
 LwpDLList::LwpDLList()
 {
-    m_pNext = m_pPrevious = NULL;
+    m_pNext = m_pPrevious = nullptr;
 }
 
 void
diff --git a/lotuswordpro/source/filter/lwpdlvlist.cxx b/lotuswordpro/source/filter/lwpdlvlist.cxx
index bf99042988b1..d51a327f8129 100644
--- a/lotuswordpro/source/filter/lwpdlvlist.cxx
+++ b/lotuswordpro/source/filter/lwpdlvlist.cxx
@@ -119,7 +119,7 @@ void LwpDLNFVList::ReadName(LwpObjectStream* pObjStrm)
  **/
 LwpDLNFPVList::LwpDLNFPVList(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
     : LwpDLNFVList(objHdr, pStrm),
-    m_bHasProperties(true),m_pPropList(NULL)
+    m_bHasProperties(true),m_pPropList(nullptr)
 {}
 /**
  * @descr       Read name of LwpDLNFVList from object stream
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index 2bb9e7aa53f9..4ad08d07f17e 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -70,10 +70,10 @@
 
 LwpDocument::LwpDocument(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
     : LwpDLNFPVList(objHdr, pStrm)
-    , m_pOwnedFoundry(NULL)
+    , m_pOwnedFoundry(nullptr)
     , m_nFlags(0)
     , m_nPersistentFlags(0)
-    , m_pLnOpts(NULL)
+    , m_pLnOpts(nullptr)
 {
 }
 
@@ -175,7 +175,7 @@ bool LwpDocument::IsSkippedDivision()
     OUString sDivName;
     bool ret = false;
     LwpDivInfo* pDiv = dynamic_cast<LwpDivInfo*>(GetDivInfoID().obj(VO_DIVISIONINFO).get());
-    if (pDiv == NULL)
+    if (pDiv == nullptr)
         return true;
     sDivName = pDiv->GetDivName();
     if (!sDivName.isEmpty() && !pDiv->IsGotoable()) //including toa,scripts division
@@ -403,7 +403,7 @@ void LwpDocument::ParseDocContent(IXFStream* pOutputStream)
 {
     //Parse content in PageLayout
     LwpDivInfo* pDivInfo = dynamic_cast<LwpDivInfo*> (m_DivInfo.obj().get());
-    if(pDivInfo==NULL) return;
+    if(pDivInfo==nullptr) return;
 
     rtl::Reference<LwpObject> pLayoutObj = pDivInfo->GetInitialLayoutID().obj();
     if(!pLayoutObj.is())
@@ -425,7 +425,7 @@ LwpObjectID* LwpDocument::GetValidFootnoteOpts()
     {
         return &pRoot->GetFootnoteOpts();
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -455,7 +455,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
     {
         return dynamic_cast<LwpDocument*>(pDocSock->GetPrevious().obj().get());
     }
-    return NULL;
+    return nullptr;
 }
 /**
  * @descr    Get next division
@@ -467,7 +467,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
     {
         return dynamic_cast<LwpDocument*>(pDocSock->GetNext().obj().get());
     }
-    return NULL;
+    return nullptr;
 }
 /**
  * @descr    Get parent division
@@ -479,14 +479,14 @@ LwpDocument* LwpDocument::GetPreviousDivision()
     {
         return dynamic_cast<LwpDocument*>(pDocSock->GetParent().obj().get());
     }
-    return NULL;
+    return nullptr;
 }
 /**
  * @descr    Get previous division in group, copy from lwp source code
  */
  LwpDocument* LwpDocument::GetPreviousInGroup()
 {
-    LwpDocument* pPrev = NULL;
+    LwpDocument* pPrev = nullptr;
 
     for (pPrev = GetPreviousDivision(); pPrev; pPrev = pPrev->GetPreviousDivision())
     {
@@ -494,14 +494,14 @@ LwpDocument* LwpDocument::GetPreviousDivision()
         if(pDivInfo && pDivInfo->HasContents())
             return pPrev;
     }
-    return NULL;
+    return nullptr;
 }
 /**
  * @descr       Get previous division in group, copy from lwp source code
  */
  LwpDocument* LwpDocument::GetNextInGroup()
 {
-    LwpDocument* pNext = NULL;
+    LwpDocument* pNext = nullptr;
 
     for (pNext = GetNextDivision(); pNext; pNext = pNext->GetNextDivision())
     {
@@ -510,7 +510,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
             return pNext;
     }
 
-    return NULL;
+    return nullptr;
 }
 /**
  * @descr    Get previous division which has contents, copy from lwp source code
@@ -525,7 +525,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
     }
     if(GetParentDivision())
         return GetParentDivision()->GetPreviousDivisionWithContents();
-    return NULL;
+    return nullptr;
 }
  /**
  * @descr    Get last division which has contents, copy from lwp source code
@@ -550,14 +550,14 @@ LwpDocument* LwpDocument::GetPreviousDivision()
         pDivision = pDivision->GetPreviousDivision();
     }
 
-    return NULL;
+    return nullptr;
 }
  /**
  * @descr    Get last division in group  which has contents, copy from lwp source code
  */
  LwpDocument* LwpDocument::GetLastInGroupWithContents()
 {
-    LwpDocument* pLast = NULL;
+    LwpDocument* pLast = nullptr;
     LwpDocument* pNext = this;
 
     while (pNext)
@@ -569,7 +569,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
     }
     if (pLast)
         return pLast;
-    return NULL;
+    return nullptr;
 }
   /**
  * @descr    Get last division
@@ -579,7 +579,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
     LwpDocSock* pDocSock = dynamic_cast<LwpDocSock*>(GetSocket().obj().get());
     if(pDocSock)
         return dynamic_cast<LwpDocument*>(pDocSock->GetChildTail().obj().get());
-    return NULL;
+    return nullptr;
 }
 
   /**
@@ -590,7 +590,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
     LwpDocSock* pDocSock = dynamic_cast<LwpDocSock*>(GetSocket().obj().get());
     if(pDocSock)
         return dynamic_cast<LwpDocument*>(pDocSock->GetChildHead().obj().get());
-    return NULL;
+    return nullptr;
 }
 
  /**
@@ -605,7 +605,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
             return pRoot;
         pRoot = pRoot->GetParentDivision();
     }
-    return NULL;
+    return nullptr;
 }
   /**
  * @descr    Get first division with contents that is not ole, copy from lwp-source code
@@ -626,7 +626,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
             return pContentDivision;
         pDivision = pDivision->GetNextDivision();
     }
-    return NULL;
+    return nullptr;
 }
  /**
  * @descr    Get last division that has endnote
@@ -641,7 +641,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
             return pLastDoc;
         pLastDoc = pLastDoc->GetPreviousDivisionWithContents();
     }
-    return NULL;
+    return nullptr;
 
 }
  /**
@@ -654,7 +654,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
     {
         return pHeadLayout->FindEnSuperTableLayout();
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -724,7 +724,7 @@ void LwpDocument::ParseFrameInPage(IXFStream * pOutputStream)
 
     pXFContainer->ToXml(pOutputStream);
     delete pXFContainer;
-    pXFContainer = NULL;
+    pXFContainer = nullptr;
 }
  /**
  * @descr    Parse the frame which anchor is to page in the entire document
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index 2fb00d2baf6d..ef99e2440f80 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -384,7 +384,7 @@ XFFrame* LwpDrawObj::CreateXFDrawObject()
     OUString aStyleName = this->RegisterStyle();
 
     // create XF-Objects
-    XFFrame* pXFObj = NULL;
+    XFFrame* pXFObj = nullptr;
     if (m_pTransData
         && FABS(m_pTransData->fOffsetX - m_pTransData->fLeftMargin) < THRESHOLD
         && FABS(m_pTransData->fOffsetY - m_pTransData->fTopMargin) < THRESHOLD
@@ -479,7 +479,7 @@ XFFrame* LwpDrawLine::CreateStandardDrawObj(const  OUString& rStyleName)
  * @param   pStream   The memory stream which contains the lwp-sdw draw objects
  */
 LwpDrawPolyLine::LwpDrawPolyLine(SvStream * pStream, DrawingOffsetAndScale* pTransData)
-: LwpDrawObj(pStream, pTransData), m_pVector(NULL)
+: LwpDrawObj(pStream, pTransData), m_pVector(nullptr)
 {
 }
 LwpDrawPolyLine::~LwpDrawPolyLine()
@@ -487,7 +487,7 @@ LwpDrawPolyLine::~LwpDrawPolyLine()
     if (m_pVector)
     {
         delete [] m_pVector;
-        m_pVector = NULL;
+        m_pVector = nullptr;
     }
 }
 
@@ -570,7 +570,7 @@ XFFrame* LwpDrawPolyLine::CreateStandardDrawObj(const  OUString& rStyleName)
 LwpDrawPolygon::LwpDrawPolygon(SvStream * pStream, DrawingOffsetAndScale* pTransData)
     : LwpDrawObj(pStream, pTransData)
     , m_nNumPoints(0)
-    , m_pVector(NULL)
+    , m_pVector(nullptr)
 {
 }
 
@@ -579,7 +579,7 @@ LwpDrawPolygon::~LwpDrawPolygon()
     if (m_pVector)
     {
         delete [] m_pVector;
-        m_pVector = NULL;
+        m_pVector = nullptr;
     }
 }
 
@@ -974,7 +974,7 @@ LwpDrawTextBox::~LwpDrawTextBox()
     if (m_aTextRec.pTextString)
     {
         delete [] m_aTextRec.pTextString;
-        m_aTextRec.pTextString = NULL;
+        m_aTextRec.pTextString = nullptr;
     }
 }
 
@@ -1144,17 +1144,17 @@ LwpDrawTextArt::~LwpDrawTextArt()
     if (m_aTextArtRec.aPath[0].pPts)
     {
         delete [] m_aTextArtRec.aPath[0].pPts;
-        m_aTextArtRec.aPath[0].pPts = NULL;
+        m_aTextArtRec.aPath[0].pPts = nullptr;
     }
     if (m_aTextArtRec.aPath[1].pPts)
     {
         delete [] m_aTextArtRec.aPath[1].pPts;
-        m_aTextArtRec.aPath[1].pPts = NULL;
+        m_aTextArtRec.aPath[1].pPts = nullptr;
     }
     if (m_aTextArtRec.pTextString)
     {
         delete [] m_aTextArtRec.pTextString;
-        m_aTextArtRec.pTextString = NULL;
+        m_aTextArtRec.pTextString = nullptr;
     }
 
 }
@@ -1293,7 +1293,7 @@ OUString LwpDrawTextArt::RegisterStyle()
 
 XFFrame* LwpDrawTextArt::CreateDrawObj(const OUString& rStyleName)
 {
-    XFFrame* pRetObj = NULL;
+    XFFrame* pRetObj = nullptr;
     XFDrawStyle* pStyle = new XFDrawStyle();
 
     pRetObj = new XFDrawPath();
@@ -1350,7 +1350,7 @@ void LwpDrawMetafile::Read()
  * @descr   Constructor of class LwpDrawBitmap
  * @param   pStream   The memory stream which contains the lwp-sdw draw objects
  */
-LwpDrawBitmap::LwpDrawBitmap(SvStream* pStream) : LwpDrawObj(pStream), m_pImageData(NULL)
+LwpDrawBitmap::LwpDrawBitmap(SvStream* pStream) : LwpDrawObj(pStream), m_pImageData(nullptr)
 {
 }
 
@@ -1359,7 +1359,7 @@ LwpDrawBitmap::~LwpDrawBitmap()
     if (m_pImageData)
     {
         delete [] m_pImageData;
-        m_pImageData = NULL;
+        m_pImageData = nullptr;
     }
 }
 
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx
index 443f9ba6aa3d..15fcb0e6f61c 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -86,7 +86,7 @@ protected:
     DrawingOffsetAndScale* m_pTransData;
 
 public:
-    LwpDrawObj(SvStream* pStream, DrawingOffsetAndScale* pTransData = NULL);
+    LwpDrawObj(SvStream* pStream, DrawingOffsetAndScale* pTransData = nullptr);
     virtual ~LwpDrawObj() {}
 
 private:
@@ -157,8 +157,8 @@ protected:
     {
         return OUString();
     }
-    virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) override { return NULL; }
-    virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) override { return NULL; }
+    virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) override { return nullptr; }
+    virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) override { return nullptr; }
 };
 
 /**
@@ -351,8 +351,8 @@ protected:
     {
         return OUString();
     }
-    virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) override {return NULL;}
-    virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) override {return NULL;}
+    virtual XFFrame* CreateDrawObj(const OUString& /*rStyleName*/) override {return nullptr;}
+    virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) override {return nullptr;}
 };
 
 /**
diff --git a/lotuswordpro/source/filter/lwpdropcapmgr.cxx b/lotuswordpro/source/filter/lwpdropcapmgr.cxx
index ed7fd22f1a6e..d0afe6ed1eda 100644
--- a/lotuswordpro/source/filter/lwpdropcapmgr.cxx
+++ b/lotuswordpro/source/filter/lwpdropcapmgr.cxx
@@ -62,7 +62,7 @@
 
 LwpDropcapMgr::LwpDropcapMgr()
 {
-    m_pXFPara = NULL;
+    m_pXFPara = nullptr;
 }
 
 LwpDropcapMgr::~LwpDropcapMgr()
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 79aa69b81b9b..b6c2e78fb9a9 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -147,7 +147,7 @@ using namespace OpenStormBento;
  */
  bool GetLwpSvStream(SvStream *pStream, LwpSvStream * & pLwpSvStream)
 {
-    SvStream * pDecompressed = NULL;
+    SvStream * pDecompressed = nullptr;
 
     sal_uInt32 nTag;
     pStream->Seek(0x10);
@@ -157,14 +157,14 @@ using namespace OpenStormBento;
         // small file, needs decompression
         if (!Decompress(pStream, pDecompressed))
         {
-            pLwpSvStream = NULL;
+            pLwpSvStream = nullptr;
             return true;
         }
         pStream->Seek(0);
         pDecompressed->Seek(0);
     }
 
-    pLwpSvStream = NULL;
+    pLwpSvStream = nullptr;
     bool bCompressed = false;
     if (pDecompressed)
     {
@@ -182,7 +182,7 @@ int ReadWordproFile(SvStream &rStream, uno::Reference<css::xml::sax::XDocumentHa
 {
     try
     {
-        LwpSvStream *pRawLwpSvStream = NULL;
+        LwpSvStream *pRawLwpSvStream = nullptr;
         std::unique_ptr<LwpSvStream> aLwpSvStream;
         std::unique_ptr<LwpSvStream> aCompressedLwpSvStream;
         std::unique_ptr<SvStream> aDecompressed;
diff --git a/lotuswordpro/source/filter/lwpfnlayout.cxx b/lotuswordpro/source/filter/lwpfnlayout.cxx
index dd987137a393..cfbbaaa561e1 100644
--- a/lotuswordpro/source/filter/lwpfnlayout.cxx
+++ b/lotuswordpro/source/filter/lwpfnlayout.cxx
@@ -234,7 +234,7 @@ void LwpEnSuperTableLayout::RegisterStyle()
 {
     // if this layout is style of real table entry
     LwpVirtualLayout* pTableLayout = GetMainTableLayout();
-    if (pTableLayout != NULL)
+    if (pTableLayout != nullptr)
     {
         pTableLayout->SetFoundry(m_pFoundry);
         pTableLayout->RegisterStyle();
@@ -270,7 +270,7 @@ void LwpEnSuperTableLayout::XFConvert(XFContentContainer * /*pCont*/)
         rID = pLayout->GetPrevious();
     }
 
-    return NULL;
+    return nullptr;
 }
 
 LwpFnSuperTableLayout::LwpFnSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
@@ -326,7 +326,7 @@ LwpVirtualLayout* LwpFnSuperTableLayout::GetMainTableLayout()
         rID = pLayout->GetPrevious();
     }
 
-    return NULL;
+    return nullptr;
 }
 
 LwpContFromLayout::LwpContFromLayout(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx
index 040e1d748eae..cc27bef903bf 100644
--- a/lotuswordpro/source/filter/lwpfont.cxx
+++ b/lotuswordpro/source/filter/lwpfont.cxx
@@ -242,12 +242,12 @@ void LwpFontTableEntry::RegisterFontDecl()
 
 LwpFontTable::LwpFontTable()
     : m_nCount(0)
-    , m_pFontEntries(NULL)
+    , m_pFontEntries(nullptr)
 {}
 
 void LwpFontTable::Read(LwpObjectStream *pStrm)
 {
-    m_pFontEntries = NULL;
+    m_pFontEntries = nullptr;
     m_nCount = pStrm->QuickReaduInt16();
     if(m_nCount>0)
     {
@@ -271,7 +271,7 @@ LwpFontTable::~LwpFontTable()
     if(m_pFontEntries)
     {
         delete [] m_pFontEntries;
-        m_pFontEntries = NULL;
+        m_pFontEntries = nullptr;
     }
 }
 
@@ -360,7 +360,7 @@ bool LwpFontNameEntry::IsBackgroundColorOverridden()
 
 LwpFontNameManager::LwpFontNameManager()
     : m_nCount(0)
-    , m_pFontNames(NULL)
+    , m_pFontNames(nullptr)
 {}
 
 LwpFontNameManager::~LwpFontNameManager()
@@ -368,7 +368,7 @@ LwpFontNameManager::~LwpFontNameManager()
     if(m_pFontNames)
     {
         delete [] m_pFontNames;
-        m_pFontNames = NULL;
+        m_pFontNames = nullptr;
     }
 }
 
diff --git a/lotuswordpro/source/filter/lwpfont.hxx b/lotuswordpro/source/filter/lwpfont.hxx
index c35b8bbd4f02..a2d6abdabf53 100644
--- a/lotuswordpro/source/filter/lwpfont.hxx
+++ b/lotuswordpro/source/filter/lwpfont.hxx
@@ -248,7 +248,7 @@ class LwpFontAttrManager
 public:
     LwpFontAttrManager()
         : m_nCount(0)
-        , m_pFontAttrs(NULL)
+        , m_pFontAttrs(nullptr)
         {}
     ~LwpFontAttrManager();
 public:
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx
index 4a319c06690c..b57a3a713754 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -103,7 +103,7 @@ void LwpFribFootnote::XFConvert(XFContentContainer* pCont)
     LwpFootnote* pFootnote = GetFootnote();
     if(pFootnote)
     {
-        XFContentContainer* pContent = NULL;
+        XFContentContainer* pContent = nullptr;
         if(pFootnote->GetType() == FN_FOOTNOTE)
         {
             pContent = new XFFootNote();
@@ -209,7 +209,7 @@ LwpCellLayout* LwpFootnote::GetCellLayout()
             }
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -218,18 +218,18 @@ LwpCellLayout* LwpFootnote::GetCellLayout()
 LwpDocument* LwpFootnote::GetFootnoteTableDivision()
 {
     if(!m_pFoundry)
-        return NULL;
+        return nullptr;
 
-    LwpDocument* pPrev =NULL;
-    LwpDocument* pDivision = NULL;
-    LwpDocument* pFootnoteDivision =NULL;
+    LwpDocument* pPrev =nullptr;
+    LwpDocument* pDivision = nullptr;
+    LwpDocument* pFootnoteDivision =nullptr;
 
     // Make sure the footnote does belong to some division
     // The division might not have a DivisionInfo if it's being Destruct()ed
     pPrev = m_pFoundry->GetDocument();
     pFootnoteDivision = pPrev;
     if (!pPrev || pPrev->GetDivInfoID().IsNull())
-        return NULL;
+        return nullptr;
 
     switch (m_nType)
     {
@@ -285,7 +285,7 @@ LwpDocument* LwpFootnote::GetFootnoteTableDivision()
     }
     if (pDivision)
         return pDivision;
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -310,7 +310,7 @@ LwpDocument* LwpFootnote::GetEndnoteDivision(LwpDocument* pPossible)
             break;
         pDivision = pDivision->GetPreviousDivision();
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -352,25 +352,25 @@ LwpEnSuperTableLayout* LwpFootnote::FindFootnoteTableLayout()
 {
     LwpDocument* pDivision = GetFootnoteTableDivision();
     if(!pDivision)
-        return NULL;
+        return nullptr;
 
     LwpFoundry* pFoundry = pDivision->GetFoundry();
     OUString strClassName = GetTableClass();
     if(strClassName.isEmpty() )
-        return NULL;
+        return nullptr;
 
-    LwpContent* pContent = NULL;
+    LwpContent* pContent = nullptr;
 
-    while ((pContent = pFoundry->EnumContents(pContent)) != NULL)
+    while ((pContent = pFoundry->EnumContents(pContent)) != nullptr)
         if (pContent->IsTable() && (strClassName.equals(pContent->GetClassName())) &&
-            pContent->IsActive() && pContent->GetLayout(NULL))
+            pContent->IsActive() && pContent->GetLayout(nullptr))
         {
             // Found it!
             return static_cast<LwpEnSuperTableLayout *>(
                 static_cast<LwpTable*>(pContent)->GetSuperTableLayout());
         }
 
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -381,7 +381,7 @@ LwpContent* LwpFootnote::FindFootnoteContent()
     LwpContent* pContent = dynamic_cast<LwpContent*>(m_Content.obj().get());
     //if the content has layout, the content has footnote contents;
     //or looking for the celllayout and return the footnote contents.
-    if(pContent && pContent->GetLayout(NULL))
+    if(pContent && pContent->GetLayout(nullptr))
         return pContent;
 
     LwpCellLayout* pCellLayout = GetCellLayout();
diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx b/lotuswordpro/source/filter/lwpfoundry.cxx
index 7fb85b4b4ed1..b25e2dd84331 100644
--- a/lotuswordpro/source/filter/lwpfoundry.cxx
+++ b/lotuswordpro/source/filter/lwpfoundry.cxx
@@ -76,8 +76,8 @@
 LwpFoundry::LwpFoundry(LwpObjectStream *pStrm, LwpDocument* pDoc)
     : m_pDoc(pDoc)
     , m_bRegisteredAll(false)
-    , m_pPieceMgr(NULL)
-    , m_pStyleMgr(NULL)
+    , m_pPieceMgr(nullptr)
+    , m_pStyleMgr(nullptr)
 {
     Read(pStrm);
     m_pDropcapMgr = new LwpDropcapMgr;
@@ -232,7 +232,7 @@ LwpBookMark* LwpFoundry::GetBookMark(LwpObjectID objMarker)
         rObjID = pBookMark->GetNext();
         pBookMark = static_cast<LwpBookMark*>(rObjID.obj().get());
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -261,7 +261,7 @@ LwpObjectID * LwpFoundry::GetDefaultTextStyle()
 {
     LwpVersionedPointer * pPointer = static_cast<LwpVersionedPointer *>(m_DefaultTextStyle.obj().get());
     if (!pPointer)
-        return NULL;
+        return nullptr;
 
     return &pPointer->GetPointer();
 }
@@ -286,7 +286,7 @@ LwpObjectID * LwpFoundry::FindParaStyleByName(const OUString& name)
         }
     }
 
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -392,7 +392,7 @@ LwpContent* LwpContentManager::EnumContents(LwpContent* pContent)
     if(pContent)
         return pContent->GetNextEnumerated();
     LwpVersionedPointer* pPointer = static_cast<LwpVersionedPointer*>(m_EnumHead.obj().get());
-    return pPointer ? static_cast<LwpContent*>(pPointer->GetPointer().obj().get()) : NULL;
+    return pPointer ? static_cast<LwpContent*>(pPointer->GetPointer().obj().get()) : nullptr;
 }
 
 void LwpPieceManager::Read(LwpObjectStream *pStrm)
@@ -445,7 +445,7 @@ LwpOrderedObject* LwpOrderedObjectManager::Enumerate(LwpOrderedObject * pLast)
     if(pLast && !pLast->GetNext().IsNull())
         return static_cast<LwpOrderedObject*>(pLast->GetNext().obj().get());
 
-    LwpListList* pList = NULL;
+    LwpListList* pList = nullptr;
     if(pLast)
     {
         // We're at the end of Last's list (not Liszt's list).
@@ -456,7 +456,7 @@ LwpOrderedObject* LwpOrderedObjectManager::Enumerate(LwpOrderedObject * pLast)
     else
     {
         // Start with the first active ListList
-        pList = GetNextActiveListList(NULL);
+        pList = GetNextActiveListList(nullptr);
     }
 
     if(pList)
@@ -464,7 +464,7 @@ LwpOrderedObject* LwpOrderedObjectManager::Enumerate(LwpOrderedObject * pLast)
         return static_cast<LwpOrderedObject*>(pList->GetHead().obj().get());
     }
 
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -473,7 +473,7 @@ LwpOrderedObject* LwpOrderedObjectManager::Enumerate(LwpOrderedObject * pLast)
 */
 LwpListList* LwpOrderedObjectManager::GetNextActiveListList(LwpListList * pLast)
 {
-    LwpListList* pList = NULL;
+    LwpListList* pList = nullptr;
     if(pLast)
         pList = static_cast<LwpListList*>(pLast->GetNext().obj().get());
     else
@@ -493,11 +493,11 @@ LwpListList* LwpOrderedObjectManager::GetNextActiveListList(LwpListList * pLast)
             return pList;
         pList = static_cast<LwpListList*>(pList->GetNext().obj().get());
     }
-    return NULL;
+    return nullptr;
 }
 
 LwpStyleManager::LwpStyleManager()
-    : m_pFoundry(0)
+    : m_pFoundry(nullptr)
 {
 }
 
@@ -535,7 +535,7 @@ IXFStyle* LwpStyleManager::GetStyle(const LwpObjectID &styleObjID)
     if (it != m_StyleList.end()) {
         return((*it).second);
     }
-    return NULL;
+    return nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx b/lotuswordpro/source/filter/lwpframelayout.cxx
index 525471b0e008..80143ffb271e 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -757,7 +757,7 @@ void LwpFrameLink::Read(LwpObjectStream* pStrm)
 }
 
 LwpFrameLayout::LwpFrameLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
-    : LwpPlacableLayout(objHdr, pStrm), m_pFrame(NULL)
+    : LwpPlacableLayout(objHdr, pStrm), m_pFrame(nullptr)
 {
 }
 
@@ -814,7 +814,7 @@ void LwpFrameLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart
 {
     if(m_pFrame)
     {
-        XFFrame* pXFFrame = NULL;
+        XFFrame* pXFFrame = nullptr;
         if(nEnd < nStart)
         {
             pXFFrame = new XFFrame();
@@ -1012,7 +1012,7 @@ void LwpFrameLayout::ApplyGraphicSize(XFFrame * pXFFrame)
 
 LwpGroupLayout::LwpGroupLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
     : LwpPlacableLayout(objHdr, pStrm)
-    , m_pFrame(NULL)
+    , m_pFrame(nullptr)
 {
 
 }
@@ -1078,7 +1078,7 @@ void LwpGroupLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart
 {
     if(m_pFrame)
     {
-        XFFrame* pXFFrame = NULL;
+        XFFrame* pXFFrame = nullptr;
         if(nEnd < nStart)
         {
             pXFFrame = new XFFrame();
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx
index c6c31601ca13..d61360aacff6 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -87,9 +87,9 @@
 
 LwpFrib::LwpFrib(LwpPara* pPara)
     : m_pPara(pPara)
-    , m_pNext(NULL)
+    , m_pNext(nullptr)
     , m_nFribType(0)
-    , m_pModifiers(NULL)
+    , m_pModifiers(nullptr)
     , m_ModFlag(false)
     , m_nRevisionType(0)
     , m_bRevisionFlag(false)
@@ -105,7 +105,7 @@ LwpFrib::~LwpFrib()
 LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara, LwpObjectStream* pObjStrm, sal_uInt8 fribtag,sal_uInt8 editID)
 {
     //Read Modifier
-    ModifierInfo* pModInfo = NULL;
+    ModifierInfo* pModInfo = nullptr;
     if(fribtag & FRIB_TAG_MODIFIER)
     {
         pModInfo  = new ModifierInfo();
@@ -119,7 +119,7 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara, LwpObjectStream* pObjStrm, sal_uInt
     }
 
     //Read frib data
-    LwpFrib* newFrib = NULL;
+    LwpFrib* newFrib = nullptr;
     sal_uInt16 friblen = pObjStrm->QuickReaduInt16();
     sal_uInt8 fribtype = fribtag&~FRIB_TAG_TYPEMASK;
     switch(fribtype)
@@ -242,7 +242,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
     //so we can only handle fontid and characstyle, if others ,we should not reg style
     //note by ,1-27
     rtl::Reference<XFFont> pFont;
-    XFTextStyle* pStyle = NULL;
+    XFTextStyle* pStyle = nullptr;
     m_StyleName.clear();
     XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
     XFTextStyle* pNamedStyle = nullptr;
@@ -266,7 +266,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
             m_StyleName = aNewStyle.m_pStyle->GetStyleName();
             pStyle = dynamic_cast<XFTextStyle*>(aNewStyle.m_pStyle);
             if (aNewStyle.m_bOrigDeleted)
-                pStyle = NULL;
+                pStyle = nullptr;
         }
         else
             m_StyleName =  pNamedStyle->GetStyleName();
@@ -282,7 +282,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
             m_StyleName = aNewStyle.m_pStyle->GetStyleName();
             pStyle = dynamic_cast<XFTextStyle*>(aNewStyle.m_pStyle);
             if (aNewStyle.m_bOrigDeleted)
-                pStyle = NULL;
+                pStyle = nullptr;
         }
     }
 
diff --git a/lotuswordpro/source/filter/lwpfribbreaks.cxx b/lotuswordpro/source/filter/lwpfribbreaks.cxx
index 7c4c77fcc308..233033058b20 100644
--- a/lotuswordpro/source/filter/lwpfribbreaks.cxx
+++ b/lotuswordpro/source/filter/lwpfribbreaks.cxx
@@ -70,7 +70,7 @@ void LwpFribColumnBreak::RegisterBreakStyle(LwpPara * pPara)
 {
 //    XFParaStyle* pBaseStyle = static_cast<XFParaStyle*>(pFoundry->GetStyleManager()->GetStyle(styleID));
     XFParaStyle* pBaseStyle =  pPara->GetXFParaStyle();
-    if (pBaseStyle == NULL) return;
+    if (pBaseStyle == nullptr) return;
 //    m_StyleName = pBaseStyle->GetStyleName();
 
     XFParaStyle* pOverStyle = new XFParaStyle;
@@ -82,7 +82,7 @@ void LwpFribColumnBreak::RegisterBreakStyle(LwpPara * pPara)
     //  ->GetCurrentLayout()->GetNumCols() == 1)
     //New code
     LwpStory* pStory = static_cast<LwpStory*>(pPara->GetStoryID().obj().get());
-    LwpPageLayout* pCurLayout = pStory ? pStory->GetCurrentLayout() : NULL;
+    LwpPageLayout* pCurLayout = pStory ? pStory->GetCurrentLayout() : nullptr;
     if( pCurLayout && (pCurLayout->GetNumCols() == 1) )
 
     {
@@ -103,7 +103,7 @@ void LwpFribColumnBreak::RegisterBreakStyle(LwpPara * pPara)
 }
 
 LwpFribPageBreak::LwpFribPageBreak( LwpPara* pPara )
-    : LwpFrib(pPara), m_bLastFrib(false), m_pMasterPage(NULL)
+    : LwpFrib(pPara), m_bLastFrib(false), m_pMasterPage(nullptr)
 {
 }
 
@@ -112,7 +112,7 @@ LwpFribPageBreak::~LwpFribPageBreak()
     if(m_pMasterPage)
     {
         delete m_pMasterPage;
-        m_pMasterPage = NULL;
+        m_pMasterPage = nullptr;
     }
 }
 
@@ -124,7 +124,7 @@ void LwpFribPageBreak::Read(LwpObjectStream * pObjStrm, sal_uInt16 /*len*/)
 void LwpFribPageBreak::RegisterBreakStyle(LwpPara* pPara)
 {
     XFParaStyle* pBaseStyle =  pPara->GetXFParaStyle();
-    if (pBaseStyle == NULL) return;
+    if (pBaseStyle == nullptr) return;
 
     LwpPageLayout* pLayout = static_cast<LwpPageLayout*>(m_Layout.obj().get());
     if(pLayout)
diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx
index cbdb20d3107a..e6824c3c935d 100644
--- a/lotuswordpro/source/filter/lwpfribmark.cxx
+++ b/lotuswordpro/source/filter/lwpfribmark.cxx
@@ -170,8 +170,8 @@ void  LwpFribBookMark::RegisterStyle(LwpFoundry* pFoundry)
 LwpFribBookMark::LwpFribBookMark(LwpPara* pPara )
     : LwpFrib(pPara)
     , m_nType(0)
-    , m_pStart(NULL)
-    , m_pEnd(NULL)
+    , m_pStart(nullptr)
+    , m_pEnd(nullptr)
 {
 }
 
@@ -399,8 +399,8 @@ void LwpFribField::RegisterTotalTimeStyle()
 
 void LwpFribField::RegisterDateTimeStyle(const OUString& sFormula)
 {
-    XFDateStyle* pDateStyle = NULL;
-    XFTimeStyle* pTimeStyle = NULL;
+    XFDateStyle* pDateStyle = nullptr;
+    XFTimeStyle* pTimeStyle = nullptr;
 //DATE
     if (sFormula.getLength()<2)
         return;
@@ -1199,7 +1199,7 @@ void LwpFribField::CheckFieldType(LwpFieldMark* pFieldMark)
 
 void LwpFribField::ConvertDocFieldStart(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark)
 {
-    XFContent* pContent = NULL;
+    XFContent* pContent = nullptr;
     switch(m_nDocPowerType)
     {
         case LwpFieldMark::DOC_DESCRIPTION:
@@ -1240,7 +1240,7 @@ void LwpFribField::ConvertDocFieldStart(XFContentContainer* pXFPara,LwpFieldMark
 
 void LwpFribField::ConvertDocFieldEnd(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark)
 {
-    XFContent* pContent = NULL;
+    XFContent* pContent = nullptr;
     switch(m_nDocPowerType)
     {
         case LwpFieldMark::DOC_DESCRIPTION:
@@ -1279,7 +1279,7 @@ void LwpFribField::ConvertDocFieldEnd(XFContentContainer* pXFPara,LwpFieldMark*
 
 void LwpFribField::ConvertDateTimeStart(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark)
 {
-    XFContent* pContent = NULL;
+    XFContent* pContent = nullptr;
     switch(m_nDateTimeType)
     {
     case LwpFieldMark::DATETIME_NOW:
@@ -1327,7 +1327,7 @@ void LwpFribField::ConvertDateTimeStart(XFContentContainer* pXFPara,LwpFieldMark
 
 void LwpFribField::ConvertDateTimeEnd(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark)
 {
-    XFContent* pContent = NULL;
+    XFContent* pContent = nullptr;
     switch(m_nDateTimeType)
     {
         case LwpFieldMark::DATETIME_NOW:
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx
index e149f62f7dd1..a59abc058385 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -84,7 +84,7 @@
 #include "lwpglobalmgr.hxx"
 
 LwpFribPtr::LwpFribPtr()
-    : m_pFribs(NULL),m_pXFPara(NULL),m_pPara(NULL)
+    : m_pFribs(nullptr),m_pXFPara(nullptr),m_pPara(nullptr)
 {
 }
 
@@ -100,7 +100,7 @@ LwpFribPtr::~LwpFribPtr()
 
 void LwpFribPtr::ReadPara(LwpObjectStream* pObjStrm)
 {
-    LwpFrib* pCurFrib = m_pFribs = NULL;
+    LwpFrib* pCurFrib = m_pFribs = nullptr;
     for(;;)
     {
         // Get the frib type
@@ -431,7 +431,7 @@ LwpFrib* LwpFribPtr::HasFrib(sal_uInt8 nType)
         }
         pFrib = pFrib->GetNext();
     }
-    return NULL;
+    return nullptr;
 }
 
 void LwpFribPtr::GatherAllText()
@@ -614,7 +614,7 @@ bool LwpFribPtr::ComparePagePosition(LwpVirtualLayout* pPreLayout, LwpVirtualLay
         return true;
 
     LwpFrib* pFrib = m_pFribs;
-    LwpVirtualLayout* pLayout = NULL;
+    LwpVirtualLayout* pLayout = nullptr;
     while(pFrib)
     {
         switch(pFrib->GetType())
diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx
index b180b3a77484..0f63d0f6a605 100644
--- a/lotuswordpro/source/filter/lwpfribsection.cxx
+++ b/lotuswordpro/source/filter/lwpfribsection.cxx
@@ -70,7 +70,7 @@
 #include "lwpglobalmgr.hxx"
 
 LwpFribSection::LwpFribSection(LwpPara *pPara)
-     : LwpFrib(pPara),m_pMasterPage(NULL)
+     : LwpFrib(pPara),m_pMasterPage(nullptr)
 {
 
 }
@@ -80,7 +80,7 @@ LwpFribSection::~LwpFribSection()
     if(m_pMasterPage)
     {
         delete m_pMasterPage;
-        m_pMasterPage = NULL;
+        m_pMasterPage = nullptr;
     }
 }
 
@@ -138,7 +138,7 @@ LwpPageLayout* LwpFribSection::GetPageLayout()
 {
     if(GetSection())
         return GetSection()->GetPageLayout();
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -367,7 +367,7 @@ XFSection* LwpMasterPage::CreateXFSection()
         pXFSection->SetStyleName(m_SectionStyleName);
         return pXFSection;
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
diff --git a/lotuswordpro/source/filter/lwpfribtext.cxx b/lotuswordpro/source/filter/lwpfribtext.cxx
index 1f8d391ad816..50bd3f37e241 100644
--- a/lotuswordpro/source/filter/lwpfribtext.cxx
+++ b/lotuswordpro/source/filter/lwpfribtext.cxx
@@ -140,7 +140,7 @@ LwpFribDocVar::~LwpFribDocVar()
     if (m_pName)
     {
         delete m_pName;
-        m_pName = NULL;
+        m_pName = nullptr;
     }
 }
 /**
@@ -213,7 +213,7 @@ void LwpFribDocVar::RegisterTotalTimeStyle()
  */
 void LwpFribDocVar::XFConvert(XFContentContainer* pXFPara)
 {
-    XFContent* pContent=NULL;
+    XFContent* pContent=nullptr;
     switch(m_nType)
     {
     case FILENAME:
diff --git a/lotuswordpro/source/filter/lwpglobalmgr.cxx b/lotuswordpro/source/filter/lwpglobalmgr.cxx
index 2d84c8a4222b..12429af20a2d 100644
--- a/lotuswordpro/source/filter/lwpglobalmgr.cxx
+++ b/lotuswordpro/source/filter/lwpglobalmgr.cxx
@@ -61,7 +61,7 @@ LwpGlobalMgr::LwpGlobalMgr(LwpSvStream* pSvStream)
     if (pSvStream)
         m_pObjFactory = new LwpObjectFactory(pSvStream);
     else
-        m_pObjFactory = NULL;
+        m_pObjFactory = nullptr;
     m_pBookmarkMgr = new LwpBookmarkMgr;
     m_pChangeMgr = new LwpChangeMgr;
     m_pXFFontFactory = new XFFontFactory;
@@ -73,33 +73,33 @@ LwpGlobalMgr::~LwpGlobalMgr()
     if (m_pObjFactory)
     {
         delete m_pObjFactory;
-        m_pObjFactory = NULL;
+        m_pObjFactory = nullptr;
     }
     if (m_pBookmarkMgr)
     {
         delete m_pBookmarkMgr;
-        m_pBookmarkMgr = NULL;
+        m_pBookmarkMgr = nullptr;
     }
     if (m_pChangeMgr)
     {
         delete m_pChangeMgr;
-        m_pChangeMgr = NULL;
+        m_pChangeMgr = nullptr;
     }
     if (m_pXFFontFactory)
     {
         delete m_pXFFontFactory;
-        m_pXFFontFactory = NULL;
+        m_pXFFontFactory = nullptr;
     }
     if (m_pXFStyleManager)
     {
         delete m_pXFStyleManager;
-        m_pXFStyleManager = NULL;
+        m_pXFStyleManager = nullptr;
     }
     std::map<sal_uInt16,LwpEditorAttr*>::iterator iter;
     for (iter =m_EditorAttrMap.begin();iter != m_EditorAttrMap.end(); ++iter)
     {
         delete iter->second;
-        iter->second = NULL;
+        iter->second = nullptr;
     }
     m_EditorAttrMap.clear();
 }
@@ -127,7 +127,7 @@ void LwpGlobalMgr::DeleteInstance()
     if (iter != m_ThreadMap.end())
     {
         delete iter->second;
-        iter->second = NULL;
+        iter->second = nullptr;
         m_ThreadMap.erase(iter);
     }
 }
diff --git a/lotuswordpro/source/filter/lwpglobalmgr.hxx b/lotuswordpro/source/filter/lwpglobalmgr.hxx
index 23d41e8b2c6c..8ded9606c625 100644
--- a/lotuswordpro/source/filter/lwpglobalmgr.hxx
+++ b/lotuswordpro/source/filter/lwpglobalmgr.hxx
@@ -76,7 +76,7 @@ class LwpGlobalMgr
 {
 public:
     ~LwpGlobalMgr();
-    static LwpGlobalMgr* GetInstance(LwpSvStream* pSvStream=NULL);
+    static LwpGlobalMgr* GetInstance(LwpSvStream* pSvStream=nullptr);
     static void DeleteInstance();
     LwpObjectFactory* GetLwpObjFactory(){return m_pObjFactory;}
     LwpBookmarkMgr* GetLwpBookmarkMgr(){return m_pBookmarkMgr;}
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index becdbec6af40..f03a1d68c76f 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -108,7 +108,7 @@ void LwpGraphicObject::Read()
         m_sDataFormat[strsize] = '\0';
     }
     sal_uInt32 nServerContextSize = m_pObjStrm->QuickReaduInt32();
-    unsigned char *pServerContext = NULL;
+    unsigned char *pServerContext = nullptr;
     if (nServerContextSize > 0)
     {
         pServerContext = new unsigned char[nServerContextSize];
@@ -141,7 +141,7 @@ void LwpGraphicObject::Read()
     }
     m_nCachedBaseLine = m_pObjStrm->QuickReadInt32();
     m_bIsLinked = m_pObjStrm->QuickReadInt16();
-    unsigned char * pFilterContext = NULL;
+    unsigned char * pFilterContext = nullptr;
 
     if (m_bIsLinked)
     {
@@ -181,10 +181,10 @@ void LwpGraphicObject::Read()
         m_WatermarkName = m_pObjStrm->QuickReadStringPtr();
     }
 
-    if (pServerContext != NULL)
+    if (pServerContext != nullptr)
         delete[] pServerContext;
 
-    if (pFilterContext != NULL)
+    if (pFilterContext != nullptr)
         delete[] pFilterContext;
 
 }
@@ -210,7 +210,7 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont)
         }
         else
         {
-            sal_uInt8* pGrafData = NULL;
+            sal_uInt8* pGrafData = nullptr;
             sal_uInt32 nDataLen = this->GetRawGrafData(pGrafData);
 
             if (pGrafData)
@@ -219,7 +219,7 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont)
 
                 // delete used image data
                 delete [] pGrafData;
-                pGrafData = NULL;
+                pGrafData = nullptr;
             }
         }
 
@@ -273,7 +273,7 @@ void LwpGraphicObject::RegisterStyle()
 
     if (m_sServerContextFormat[1]=='l'&&m_sServerContextFormat[2]=='c'&&m_sServerContextFormat[3]=='h')
     {
-        LwpVirtualLayout* pMyLayout = GetLayout(NULL);
+        LwpVirtualLayout* pMyLayout = GetLayout(nullptr);
         if (pMyLayout && pMyLayout->IsFrame())
         {
             XFFrameStyle* pXFFrameStyle = new XFFrameStyle();
@@ -299,7 +299,7 @@ void LwpGraphicObject::CreateDrawObjects()
     if (ulRet != OpenStormBento::BenErr_OK)
         return;
 
-    SvStream* pDrawObjStream = NULL;
+    SvStream* pDrawObjStream = nullptr;
 
     // get graphic object's bento objet name
     LwpObjectID& rMyID = this->GetObjectID();
@@ -314,7 +314,7 @@ void LwpGraphicObject::CreateDrawObjects()
         fileLoader.CreateDrawObjects(&m_vXFDrawObjects);
 
         delete pDrawObjStream;
-        pDrawObjStream = NULL;
+        pDrawObjStream = nullptr;
     }
 }
 
@@ -344,14 +344,14 @@ sal_uInt32 LwpGraphicObject::GetRawGrafData(sal_uInt8*& pGrafData)
 
     std::unique_ptr<OpenStormBento::LtcBenContainer> pBentoContainer;
     {
-        OpenStormBento::LtcBenContainer* pTmp(0);
+        OpenStormBento::LtcBenContainer* pTmp(nullptr);
         sal_uLong ulRet = OpenStormBento::BenOpenContainer(pStream, &pTmp);
         pBentoContainer.reset(pTmp);
         if (ulRet != OpenStormBento::BenErr_OK)
             return 0;
     }
 
-    SvStream* pGrafStream = NULL;
+    SvStream* pGrafStream = nullptr;
 
     // get graphic object's bento objet name
     LwpObjectID& rMyID = this->GetObjectID();
@@ -370,7 +370,7 @@ sal_uInt32 LwpGraphicObject::GetRawGrafData(sal_uInt8*& pGrafData)
         pMemGrafStream->Read(pGrafData, nDataLen);
 
         delete pMemGrafStream;
-        pMemGrafStream = NULL;
+        pMemGrafStream = nullptr;
 
         return nDataLen;
     }
@@ -394,7 +394,7 @@ sal_uInt32 LwpGraphicObject::GetGrafData(sal_uInt8*& pGrafData)
     if (ulRet != OpenStormBento::BenErr_OK)
         return 0;
 
-    SvStream* pGrafStream = NULL;
+    SvStream* pGrafStream = nullptr;
 
     // get graphic object's bento objet name
     LwpObjectID& rMyID = this->GetObjectID();
@@ -421,7 +421,7 @@ sal_uInt32 LwpGraphicObject::GetGrafData(sal_uInt8*& pGrafData)
         pMemGrafStream->Read(pGrafData, nDataLen);
 
         delete pMemGrafStream;
-        pMemGrafStream = NULL;
+        pMemGrafStream = nullptr;
 
         return nDataLen;
     }
@@ -665,7 +665,7 @@ void LwpGraphicObject::CreateGrafObject()
  */
 void LwpGraphicObject::XFConvertEquation(XFContentContainer * pCont)
 {
-    sal_uInt8* pGrafData = NULL;
+    sal_uInt8* pGrafData = nullptr;
     sal_uInt32 nDataLen = this->GetGrafData(pGrafData);
     if(pGrafData)
     {
@@ -706,7 +706,7 @@ void LwpGraphicObject::XFConvertEquation(XFContentContainer * pCont)
         pCont->Add(pXFPara);
 
         delete [] pGrafData;
-        pGrafData = NULL;
+        pGrafData = nullptr;
     }
 
 }
diff --git a/lotuswordpro/source/filter/lwpidxmgr.cxx b/lotuswordpro/source/filter/lwpidxmgr.cxx
index e43004358385..e58d0538716d 100644
--- a/lotuswordpro/source/filter/lwpidxmgr.cxx
+++ b/lotuswordpro/source/filter/lwpidxmgr.cxx
@@ -90,7 +90,7 @@ LwpIndexManager::~LwpIndexManager()
         if( pKey )
         {
             delete pKey;
-            pKey = NULL;
+            pKey = nullptr;
         }
     }
     m_ObjectKeys.clear();
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 3c1b9a11003c..967b49c9bd09 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -379,7 +379,7 @@ LwpVirtualLayout* LwpVirtualLayout::FindChildByType(LWP_LAYOUT_TYPE eType)
         rID = pLayout->GetNext();
     }
 
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -455,7 +455,7 @@ LwpVirtualLayout* LwpAssociatedLayouts::GetLayout(LwpVirtualLayout *pStartLayout
         //return pLayout;
     }
 
-    return NULL;
+    return nullptr;
 }
 
 LwpHeadLayout::LwpHeadLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
@@ -513,7 +513,7 @@ LwpVirtualLayout* LwpHeadLayout::FindEnSuperTableLayout()
         }
         pLayout = dynamic_cast<LwpVirtualLayout*>(pLayout->GetNext().obj().get());
     }
-    return NULL;
+    return nullptr;
 }
 
 LwpLayoutStyle::LwpLayoutStyle()
@@ -637,9 +637,9 @@ LwpLayoutGeometry* LwpMiddleLayout::GetGeometry()
     else if( !m_BasedOnStyle.IsNull() )
     {
         LwpMiddleLayout* pLay = dynamic_cast<LwpMiddleLayout*> ( m_BasedOnStyle.obj().get() );
-        return pLay ? pLay->GetGeometry() : NULL;
+        return pLay ? pLay->GetGeometry() : nullptr;
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -763,14 +763,14 @@ LwpBorderStuff* LwpMiddleLayout::GetBorderStuff()
     if(m_nOverrideFlag & OVER_BORDERS)
     {
         LwpLayoutBorder* pLayoutBorder = dynamic_cast<LwpLayoutBorder*>(m_LayBorderStuff.obj().get());
-        return pLayoutBorder ? &pLayoutBorder->GetBorderStuff() : NULL;
+        return pLayoutBorder ? &pLayoutBorder->GetBorderStuff() : nullptr;
     }
     else if( !m_BasedOnStyle.IsNull() )
     {
         LwpMiddleLayout* pLay = dynamic_cast<LwpMiddleLayout*> ( m_BasedOnStyle.obj().get() );
-        return pLay ? pLay->GetBorderStuff() :  NULL;
+        return pLay ? pLay->GetBorderStuff() :  nullptr;
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -781,14 +781,14 @@ LwpBackgroundStuff* LwpMiddleLayout::GetBackgroundStuff()
     if(m_nOverrideFlag & OVER_BACKGROUND)
     {
         LwpLayoutBackground* pLayoutBackground = dynamic_cast<LwpLayoutBackground*>(m_LayBackgroundStuff.obj().get());
-        return pLayoutBackground ? &pLayoutBackground->GetBackgoudStuff() : NULL;
+        return pLayoutBackground ? &pLayoutBackground->GetBackgoudStuff() : nullptr;
     }
     else if( !m_BasedOnStyle.IsNull() )
     {
         LwpMiddleLayout* pLay = dynamic_cast<LwpMiddleLayout*> ( m_BasedOnStyle.obj().get() );
-        return pLay ? pLay->GetBackgroundStuff() : NULL;
+        return pLay ? pLay->GetBackgroundStuff() : nullptr;
     }
-    return NULL;
+    return nullptr;
 }
 /**
  * @descr:  create xfborder.
@@ -813,7 +813,7 @@ XFBorders* LwpMiddleLayout::GetXFBorders()
         }
         return pXFBorders;
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -864,7 +864,7 @@ LwpColor* LwpMiddleLayout::GetBackColor()
             return pColor;
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -877,16 +877,16 @@ LwpTabOverride* LwpMiddleLayout::GetTabOverride()
         if(!m_TabPiece.IsNull())
         {
             LwpTabPiece *pPiece = dynamic_cast<LwpTabPiece*>(m_TabPiece.obj().get());
-            return static_cast<LwpTabOverride*>(pPiece ? pPiece->GetOverride() : NULL);
+            return static_cast<LwpTabOverride*>(pPiece ? pPiece->GetOverride() : nullptr);
         }
-        return NULL;
+        return nullptr;
     }
     else if( !m_BasedOnStyle.IsNull() )
     {
         LwpMiddleLayout* pLay = dynamic_cast<LwpMiddleLayout*> ( m_BasedOnStyle.obj().get() );
-        return pLay ? pLay->GetTabOverride() : NULL;
+        return pLay ? pLay->GetTabOverride() : nullptr;
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -1099,7 +1099,7 @@ XFBGImage* LwpMiddleLayout::GetFillPattern()
         return pBackgroundStuff->GetFillPattern();
     }
 
-    return NULL;
+    return nullptr;
 
 }
 
@@ -1318,7 +1318,7 @@ LwpVirtualLayout* LwpMiddleLayout::GetWaterMarkLayout()
         }
         pLay = dynamic_cast<LwpVirtualLayout*> (pLay->GetNext().obj().get());
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -1345,13 +1345,13 @@ XFBGImage* LwpMiddleLayout::GetXFBGImage()
             }
             else
             {
-                sal_uInt8* pGrafData = NULL;
+                sal_uInt8* pGrafData = nullptr;
                 sal_uInt32 nDataLen = pGrfObj->GetRawGrafData(pGrafData);
                 pXFBGImage->SetImageData(pGrafData, nDataLen);
                 if(pGrafData)
                 {
                     delete[] pGrafData;
-                    pGrafData = NULL;
+                    pGrafData = nullptr;
                 }
             }
 
@@ -1378,7 +1378,7 @@ XFBGImage* LwpMiddleLayout::GetXFBGImage()
             return pXFBGImage;
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -1539,7 +1539,7 @@ XFColumns* LwpLayout::GetXFColumns()
     sal_uInt16 nCols = GetNumCols();
     if(nCols==1)
     {
-        return NULL;
+        return nullptr;
     }
 
     XFColumns* pColumns = new XFColumns();
@@ -1590,7 +1590,7 @@ XFColumnSep* LwpLayout::GetColumnSep()
     LwpLayoutGutters* pLayoutGutters = dynamic_cast<LwpLayoutGutters*>(m_LayGutterStuff.obj().get());
     if(!pLayoutGutters)
     {
-        return NULL;
+        return nullptr;
     }
 
     LwpBorderStuff& pBorderStuff = pLayoutGutters->GetBorderStuff();
@@ -1684,7 +1684,7 @@ LwpUseWhen* LwpLayout::VirtualGetUseWhen()
     else if( !m_BasedOnStyle.IsNull() )
     {
         LwpLayout* pLay = dynamic_cast<LwpLayout*> ( m_BasedOnStyle.obj().get() );
-        return pLay ? pLay->VirtualGetUseWhen() : NULL;
+        return pLay ? pLay->VirtualGetUseWhen() : nullptr;
     }
     return LwpVirtualLayout::VirtualGetUseWhen();
 }
@@ -1789,14 +1789,14 @@ LwpShadow* LwpLayout::GetShadow()
     if(m_nOverrideFlag & OVER_SHADOW)
     {
         LwpLayoutShadow* pLayoutShadow = dynamic_cast<LwpLayoutShadow*>(m_LayShadow.obj().get());
-        return pLayoutShadow ? &pLayoutShadow->GetShadow() : NULL;
+        return pLayoutShadow ? &pLayoutShadow->GetShadow() : nullptr;
     }
     else if( !m_BasedOnStyle.IsNull() )
     {
         LwpLayout* pLay = dynamic_cast<LwpLayout*> ( m_BasedOnStyle.obj().get() );
-        return pLay ? pLay->GetShadow() : NULL;
+        return pLay ? pLay->GetShadow() : nullptr;
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -1847,7 +1847,7 @@ XFShadow* LwpLayout::GetXFShadow()
             return pXFShadow;
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -1863,7 +1863,7 @@ LwpVirtualLayout* LwpLayout::GetContainerLayout()
         if(pPara)
         {
             LwpStory* pStory = pPara->GetStory();
-            return pStory ? pStory->GetTabLayout() : NULL;
+            return pStory ? pStory->GetTabLayout() : nullptr;
         }
     }
     return GetParentLayout();
@@ -1954,9 +1954,9 @@ LwpLayoutRelativity* LwpPlacableLayout::GetRelativityPiece()
     else if( !m_BasedOnStyle.IsNull() )
     {
         LwpPlacableLayout* pLay = dynamic_cast<LwpPlacableLayout*> ( m_BasedOnStyle.obj().get() );
-        return pLay ? pLay->GetRelativityPiece() : NULL;
+        return pLay ? pLay->GetRelativityPiece() : nullptr;
     }
-    return NULL;
+    return nullptr;
 }
 /**
 * @descr:   Get relative type
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index c291f28de269..d6bfcdd2f484 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -129,7 +129,7 @@ public:
     virtual sal_uInt8 GetRelativeType();
     bool IsRelativeAnchored();
     LwpUseWhen* GetUseWhen();
-    virtual LwpUseWhen* VirtualGetUseWhen(){ return NULL;}
+    virtual LwpUseWhen* VirtualGetUseWhen(){ return nullptr;}
     virtual bool IsUseOnAllPages(){ return false;}
     virtual bool IsUseOnAllEvenPages(){ return false;}
     virtual bool IsUseOnAllOddPages(){ return false;}
@@ -137,9 +137,9 @@ public:
     virtual sal_Int32 GetPageNumber(sal_uInt16 /*nLayoutNumber*/ = 0){ return -1;}
     bool IsMinimumHeight();
     virtual bool IsForWaterMark(){ return false;}
-    virtual LwpPara* GetLastParaOfPreviousStory() { return NULL; }
+    virtual LwpPara* GetLastParaOfPreviousStory() { return nullptr; }
     LwpVirtualLayout* GetParentLayout();
-    virtual LwpVirtualLayout* GetContainerLayout(){ return NULL;}
+    virtual LwpVirtualLayout* GetContainerLayout(){ return nullptr;}
     void RegisterChildStyle();
     bool NoContentReference();
     bool IsStyleLayout();
diff --git a/lotuswordpro/source/filter/lwplaypiece.cxx b/lotuswordpro/source/filter/lwplaypiece.cxx
index bf8532e9646a..0265cc007df2 100644
--- a/lotuswordpro/source/filter/lwplaypiece.cxx
+++ b/lotuswordpro/source/filter/lwplaypiece.cxx
@@ -262,7 +262,7 @@ void LwpColumnInfo:: Read(LwpObjectStream *pStrm)
 LwpLayoutColumns::LwpLayoutColumns(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
     : LwpVirtualPiece(objHdr, pStrm)
     , m_nNumCols(0)
-    , m_pColumns(NULL)
+    , m_pColumns(nullptr)
 {}
 
 LwpLayoutColumns::~LwpLayoutColumns()
@@ -270,7 +270,7 @@ LwpLayoutColumns::~LwpLayoutColumns()
     if(m_pColumns)
     {
         delete[] m_pColumns;
-        m_pColumns = NULL;
+        m_pColumns = nullptr;
     }
 
 }
diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx
index e04d5ec40b82..3843dad1bca5 100644
--- a/lotuswordpro/source/filter/lwpmarker.cxx
+++ b/lotuswordpro/source/filter/lwpmarker.cxx
@@ -142,7 +142,7 @@ void LwpCHBlkMarker::Read()
 
 OUString LwpCHBlkMarker::GetPromptText()
 {
-    LwpStory* pStory = NULL;
+    LwpStory* pStory = nullptr;
     if (m_objPromptStory.obj().is())
         pStory = dynamic_cast<LwpStory*>(m_objPromptStory.obj().get());
     if (pStory)
@@ -357,7 +357,7 @@ LwpFieldMark::LwpFieldMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
     , m_nFieldType(0)
     , m_bHasStyle(false)
     , m_bHasStart(false)
-    , m_pFrib(NULL)
+    , m_pFrib(nullptr)
     , m_bRevisionFlag(false)
 {
 }
diff --git a/lotuswordpro/source/filter/lwpnotes.cxx b/lotuswordpro/source/filter/lwpnotes.cxx
index 811f3b62a4ee..854d46b798d7 100644
--- a/lotuswordpro/source/filter/lwpnotes.cxx
+++ b/lotuswordpro/source/filter/lwpnotes.cxx
@@ -196,7 +196,7 @@ LwpVirtualLayout* LwpNoteLayout::GetTextLayout()
         return pLayout->FindChildByType(LWP_NOTETEXT_LAYOUT);
     }
 
-    return NULL;
+    return nullptr;
 }
 /**
  * @descr  Get author.
diff --git a/lotuswordpro/source/filter/lwpobj.cxx b/lotuswordpro/source/filter/lwpobj.cxx
index 844b7e59f138..d8e44f63c855 100644
--- a/lotuswordpro/source/filter/lwpobj.cxx
+++ b/lotuswordpro/source/filter/lwpobj.cxx
@@ -60,7 +60,7 @@
  * @descr  construct lwpobject from stream
  */
 LwpObject::LwpObject(LwpObjectHeader objHdr, LwpSvStream* pStrm)
-    : m_ObjHdr(objHdr), m_pObjStrm(NULL), m_pFoundry(NULL), m_pStrm(pStrm)
+    : m_ObjHdr(objHdr), m_pObjStrm(nullptr), m_pFoundry(nullptr), m_pStrm(pStrm)
 {
     m_pObjStrm = new LwpObjectStream(pStrm, m_ObjHdr.IsCompressed(),
             static_cast<sal_uInt16>(m_ObjHdr.GetSize()) );
@@ -83,7 +83,7 @@ void LwpObject::QuickRead()
     {
         m_pObjStrm->ReadComplete();
         delete m_pObjStrm;
-        m_pObjStrm = NULL;
+        m_pObjStrm = nullptr;
     }
 }
 /**
diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx
index 45c8fb7199bb..b58989908155 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.cxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.cxx
@@ -661,7 +661,7 @@ rtl::Reference<LwpObject> LwpObjectFactory::CreateObject(sal_uInt32 type, LwpObj
         default:
         {
             //Unknown object type
-            newObj = NULL;
+            newObj = nullptr;
             break;
         }
     }
@@ -685,20 +685,20 @@ rtl::Reference<LwpObject> LwpObjectFactory::QueryObject(const LwpObjectID &objID
         //Read the object from file
         sal_uInt32 nStreamOffset = m_IndexMgr.GetObjOffset(objID);
         if(nStreamOffset == BAD_OFFSET) //does not find the offset in index manager
-            return NULL;
+            return nullptr;
 
         sal_Int64 nDesiredPos = nStreamOffset + LwpSvStream::LWP_STREAM_BASE;
         if (nDesiredPos != m_pSvStream->Seek(nDesiredPos))
-            return NULL;
+            return nullptr;
         LwpObjectHeader objHdr;
         if (!objHdr.Read(*m_pSvStream))
-            return NULL;
+            return nullptr;
 
         LwpObjectID& rId = objHdr.GetID();
         if (rId != objID)
         {
             OSL_FAIL("apparently incorrect objid, invalidating");
-            return NULL;
+            return nullptr;
         }
 
         obj = CreateObject(objHdr.GetTag(), objHdr);
@@ -717,7 +717,7 @@ rtl::Reference<LwpObject> LwpObjectFactory::FindObject(const LwpObjectID &objID)
     }
     else
     {
-        return NULL;
+        return nullptr;
     }
 }
 /**
diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx
index 371ab2beff3e..d7fe28db026f 100644
--- a/lotuswordpro/source/filter/lwpobjid.cxx
+++ b/lotuswordpro/source/filter/lwpobjid.cxx
@@ -187,7 +187,7 @@ rtl::Reference<LwpObject> LwpObjectID::obj(VO_TYPE tag) const
     LwpObjectFactory* pObjMgr = pGlobal->GetLwpObjFactory();
     if(IsNull())
     {
-        return NULL;
+        return nullptr;
     }
     rtl::Reference<LwpObject> pObj = pObjMgr->QueryObject(*this);
     if( tag!=VO_INVALID &&  (pObj.is()) )
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx
index 1c4c6c631ba9..2ab543a4cba9 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.cxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.cxx
@@ -65,7 +65,7 @@
  * @descr  ctor() from LwpSvStream
  */
 LwpObjectStream::LwpObjectStream(LwpSvStream *pStrm, bool isCompressed, sal_uInt16 size)
-    :m_pContentBuf(NULL), m_nBufSize(size), m_nReadPos(0),
+    :m_pContentBuf(nullptr), m_nBufSize(size), m_nReadPos(0),
     m_pStrm(pStrm), m_bCompressed(isCompressed)
 {
     assert(size<IO_BUFFERSIZE);
@@ -78,7 +78,7 @@ void LwpObjectStream::ReadStream()
 {
     if(m_nBufSize == 0)
     {
-        m_pContentBuf = NULL;
+        m_pContentBuf = nullptr;
     }
     else
     {
@@ -157,7 +157,7 @@ void LwpObjectStream::ReleaseBuffer()
         if(m_pContentBuf)
         {
             delete [] m_pContentBuf;
-            m_pContentBuf = NULL;
+            m_pContentBuf = nullptr;
         }
     }
 }
diff --git a/lotuswordpro/source/filter/lwpobjstrm.hxx b/lotuswordpro/source/filter/lwpobjstrm.hxx
index ccb62ded789b..8146cbbe4840 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.hxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.hxx
@@ -92,13 +92,13 @@ public:
     void SkipExtra();
     sal_uInt16 CheckExtra();
 
-    bool QuickReadBool(bool *pFailure=NULL);
-    sal_uInt32 QuickReaduInt32(bool *pFailure=NULL);
-    sal_uInt16 QuickReaduInt16(bool *pFailure=NULL);
-    sal_uInt8 QuickReaduInt8(bool *pFailure=NULL);
-    sal_Int32 QuickReadInt32(bool *pFailure=NULL);
-    sal_Int16 QuickReadInt16(bool *pFailure=NULL);
-    double QuickReadDouble(bool *pFailure=NULL);
+    bool QuickReadBool(bool *pFailure=nullptr);
+    sal_uInt32 QuickReaduInt32(bool *pFailure=nullptr);
+    sal_uInt16 QuickReaduInt16(bool *pFailure=nullptr);
+    sal_uInt8 QuickReaduInt8(bool *pFailure=nullptr);
+    sal_Int32 QuickReadInt32(bool *pFailure=nullptr);
+    sal_Int16 QuickReadInt16(bool *pFailure=nullptr);
+    double QuickReadDouble(bool *pFailure=nullptr);
 
     OUString QuickReadStringPtr();
 
diff --git a/lotuswordpro/source/filter/lwpoleobject.cxx b/lotuswordpro/source/filter/lwpoleobject.cxx
index d20a685bf671..e21a70792a25 100644
--- a/lotuswordpro/source/filter/lwpoleobject.cxx
+++ b/lotuswordpro/source/filter/lwpoleobject.cxx
@@ -107,7 +107,7 @@ void LwpGraphicOleObject::GetGrafScaledSize(double & fWidth, double & fHeight)
     double fSclGrafWidth = fWidth;//LwpTools::ConvertFromUnitsToMetric(pMyScale->GetScaleWidth());
     double fSclGrafHeight = fHeight;//LwpTools::ConvertFromUnitsToMetric(pMyScale->GetScaleHeight());
 
-    LwpVirtualLayout* pLayout = GetLayout(NULL);
+    LwpVirtualLayout* pLayout = GetLayout(nullptr);
     if (pLayout && pLayout->IsFrame())
     {
         LwpFrameLayout* pMyFrameLayout = static_cast<LwpFrameLayout*>(pLayout);
diff --git a/lotuswordpro/source/filter/lwpoverride.cxx b/lotuswordpro/source/filter/lwpoverride.cxx
index 01f170bde004..d78de247d746 100644
--- a/lotuswordpro/source/filter/lwpoverride.cxx
+++ b/lotuswordpro/source/filter/lwpoverride.cxx
@@ -377,10 +377,10 @@ LwpSpacingOverride::~LwpSpacingOverride()
 
 LwpSpacingOverride::LwpSpacingOverride(LwpSpacingOverride const& rOther)
     : LwpOverride(rOther)
-    , m_pSpacing(0)
-    , m_pAboveLineSpacing(0)
-    , m_pParaSpacingAbove(0)
-    , m_pParaSpacingBelow(0)
+    , m_pSpacing(nullptr)
+    , m_pAboveLineSpacing(nullptr)
+    , m_pParaSpacingAbove(nullptr)
+    , m_pParaSpacingBelow(nullptr)
 {
     std::unique_ptr<LwpSpacingCommonOverride> pSpacing(::clone(rOther.m_pSpacing));
     std::unique_ptr<LwpSpacingCommonOverride> pAboveLineSpacing(::clone(rOther.m_pAboveLineSpacing));
@@ -460,7 +460,7 @@ LwpAmikakeOverride::~LwpAmikakeOverride()
 
 LwpAmikakeOverride::LwpAmikakeOverride(LwpAmikakeOverride const& rOther)
     : LwpOverride(rOther)
-    , m_pBackgroundStuff(0)
+    , m_pBackgroundStuff(nullptr)
     , m_nType(rOther.m_nType)
 {
     std::unique_ptr<LwpBackgroundStuff> pBackgroundStuff(::clone(rOther.m_pBackgroundStuff));
diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx
index 21edb921404d..4bd134b4532d 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -79,7 +79,7 @@ LwpPageLayout::LwpPageLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
     , m_nPrinterBin(0)
     , m_nBdroffset(0)
     , m_pPaperName(new LwpAtomHolder)
-    , m_pXFPageMaster(NULL)
+    , m_pXFPageMaster(nullptr)
 {
 }
 
@@ -269,7 +269,7 @@ void LwpPageLayout::ParseFootNoteSeparator(XFPageMaster * pm1)
     {
         LwpObjectID* pFontnodeId = pDocument->GetValidFootnoteOpts();
 
-        LwpFootnoteOptions* pFootnoteOpts = pFontnodeId ? dynamic_cast<LwpFootnoteOptions*>(pFontnodeId->obj().get()) : NULL;
+        LwpFootnoteOptions* pFootnoteOpts = pFontnodeId ? dynamic_cast<LwpFootnoteOptions*>(pFontnodeId->obj().get()) : nullptr;
         if(pFootnoteOpts)
         {
             LwpFootnoteSeparatorOptions& rFootnoteSep = pFootnoteOpts->GetFootnoteSeparator();
@@ -497,7 +497,7 @@ void LwpPageLayout::ResetXFColumns()
 {
     if(m_pXFPageMaster)
     {
-        m_pXFPageMaster->SetColumns(NULL);
+        m_pXFPageMaster->SetColumns(nullptr);
     }
 }
 
@@ -510,7 +510,7 @@ LwpHeaderLayout* LwpPageLayout::GetHeaderLayout()
             return ( static_cast<LwpHeaderLayout*> (pLay) );
         pLay = dynamic_cast<LwpVirtualLayout*> (pLay->GetNext().obj().get());
     }
-    return NULL;
+    return nullptr;
 }
 
 LwpFooterLayout* LwpPageLayout::GetFooterLayout()
@@ -522,7 +522,7 @@ LwpFooterLayout* LwpPageLayout::GetFooterLayout()
             return ( static_cast<LwpFooterLayout*> (pLay) );
         pLay = dynamic_cast<LwpVirtualLayout*> (pLay->GetNext().obj().get());
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -548,7 +548,7 @@ LwpPageLayout* LwpPageLayout::GetOddChildLayout()
             pLay = dynamic_cast<LwpVirtualLayout*> (pLay->GetNext().obj().get());
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -719,7 +719,7 @@ LwpPara* LwpPageLayout::GetPagePosition()
     LwpFoundry* pFoundry = GetFoundry();
     if(pFoundry)
     {
-        LwpSection* pSection = NULL;
+        LwpSection* pSection = nullptr;
         while( (pSection = pFoundry->EnumSections(pSection)) )
         {
             if(pSection->GetPageLayout() == this)
@@ -727,7 +727,7 @@ LwpPara* LwpPageLayout::GetPagePosition()
         }
     }
 
-    return NULL;
+    return nullptr;
 }
 LwpHeaderLayout::LwpHeaderLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm )
     : LwpPlacableLayout(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index 4718f42f7cf5..4d56fc800dcb 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -101,22 +101,22 @@ LwpPara::LwpPara(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
     , m_nOrdinal(0)
     , m_nFlags(0)
     , m_nLevel(0)
-    , m_pProps(NULL)
-    , m_pBreaks(NULL)
-    , m_pIndentOverride(NULL)
+    , m_pProps(nullptr)
+    , m_pBreaks(nullptr)
+    , m_pIndentOverride(nullptr)
     , m_FontID(0)
     , m_AllText("")
     , m_bHasBullet(false)
-    , m_pSilverBullet(NULL)
-    , m_pBullOver(NULL)
+    , m_pSilverBullet(nullptr)
+    , m_pBullOver(nullptr)
     , m_bBullContinue(false)
     , m_SectionStyleName("")
     , m_bHasDropcap(false)
     , m_nLines(0)
     , m_nChars(0)
-    , m_pDropcapLayout(NULL)
+    , m_pDropcapLayout(nullptr)
     , m_BelowSpacing(0)
-    , m_pXFContainer(NULL)
+    , m_pXFContainer(nullptr)
 {
 }
 
@@ -126,7 +126,7 @@ LwpPara::~LwpPara()
     if (m_pBreaks)
     {
         delete m_pBreaks;
-        m_pBreaks = NULL;
+        m_pBreaks = nullptr;
     }
 /*  if (m_pParaNumbering)
     {
@@ -137,7 +137,7 @@ LwpPara::~LwpPara()
     if (m_pBullOver)
     {
         delete m_pBullOver;
-        m_pBullOver = NULL;
+        m_pBullOver = nullptr;
     }
     if(m_pIndentOverride)
     {
@@ -250,7 +250,7 @@ void LwpPara::Parse(IXFStream* pOutputStream)
     m_pXFContainer->ToXml(pOutputStream);
     m_pXFContainer->Reset();
     delete m_pXFContainer;
-    m_pXFContainer = NULL;
+    m_pXFContainer = nullptr;
 }
 
 void LwpPara::XFConvert(XFContentContainer* pCont)
@@ -348,7 +348,7 @@ void LwpPara::RegisterStyle()
     if (!m_pFoundry)
         return;
     XFParaStyle* pBaseStyle = static_cast<XFParaStyle*>(m_pFoundry->GetStyleManager()->GetStyle(m_ParaStyle));
-    if (pBaseStyle == NULL) return;
+    if (pBaseStyle == nullptr) return;
     m_StyleName = pBaseStyle->GetStyleName();//such intf to be added
     m_ParentStyleName = m_StyleName;
     XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
@@ -360,11 +360,11 @@ void LwpPara::RegisterStyle()
         m_pIndentOverride = pIndentOverride.release();
     }
 
-    XFParaStyle* pOverStyle = NULL;
+    XFParaStyle* pOverStyle = nullptr;
     bool noSpacing = true;
-    LwpParaProperty* pBulletProps = NULL, *pNumberingProps = NULL;
+    LwpParaProperty* pBulletProps = nullptr, *pNumberingProps = nullptr;
 
-    if (m_pProps != NULL)
+    if (m_pProps != nullptr)
     {
         bool noIndent = true;
         pOverStyle = new XFParaStyle;
@@ -381,7 +381,7 @@ void LwpPara::RegisterStyle()
             case PP_LOCAL_ALIGN:
             {
                 if (!rParaStyle.GetAlignment())
-                    OverrideAlignment(NULL,static_cast<LwpParaAlignProperty*>(pProps)->GetAlignment(),pOverStyle);
+                    OverrideAlignment(nullptr,static_cast<LwpParaAlignProperty*>(pProps)->GetAlignment(),pOverStyle);
                 else
                 {
                     std::unique_ptr<LwpAlignmentOverride> const pAlign(
@@ -396,7 +396,7 @@ void LwpPara::RegisterStyle()
             {
                 noIndent = false;
                 if (!rParaStyle.GetIndent())
-                    OverrideIndent(NULL,static_cast<LwpParaIndentProperty*>(pProps)->GetIndent(),pOverStyle);
+                    OverrideIndent(nullptr,static_cast<LwpParaIndentProperty*>(pProps)->GetIndent(),pOverStyle);
 
                 else
                 {
@@ -408,7 +408,7 @@ void LwpPara::RegisterStyle()
             {
                 noSpacing = false;
                 if (!rParaStyle.GetSpacing())
-                    OverrideSpacing(NULL,static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(),pOverStyle);
+                    OverrideSpacing(nullptr,static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(),pOverStyle);
                 else
                 {
                     std::unique_ptr<LwpSpacingOverride> const
@@ -479,7 +479,7 @@ void LwpPara::RegisterStyle()
         {
             if (m_pIndentOverride->IsUseRelative() && GetParent())
             {
-                OverrideIndent(NULL,m_pIndentOverride,pOverStyle);
+                OverrideIndent(nullptr,m_pIndentOverride,pOverStyle);
             }
         }
         if (!m_ParentStyleName.isEmpty())
@@ -495,7 +495,7 @@ void LwpPara::RegisterStyle()
                 {
                     pOverStyle = new XFParaStyle;
                     *pOverStyle = *pBaseStyle;
-                    OverrideIndent(NULL,m_pIndentOverride,pOverStyle);
+                    OverrideIndent(nullptr,m_pIndentOverride,pOverStyle);
                     if (!m_ParentStyleName.isEmpty())
                         pOverStyle->SetParentStyleName(m_ParentStyleName);
                     m_StyleName = pXFStyleManager->AddStyle(pOverStyle).m_pStyle->GetStyleName();
@@ -548,7 +548,7 @@ void LwpPara::RegisterStyle()
                     sal_uInt16 nPosition = pNumbering->GetPosition();
                     bool bLesser = m_pSilverBullet->IsLesserLevel(nPosition);
                     LwpPara* pPara = this;
-                    LwpPara* pPrePara = NULL;
+                    LwpPara* pPrePara = nullptr;
                     sal_uInt16 nNum = 0, nLevel = 0, nFoundLevel = 0xffff, nFoundBound = 0;
 
                     nFoundBound = nLevel = pNumbering->GetLevel();
@@ -788,10 +788,10 @@ XFSection* LwpPara::CreateXFSection()
 void LwpPara::RegisterTabStyle(XFParaStyle* pXFParaStyle)
 {
     LwpTabOverride aFinaOverride;
-    LwpTabOverride* pBase = NULL;
+    LwpTabOverride* pBase = nullptr;
     //get the tabrack from the current layout
     LwpStory* pStory = dynamic_cast<LwpStory*>(m_Story.obj().get());
-    LwpMiddleLayout* pLayout = pStory ? pStory->GetTabLayout() : NULL;
+    LwpMiddleLayout* pLayout = pStory ? pStory->GetTabLayout() : nullptr;
     if(pLayout)
     {
         pBase = pLayout->GetTabOverride();
@@ -877,7 +877,7 @@ LwpBulletStyleMgr* LwpPara::GetBulletStyleMgr()
         return m_pFoundry->GetBulletStyleMgr();
     }
 
-    return NULL;
+    return nullptr;
 }
 
 XFContentContainer* LwpPara::AddBulletList(XFContentContainer* pCont)
@@ -886,7 +886,7 @@ XFContentContainer* LwpPara::AddBulletList(XFContentContainer* pCont)
     if (!pBulletStyleMgr)
     {
         assert(false);
-        return NULL;
+        return nullptr;
     }
 
     sal_uInt16 nLevel = m_nLevel;
diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx
index 817811338b23..758f1966e092 100644
--- a/lotuswordpro/source/filter/lwppara.hxx
+++ b/lotuswordpro/source/filter/lwppara.hxx
@@ -130,9 +130,9 @@ struct ParaNumbering
 
     void clear()
     {
-        pPrefix = NULL;
-        pParaNumber = NULL;
-        pSuffix = NULL;
+        pPrefix = nullptr;
+        pParaNumber = nullptr;
+        pSuffix = nullptr;
         nPrefixLevel = 0;
         nNumLevel = 0;
         nSuffixLevel = 0;
@@ -348,7 +348,7 @@ inline LwpStory* LwpPara::GetStory()
 {
     if (m_Story.obj().is())
         return dynamic_cast<LwpStory*>(m_Story.obj().get());
-    return NULL;
+    return nullptr;
 }
 inline void LwpPara::SetParaDropcap(bool bFlag)
 {
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index 5784d345d1e9..36350507e9f0 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -180,7 +180,7 @@ LwpPara* LwpPara::GetParent()
             pPara = dynamic_cast<LwpPara*>(pPara->GetPrevious().obj().get());
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -197,7 +197,7 @@ void LwpPara::GetParaNumber(sal_uInt16 nPosition, ParaNumbering* pParaNumbering)
     }
     sal_uInt16 nCurrentPos = 0;
 
-    LwpFrib* pPreFrib = NULL;
+    LwpFrib* pPreFrib = nullptr;
     LwpFrib* pFrib = m_Fribs.GetFribs();
     if (!pFrib)
     {
@@ -577,7 +577,7 @@ LwpParaProperty* LwpPara::GetProperty(sal_uInt32 nPropType)
         pProps = pProps->GetNext();
 
     }
-    return NULL;
+    return nullptr;
 }
 
 /**************************************************************************
@@ -590,7 +590,7 @@ LwpTabOverride* LwpPara::GetLocalTabOverride()
     {
         return static_cast<LwpParaTabRackProperty*>(pProp)->GetTab();
     }
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -618,7 +618,7 @@ bool LwpPara::ComparePagePosition(LwpVirtualLayout * pPreLayout, LwpVirtualLayou
 bool LwpPara::IsInCell()
 {
     LwpStory *pStory = GetStory();
-    LwpVirtualLayout* pLayout = pStory ? pStory->GetLayout(NULL) : NULL;
+    LwpVirtualLayout* pLayout = pStory ? pStory->GetLayout(nullptr) : nullptr;
     if(pLayout && pLayout->IsCell())
         return true;
     return false;
diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.cxx b/lotuswordpro/source/filter/lwpparaborderoverride.cxx
index 914deaefc811..67398f17d32b 100644
--- a/lotuswordpro/source/filter/lwpparaborderoverride.cxx
+++ b/lotuswordpro/source/filter/lwpparaborderoverride.cxx
@@ -87,10 +87,10 @@ LwpParaBorderOverride::LwpParaBorderOverride()
 
 LwpParaBorderOverride::LwpParaBorderOverride(LwpParaBorderOverride const& rOther)
     : LwpOverride(rOther)
-    , m_pBorderStuff(0)
-    , m_pBetweenStuff(0)
-    , m_pShadow(0)
-    , m_pMargins(0)
+    , m_pBorderStuff(nullptr)
+    , m_pBetweenStuff(nullptr)
+    , m_pShadow(nullptr)
+    , m_pMargins(nullptr)
     , m_eAboveType(rOther.m_eAboveType)
     , m_eBelowType(rOther.m_eBelowType)
     , m_eRightType(rOther.m_eRightType)
diff --git a/lotuswordpro/source/filter/lwpparaproperty.cxx b/lotuswordpro/source/filter/lwpparaproperty.cxx
index 6c482b367621..66730e2e406a 100644
--- a/lotuswordpro/source/filter/lwpparaproperty.cxx
+++ b/lotuswordpro/source/filter/lwpparaproperty.cxx
@@ -64,8 +64,8 @@
 
 LwpParaProperty* LwpParaProperty::ReadPropertyList(LwpObjectStream* pFile,rtl::Reference<LwpObject> const & Whole)
 {
-    LwpParaProperty* Prop= NULL;
-    LwpParaProperty* NewProp= NULL;
+    LwpParaProperty* Prop= nullptr;
+    LwpParaProperty* NewProp= nullptr;
 
     for(;;)
     {
@@ -125,13 +125,13 @@ LwpParaProperty* LwpParaProperty::ReadPropertyList(LwpObjectStream* pFile,rtl::R
 
             default:
                 pFile->SeekRel(Len);
-                NewProp = NULL;
+                NewProp = nullptr;
                 break;
         }
         // Stick it at the beginning of the list
         if (NewProp)
         {
-            NewProp->insert(Prop, NULL);
+            NewProp->insert(Prop, nullptr);
             Prop = NewProp;
         }
     }
@@ -144,7 +144,7 @@ LwpParaAlignProperty::LwpParaAlignProperty(LwpObjectStream* pFile)
     align.ReadIndexed(pFile);
 
     LwpAlignmentPiece *pAlignmentPiece = dynamic_cast<LwpAlignmentPiece*>(align.obj(VO_ALIGNMENTPIECE).get());
-    m_pAlignment = pAlignmentPiece ? dynamic_cast<LwpAlignmentOverride*>(pAlignmentPiece->GetOverride()) : NULL;
+    m_pAlignment = pAlignmentPiece ? dynamic_cast<LwpAlignmentOverride*>(pAlignmentPiece->GetOverride()) : nullptr;
 
 }
 
@@ -162,7 +162,7 @@ LwpParaIndentProperty::LwpParaIndentProperty(LwpObjectStream* pFile)
     m_aIndentID.ReadIndexed(pFile);
 
     LwpIndentPiece *pIndentPiece = dynamic_cast<LwpIndentPiece*>(m_aIndentID.obj(VO_INDENTPIECE).get());
-    m_pIndent = pIndentPiece ? dynamic_cast<LwpIndentOverride*>(pIndentPiece->GetOverride()) : NULL;
+    m_pIndent = pIndentPiece ? dynamic_cast<LwpIndentOverride*>(pIndentPiece->GetOverride()) : nullptr;
 }
 
 LwpParaIndentProperty::~LwpParaIndentProperty()
@@ -180,7 +180,7 @@ LwpParaSpacingProperty::LwpParaSpacingProperty(LwpObjectStream* pFile)
     spacing.ReadIndexed(pFile);
 
     LwpSpacingPiece *pSpacingPiece = dynamic_cast<LwpSpacingPiece*>(spacing.obj(VO_SPACINGPIECE).get());
-    m_pSpacing = pSpacingPiece ? dynamic_cast<LwpSpacingOverride*>(pSpacingPiece->GetOverride()) : NULL;
+    m_pSpacing = pSpacingPiece ? dynamic_cast<LwpSpacingOverride*>(pSpacingPiece->GetOverride()) : nullptr;
 }
 
 LwpParaSpacingProperty::~LwpParaSpacingProperty()
@@ -194,7 +194,7 @@ sal_uInt32 LwpParaSpacingProperty::GetType()
 
 // 01/25/2004
 LwpParaBorderProperty::LwpParaBorderProperty(LwpObjectStream* pStrm) :
-m_pParaBorderOverride(NULL)
+m_pParaBorderOverride(nullptr)
 {
     LwpObjectID aParaBorder;
     aParaBorder.ReadIndexed(pStrm);
@@ -202,12 +202,12 @@ m_pParaBorderOverride(NULL)
     if (!aParaBorder.IsNull())
     {
         LwpParaBorderPiece *pParaBorderPiece = dynamic_cast<LwpParaBorderPiece*>(aParaBorder.obj().get());
-        m_pParaBorderOverride = pParaBorderPiece ? dynamic_cast<LwpParaBorderOverride*>(pParaBorderPiece->GetOverride()) : NULL;
+        m_pParaBorderOverride = pParaBorderPiece ? dynamic_cast<LwpParaBorderOverride*>(pParaBorderPiece->GetOverride()) : nullptr;
     }
 }
 
 LwpParaBreaksProperty::LwpParaBreaksProperty(LwpObjectStream* pStrm) :
-m_pBreaks(NULL)
+m_pBreaks(nullptr)
 {
     LwpObjectID aBreaks;
     aBreaks.ReadIndexed(pStrm);
@@ -215,7 +215,7 @@ m_pBreaks(NULL)
     if (!aBreaks.IsNull())
     {
         LwpBreaksPiece *pBreaksPiece = dynamic_cast<LwpBreaksPiece*>(aBreaks.obj().get());
-        m_pBreaks = pBreaksPiece ? dynamic_cast<LwpBreaksOverride*>(pBreaksPiece->GetOverride()) : NULL;
+        m_pBreaks = pBreaksPiece ? dynamic_cast<LwpBreaksOverride*>(pBreaksPiece->GetOverride()) : nullptr;
     }
 }
 
@@ -231,7 +231,7 @@ LwpParaBulletProperty::~LwpParaBulletProperty()
 }
 
 LwpParaNumberingProperty::LwpParaNumberingProperty(LwpObjectStream * pStrm)
-    : m_pNumberingOverride(NULL)
+    : m_pNumberingOverride(nullptr)
 {
     LwpObjectID aNumberingPiece;
     aNumberingPiece.ReadIndexed(pStrm);
@@ -241,7 +241,7 @@ LwpParaNumberingProperty::LwpParaNumberingProperty(LwpObjectStream * pStrm)
     }
 
     LwpNumberingPiece *pNumberingPiece = dynamic_cast<LwpNumberingPiece*>(aNumberingPiece.obj(VO_NUMBERINGPIECE).get());
-    m_pNumberingOverride = pNumberingPiece ? dynamic_cast<LwpNumberingOverride*>(pNumberingPiece->GetOverride()) : NULL;
+    m_pNumberingOverride = pNumberingPiece ? dynamic_cast<LwpNumberingOverride*>(pNumberingPiece->GetOverride()) : nullptr;
 }
 
 LwpParaTabRackProperty::LwpParaTabRackProperty(LwpObjectStream* pFile)
@@ -250,7 +250,7 @@ LwpParaTabRackProperty::LwpParaTabRackProperty(LwpObjectStream* pFile)
     aTabRack.ReadIndexed(pFile);
 
     LwpTabPiece *pTabPiece = dynamic_cast<LwpTabPiece*>(aTabRack.obj().get());
-    m_pTabOverride = pTabPiece ? dynamic_cast<LwpTabOverride*>(pTabPiece->GetOverride()) : NULL;
+    m_pTabOverride = pTabPiece ? dynamic_cast<LwpTabOverride*>(pTabPiece->GetOverride()) : nullptr;
 }
 
 LwpParaTabRackProperty::~LwpParaTabRackProperty()
@@ -263,7 +263,7 @@ LwpParaBackGroundProperty::LwpParaBackGroundProperty(LwpObjectStream* pFile)
     background.ReadIndexed(pFile);
 
     LwpBackgroundPiece *pBackgroundPiece = dynamic_cast<LwpBackgroundPiece*>(background.obj().get());
-    m_pBackground = pBackgroundPiece ? dynamic_cast<LwpBackgroundOverride*>(pBackgroundPiece->GetOverride()) : NULL;
+    m_pBackground = pBackgroundPiece ? dynamic_cast<LwpBackgroundOverride*>(pBackgroundPiece->GetOverride()) : nullptr;
 }
 
 LwpParaBackGroundProperty::~LwpParaBackGroundProperty()
diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx
index b83e517a408a..18d31f190c25 100644
--- a/lotuswordpro/source/filter/lwpparastyle.cxx
+++ b/lotuswordpro/source/filter/lwpparastyle.cxx
@@ -155,7 +155,7 @@ void LwpParaStyle::Apply(XFParaStyle *pParaStyle)
 {
     assert(pParaStyle);
 
-    LwpVirtualPiece *pPiece = NULL;
+    LwpVirtualPiece *pPiece = nullptr;
     //alignment:
     pPiece = dynamic_cast<LwpVirtualPiece*>(m_AlignmentStyle.obj().get());
     if( pPiece )
@@ -177,10 +177,10 @@ void LwpParaStyle::Apply(XFParaStyle *pParaStyle)
                 std::unique_ptr<LwpIndentOverride> pNewIndent(pIndent->clone());
                 pNewIndent->SetMFirst(0);
                 pNewIndent->SetMRest(0);
-                ApplyIndent(NULL, pParaStyle, pNewIndent.get());
+                ApplyIndent(nullptr, pParaStyle, pNewIndent.get());
             }
             else
-                ApplyIndent(NULL,pParaStyle,pIndent);
+                ApplyIndent(nullptr,pParaStyle,pIndent);
         }
     }
     //shadow & borders.
@@ -199,7 +199,7 @@ void LwpParaStyle::Apply(XFParaStyle *pParaStyle)
     {
         LwpSpacingOverride *pSpacing = dynamic_cast<LwpSpacingOverride*>(pPiece->GetOverride());
         if( pSpacing)
-            ApplySpacing(NULL,pParaStyle,pSpacing);
+            ApplySpacing(nullptr,pParaStyle,pSpacing);
     }
 
     //paragraph background.
@@ -434,7 +434,7 @@ void LwpParaStyle::ApplyIndent(LwpPara* pPara, XFParaStyle* pParaStyle, LwpInden
     if (pPara)
         pParentPara = pPara->GetParent();
     else
-        pParentPara = NULL;
+        pParentPara = nullptr;
 
     std::unique_ptr<LwpIndentOverride> pTotalIndent(new LwpIndentOverride);
     if (pIndent->IsUseRelative() && pParentPara)
@@ -684,79 +684,79 @@ void LwpParaStyle::RegisterStyle()
 
 LwpAlignmentOverride* LwpParaStyle::GetAlignment()
 {
-    if (m_AlignmentStyle.obj() == NULL)
-        return NULL;
+    if (m_AlignmentStyle.obj() == nullptr)
+        return nullptr;
 
     LwpAlignmentPiece *pPiece = dynamic_cast<LwpAlignmentPiece*>(m_AlignmentStyle.obj().get());
     if (pPiece)
         return dynamic_cast<LwpAlignmentOverride*>(pPiece->GetOverride());
-    return NULL;
+    return nullptr;
 }
 
 LwpIndentOverride* LwpParaStyle::GetIndent()
 {
-    if (m_IndentStyle.obj() == NULL)
-        return NULL;
+    if (m_IndentStyle.obj() == nullptr)
+        return nullptr;
 
     LwpIndentPiece *pPiece = dynamic_cast<LwpIndentPiece*>(m_IndentStyle.obj().get());
     if (pPiece)
         return dynamic_cast<LwpIndentOverride*>(pPiece->GetOverride());
-    return NULL;
+    return nullptr;
 }
 
 LwpSpacingOverride* LwpParaStyle::GetSpacing()
 {
-    if (m_SpacingStyle.obj() == NULL)
-        return NULL;
+    if (m_SpacingStyle.obj() == nullptr)
+        return nullptr;
 
     LwpSpacingPiece *pPiece = dynamic_cast<LwpSpacingPiece*>(m_SpacingStyle.obj().get());
     if (pPiece)
         return dynamic_cast<LwpSpacingOverride*>(pPiece->GetOverride());
-    return NULL;
+    return nullptr;
 }
 
 LwpParaBorderOverride* LwpParaStyle::GetParaBorder() const
 {
     if(m_BorderStyle.IsNull())
-        return NULL;
+        return nullptr;
 
     LwpParaBorderPiece *pPiece = dynamic_cast<LwpParaBorderPiece*>(m_BorderStyle.obj(VO_PARABORDERPIECE).get());
     if (pPiece)
         return dynamic_cast<LwpParaBorderOverride*>(pPiece->GetOverride());
-    return NULL;
+    return nullptr;
 }
 
 LwpBreaksOverride* LwpParaStyle::GetBreaks() const
 {
     if(m_BreaksStyle.IsNull())
-        return NULL;
+        return nullptr;
 
     LwpBreaksPiece *pPiece = dynamic_cast<LwpBreaksPiece*>(m_BreaksStyle.obj(VO_BREAKSPIECE).get());
     if (pPiece)
         return dynamic_cast<LwpBreaksOverride*>(pPiece->GetOverride());
-    return NULL;
+    return nullptr;
 }
 
 
 LwpNumberingOverride* LwpParaStyle::GetNumberingOverride() const
 {
     if(m_NumberingStyle.IsNull())
-        return NULL;
+        return nullptr;
 
     LwpNumberingPiece *pPiece = dynamic_cast<LwpNumberingPiece*>(m_NumberingStyle.obj(VO_NUMBERINGPIECE).get());
     if (pPiece)
         return dynamic_cast<LwpNumberingOverride*>(pPiece->GetOverride());
-    return NULL;
+    return nullptr;
 }
 
 LwpTabOverride* LwpParaStyle::GetTabOverride() const
 {
-    if(m_TabStyle.obj() == NULL)
-        return NULL;
+    if(m_TabStyle.obj() == nullptr)
+        return nullptr;
     LwpTabPiece *pPiece = dynamic_cast<LwpTabPiece*>(m_TabStyle.obj().get());
     if (pPiece)
         return dynamic_cast<LwpTabOverride*>(pPiece->GetOverride());
-    return NULL;
+    return nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwppiece.hxx b/lotuswordpro/source/filter/lwppiece.hxx
index 497c386851b7..9a8ffcd4ec98 100644
--- a/lotuswordpro/source/filter/lwppiece.hxx
+++ b/lotuswordpro/source/filter/lwppiece.hxx
@@ -80,7 +80,7 @@ class LwpVirtualPiece : public LwpDLVList
 public:
     LwpVirtualPiece(LwpObjectHeader& objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm)
     {
-        m_pOverride = NULL;
+        m_pOverride = nullptr;
     }
 
     virtual void Read() override
diff --git a/lotuswordpro/source/filter/lwpproplist.cxx b/lotuswordpro/source/filter/lwpproplist.cxx
index b66a48876e2c..475bf4ce5de3 100644
--- a/lotuswordpro/source/filter/lwpproplist.cxx
+++ b/lotuswordpro/source/filter/lwpproplist.cxx
@@ -103,7 +103,7 @@ LwpPropListElement* LwpPropList::FindPropByName(const OUString& name)
             return pElement;
         pElement = pElement->GetNext();
     }
-    return NULL;
+    return nullptr;
 }
 
 void LwpPropList::Read(LwpObjectStream* pObjStrm)
diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx
index 4d82dbc29cbe..507a8490fcff 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/lotuswordpro/source/filter/lwprowlayout.cxx
@@ -366,7 +366,7 @@ void LwpRowLayout::ConvertCommonRow(XFTable* pXFTable,sal_uInt8 nStartCol,sal_uI
     XFRow* pRow = new XFRow;
     pRow->SetStyleName(m_StyleName);
 
-    XFCell * pCell = NULL;
+    XFCell * pCell = nullptr;
     LwpTableLayout* pTableLayout = GetParentTableLayout();
     LwpTable* pTable = pTableLayout->GetTable();
     sal_uInt8 nCellStartCol,nCellEndCol;
diff --git a/lotuswordpro/source/filter/lwpsdwdrawheader.hxx b/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
index d864e395410e..ec207fa50de0 100644
--- a/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
+++ b/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
@@ -285,7 +285,7 @@ struct SdwFMPATH
     SdwPoint* pPts;
     SdwFMPATH()
         : n(0)
-        , pPts(NULL)
+        , pPts(nullptr)
     {
     }
 };
diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
index d660cc5587e1..3ed1ffdee5be 100644
--- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
+++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
@@ -78,7 +78,7 @@
 LwpSdwGroupLoaderV0102::LwpSdwGroupLoaderV0102(SvStream* pStream, LwpGraphicObject* pGraphicObj)
     : m_pStream(pStream)
     , m_pGraphicObj(pGraphicObj)
-    , m_pDrawObjVector(NULL)
+    , m_pDrawObjVector(nullptr)
 {
 }
 
@@ -129,7 +129,7 @@ void LwpSdwGroupLoaderV0102::BeginDrawObjects(std::vector< rtl::Reference<XFFram
     m_pStream->SeekRel(2);
 
     //for calculating transformation params.
-    LwpFrameLayout* pMyFrameLayout = static_cast<LwpFrameLayout*>(m_pGraphicObj->GetLayout(NULL));
+    LwpFrameLayout* pMyFrameLayout = static_cast<LwpFrameLayout*>(m_pGraphicObj->GetLayout(nullptr));
     if (pMyFrameLayout)
     {
         LwpLayoutScale* pMyScale = pMyFrameLayout->GetLayoutScale();
@@ -249,7 +249,7 @@ XFDrawGroup* LwpSdwGroupLoaderV0102::CreateDrawGroupObject()
     if (BinSignature[0] != 'S' || BinSignature[1] != 'M')
     {
         assert(false);
-        return NULL;
+        return nullptr;
     }
     //version
     unsigned short nVersion;
@@ -257,7 +257,7 @@ XFDrawGroup* LwpSdwGroupLoaderV0102::CreateDrawGroupObject()
     if (nVersion<0x0102)
     {
         assert(false);
-        return NULL;
+        return nullptr;
     }
     // topObj, botObj
     m_pStream->SeekRel(4);
@@ -308,8 +308,8 @@ XFFrame* LwpSdwGroupLoaderV0102::CreateDrawObject()
     unsigned char recType;
     m_pStream->Read(&recType,1);
 
-    LwpDrawObj* pDrawObj = NULL;
-    XFFrame* pRetObjct = NULL;
+    LwpDrawObj* pDrawObj = nullptr;
+    XFFrame* pRetObjct = nullptr;
 
     switch(recType)
     {
@@ -399,7 +399,7 @@ XFFrame* LwpSdwGroupLoaderV0102::CreateDrawObject()
     if (pDrawObj)
     {
         delete pDrawObj;
-        pDrawObj = NULL;
+        pDrawObj = nullptr;
     }
 
     return pRetObjct;
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index 1e4d81770b7d..94c4a1577871 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -73,7 +73,7 @@ LwpSilverBullet::LwpSilverBullet(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
     , m_nFlags(0)
     , m_nUseCount(0)
     , m_pAtomHolder(new LwpAtomHolder)
-    , m_pBulletPara(NULL)
+    , m_pBulletPara(nullptr)
 {
 }
 
@@ -231,7 +231,7 @@ LwpPara* LwpSilverBullet::GetBulletPara()
         LwpStory* pStory = dynamic_cast<LwpStory*>(m_aStory.obj(VO_STORY).get());
         if (!pStory)
         {
-            return NULL;
+            return nullptr;
         }
 
         m_pBulletPara = dynamic_cast<LwpPara*>(pStory->GetFirstPara().obj(VO_PARA).get());
@@ -319,7 +319,7 @@ bool LwpSilverBullet::IsBulletOrdered()
 
     LwpFribPtr& rFribs = m_pBulletPara->GetFribs();
 
-    return (rFribs.HasFrib(FRIB_TAG_PARANUMBER) != NULL);
+    return (rFribs.HasFrib(FRIB_TAG_PARANUMBER) != nullptr);
 }
 
 /**
diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx
index 0b8d8555a6bc..1300b1584ba0 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -67,11 +67,11 @@
 LwpStory::LwpStory(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
     : LwpContent(objHdr, pStrm)
     , m_bPMModified(false)
-    , m_pCurrentLayout(NULL)
-    , m_pTabLayout(NULL)
+    , m_pCurrentLayout(nullptr)
+    , m_pTabLayout(nullptr)
     , m_bDropcap(false)
     , m_pHyperlinkMgr(new LwpHyperlinkMgr)
-    , m_pXFContainer(NULL)
+    , m_pXFContainer(nullptr)
 {
 }
 
@@ -145,7 +145,7 @@ void LwpStory::Parse(IXFStream* pOutputStream)
     XFConvert(m_pXFContainer);
     m_pXFContainer->ToXml(pOutputStream);
     delete m_pXFContainer;
-    m_pXFContainer = NULL;
+    m_pXFContainer = nullptr;
 
     //It seems that, currently, we do not need to process the child story
     /*LwpObject* pChildStory = GetFirstStory()->obj();
@@ -206,7 +206,7 @@ LwpPageLayout* LwpStory::GetNextPageLayout()
             }
         }
     }
-    return NULL;
+    return nullptr;
 }
 /**************************************************************************
  * @descr:   Sort the pagelayout according to their position
@@ -215,7 +215,7 @@ void LwpStory::SortPageLayout()
 {
     //Get all the pagelayout and store in list
     std::vector<LwpPageLayout*>  aLayoutList;
-    LwpVirtualLayout* pLayout = GetLayout(NULL);
+    LwpVirtualLayout* pLayout = GetLayout(nullptr);
     while(pLayout)
     {
         if(pLayout->IsPage())
@@ -315,7 +315,7 @@ bool LwpStory::IsNeedSection()
 **************************************************************************/
 void LwpStory::XFConvertFrameInCell(XFContentContainer* pCont)
 {
-    LwpVirtualLayout* pLayout = GetLayout(NULL);
+    LwpVirtualLayout* pLayout = GetLayout(nullptr);
     while(pLayout)
     {
         LwpVirtualLayout* pFrameLayout = dynamic_cast<LwpVirtualLayout*>(pLayout->GetChildHead().obj().get());
@@ -343,7 +343,7 @@ void LwpStory::XFConvertFrameInCell(XFContentContainer* pCont)
 **************************************************************************/
 void LwpStory::XFConvertFrameInPage(XFContentContainer* pCont)
 {
-    LwpVirtualLayout* pLayout = GetLayout(NULL);
+    LwpVirtualLayout* pLayout = GetLayout(nullptr);
     while(pLayout)
     {
         LwpVirtualLayout* pFrameLayout = dynamic_cast<LwpVirtualLayout*>(pLayout->GetChildHead().obj().get());
@@ -366,7 +366,7 @@ void LwpStory::XFConvertFrameInPage(XFContentContainer* pCont)
 **************************************************************************/
 void LwpStory::XFConvertFrameInFrame(XFContentContainer* pCont)
 {
-    LwpVirtualLayout* pLayout = GetLayout(NULL);
+    LwpVirtualLayout* pLayout = GetLayout(nullptr);
     while(pLayout)
     {
         LwpVirtualLayout* pFrameLayout = dynamic_cast<LwpVirtualLayout*>(pLayout->GetChildHead().obj().get());
@@ -386,7 +386,7 @@ void LwpStory::XFConvertFrameInFrame(XFContentContainer* pCont)
 **************************************************************************/
 void LwpStory::XFConvertFrameInHeaderFooter(XFContentContainer* pCont)
 {
-    LwpVirtualLayout* pLayout = GetLayout(NULL);
+    LwpVirtualLayout* pLayout = GetLayout(nullptr);
     while(pLayout)
     {
         LwpVirtualLayout* pFrameLayout = dynamic_cast<LwpVirtualLayout*>(pLayout->GetChildHead().obj().get());
@@ -418,18 +418,18 @@ XFContentContainer* LwpStory::GetXFContent()
     if(m_pXFContainer)
         return m_pXFContainer;
     else
-        return NULL;
+        return nullptr;
 }
 
 LwpPara* LwpStory::GetLastParaOfPreviousStory()
 {
-    LwpVirtualLayout* pVLayout = this->GetLayout(NULL);
+    LwpVirtualLayout* pVLayout = this->GetLayout(nullptr);
     if (pVLayout)
     {
         return pVLayout->GetLastParaOfPreviousStory();
     }
 
-    return NULL;
+    return nullptr;
 }
 /**************************************************************************
  * @descr:  get text from story
@@ -455,7 +455,7 @@ OUString LwpStory::GetContentText(bool bAllText)
         if(pObj.is())
         {
             LwpPara* pPara = dynamic_cast<LwpPara*>(pObj.get());
-            if (!pPara || pPara->GetNext().obj() != NULL)
+            if (!pPara || pPara->GetNext().obj() != nullptr)
                 return OUString("");
             pPara->SetFoundry(m_pFoundry);
             return pPara->GetContentText();
@@ -475,7 +475,7 @@ OUString LwpStory::RegisterFirstFribStyle()
     pFirstFrib->RegisterStyle(m_pFoundry);
     XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
     XFTextStyle* pBaseStyle = pXFStyleManager->FindTextStyle(pFirstFrib->GetStyleName());
-    if (pBaseStyle == NULL)
+    if (pBaseStyle == nullptr)
         return OUString("");
     XFTextStyle* pStyle = new XFTextStyle;
     *pStyle = *pBaseStyle;
diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx
index 18125f93b275..9266674aa280 100644
--- a/lotuswordpro/source/filter/lwpstory.hxx
+++ b/lotuswordpro/source/filter/lwpstory.hxx
@@ -147,7 +147,7 @@ LwpMiddleLayout* LwpStory::GetTabLayout()
 {
     if(m_pTabLayout)
         return m_pTabLayout;
-    return static_cast<LwpMiddleLayout*>(GetLayout(NULL));
+    return static_cast<LwpMiddleLayout*>(GetLayout(nullptr));
 }
 void LwpStory::SetPMModified(bool bPMModified)
 {
diff --git a/lotuswordpro/source/filter/lwpsvstream.hxx b/lotuswordpro/source/filter/lwpsvstream.hxx
index d7ccb525291f..2f58f255ec96 100644
--- a/lotuswordpro/source/filter/lwpsvstream.hxx
+++ b/lotuswordpro/source/filter/lwpsvstream.hxx
@@ -67,7 +67,7 @@ class SvStream;
 class LwpSvStream
 {
 public:
-    LwpSvStream(SvStream* pStream, LwpSvStream * pCompressed = NULL);
+    LwpSvStream(SvStream* pStream, LwpSvStream * pCompressed = nullptr);
     sal_Int32 Read( void* bytes, sal_Int32 nBytesToRead );
     sal_Int64 SeekRel( sal_Int64 pos );
     sal_Int64 Tell();
diff --git a/lotuswordpro/source/filter/lwptable.cxx b/lotuswordpro/source/filter/lwptable.cxx
index c773d5d445a9..480fb5a9d69b 100644
--- a/lotuswordpro/source/filter/lwptable.cxx
+++ b/lotuswordpro/source/filter/lwptable.cxx
@@ -140,7 +140,7 @@ void  LwpTable::Parse(IXFStream* /*pOutputStream*/)
     if(pLayout)
         return dynamic_cast<LwpSuperTableLayout*>(pLayout->GetParent().obj().get());
 
-    return NULL;
+    return nullptr;
 }
 
  /*****************************************************************************/
diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx
index edc739d7e2c9..c9fa7dabfc50 100644
--- a/lotuswordpro/source/filter/lwptable.hxx
+++ b/lotuswordpro/source/filter/lwptable.hxx
@@ -119,7 +119,7 @@ public:
     LwpObjectID& GetDefaultCellStyle() {return m_DefaultCellStyle;}
     sal_uInt16 GetRow() {return m_nRow;}
     sal_uInt16 GetColumn() {return m_nColumn;}
-    LwpTableLayout * GetTableLayout(){return static_cast<LwpTableLayout *>(GetLayout(NULL));}
+    LwpTableLayout * GetTableLayout(){return static_cast<LwpTableLayout *>(GetLayout(nullptr));}
     bool IsNumberDown();
     virtual bool IsTable() override { return true;}
     LwpSuperTableLayout* GetSuperTableLayout();
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index 0f96782e3add..469555f78de5 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -127,7 +127,7 @@ LwpTableLayout* LwpSuperTableLayout::GetTableLayout()
         rID = pLayout->GetPrevious();
     }
 
-    return NULL;
+    return nullptr;
 }
 /**
  * @short   Get effective heading table layout, the one just before table layout is the only one which is effective
@@ -152,7 +152,7 @@ LwpTableHeadingLayout* LwpSuperTableLayout::GetTableHeadingLayout()
         rID = pLayout->GetPrevious();
     }
 
-    return NULL;
+    return nullptr;
 }
 /**
  * @short   Register super table layout style
@@ -161,7 +161,7 @@ void LwpSuperTableLayout::RegisterNewStyle()
 {
     // if this layout is style of real table entry
     LwpTableLayout* pTableLayout = GetTableLayout();
-    if (pTableLayout != NULL)
+    if (pTableLayout != nullptr)
     {
         pTableLayout->SetFoundry(m_pFoundry);
         pTableLayout->RegisterStyle();
@@ -380,7 +380,7 @@ void  LwpSuperTableLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 n
 {
     if(m_pFrame)
     {
-        XFFrame* pXFFrame = NULL;
+        XFFrame* pXFFrame = nullptr;
         if(nEnd < nStart)
         {
             pXFFrame = new XFFrame();
@@ -417,9 +417,9 @@ LwpTableLayout::LwpTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
     : LwpLayout(objHdr, pStrm)
     , m_nRows(0)
     , m_nCols(0)
-    , m_pDefaultCellLayout(NULL)
-    , m_pColumns(NULL)
-    , m_pXFTable(NULL)
+    , m_pDefaultCellLayout(nullptr)
+    , m_pColumns(nullptr)
+    , m_pXFTable(nullptr)
 {
     m_CellsMap.clear();
 }
@@ -431,7 +431,7 @@ LwpTableLayout::~LwpTableLayout()
     if (m_pColumns)
     {
         delete [] m_pColumns;
-        m_pColumns = NULL;
+        m_pColumns = nullptr;
     }
 }
 
@@ -444,7 +444,7 @@ LwpTableLayout::~LwpTableLayout()
 LwpCellLayout * LwpTableLayout::GetCellByRowCol(sal_uInt16 nRow, sal_uInt16 nCol)
 {
     if (nRow >= m_nRows || nCol >= m_nCols)
-        return NULL;
+        return nullptr;
 
     return m_WordProCellsMap[static_cast<size_t>(nRow)*m_nCols + nCol];
 }
@@ -491,7 +491,7 @@ LwpObjectID * LwpTableLayout::SearchCellStoryMap(sal_uInt16 nRow, sal_uInt16 nCo
 {
     if (nRow >= m_nRows || nCol >= m_nCols )
     {
-        return NULL;
+        return nullptr;
     }
 
     LwpCellLayout * pCell = GetCellByRowCol(nRow, nCol);
@@ -501,12 +501,12 @@ LwpObjectID * LwpTableLayout::SearchCellStoryMap(sal_uInt16 nRow, sal_uInt16 nCo
         // maybe default cell layout
         if (nRow != pCell->GetRowID() || nCol != pCell->GetColID())
         {
-            return NULL;
+            return nullptr;
         }
         return &pCell->GetContent();
     }
 
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -564,7 +564,7 @@ void LwpTableLayout::RegisterColumns()
     for(sal_uInt16 i=0;i<nCols; i++)
     {
         pWidthCalculated[i] = sal_False;
-        m_pColumns[i] = NULL;
+        m_pColumns[i] = nullptr;
     }
 
     double dDefaultColumn = pTable->GetWidth();
@@ -645,7 +645,7 @@ void LwpTableLayout::RegisterColumns()
 void LwpTableLayout::RegisterRows()
 {
     LwpTable * pTable = GetTable();
-    if (pTable == NULL)
+    if (pTable == nullptr)
     {
         assert(false);
         return;
@@ -692,7 +692,7 @@ void LwpTableLayout::RegisterStyle()
 
     // get table
     LwpTable * pTable = GetTable();
-    if (pTable == NULL)
+    if (pTable == nullptr)
     {
         assert(false);
         return;
@@ -1109,7 +1109,7 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID)
         LwpTableRange* pTableRange = static_cast<LwpTableRange*>(pHolder->GetHeadID().obj().get());
 
         //Look up the table
-        while (NULL!=pTableRange)
+        while (nullptr!=pTableRange)
         {
             LwpObjectID aID = pTableRange->GetTableID();
             if (aID == aTableID)
@@ -1127,13 +1127,13 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID)
             LwpRowList* pRowList = static_cast<LwpRowList*>(aRowListID.obj().get());
 
             //loop the rowlist
-            while( NULL!=pRowList)
+            while( nullptr!=pRowList)
             {
                 sal_uInt16 nRowID =  pRowList->GetRowID();
                 {
                     LwpCellList* pCellList = static_cast<LwpCellList*>(pRowList->GetChildHeadID().obj().get());
                     //loop the cellList
-                    while( NULL!=pCellList)
+                    while( nullptr!=pCellList)
                     {
                         {//put cell
                             sal_uInt16 nColID = pCellList->GetColumnID();
@@ -1187,7 +1187,7 @@ void LwpTableLayout::PostProcessParagraph(XFCell *pCell, sal_uInt16 nRowID, sal_
         {
             OUString sNumfmt = pCellLayout->GetNumfmtName();
             bool bColorMod = false;
-            XFNumberStyle* pNumStyle = NULL;
+            XFNumberStyle* pNumStyle = nullptr;
             XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
             if (!sNumfmt.isEmpty())
             {
@@ -1335,7 +1335,7 @@ void LwpTableLayout::ConvertDefaultRow(XFTable* pXFTable,sal_uInt8 nStartCol,
     {
         // if table has default cell layout, use it to ConvertCell
         // otherwise use blank cell
-        XFCell * pCell = NULL;
+        XFCell * pCell = nullptr;
         if (m_pDefaultCellLayout)
         {
             pCell = m_pDefaultCellLayout->ConvertCell(
@@ -1381,7 +1381,7 @@ XFCell* LwpTableLayout::GetCellsMap(sal_uInt16 nRow,sal_uInt8 nCol)
     std::map<std::pair<sal_uInt16,sal_uInt8>,XFCell*>::iterator iter;
     iter =  m_CellsMap.find(pos);
     if (iter == m_CellsMap.end())
-        return NULL;
+        return nullptr;
     return iter->second;
 }
 /**
@@ -1400,7 +1400,7 @@ XFCell* LwpTableLayout::GetCellsMap(sal_uInt16 nRow,sal_uInt8 nCol)
         rRowID = pRowLayout->GetNext();
         pRowLayout = dynamic_cast<LwpRowLayout *>(rRowID.obj().get());
     }
-    return NULL;
+    return nullptr;
 }
 
 //add end by
diff --git a/lotuswordpro/source/filter/lwptabrack.cxx b/lotuswordpro/source/filter/lwptabrack.cxx
index 5c3eb446cf24..f8317b66a08b 100644
--- a/lotuswordpro/source/filter/lwptabrack.cxx
+++ b/lotuswordpro/source/filter/lwptabrack.cxx
@@ -108,7 +108,7 @@ LwpTab* LwpTabRack::Lookup(sal_uInt16 nIndex)
     //return NULL;
     /* It's not in this tabrack, so get it out of our next. */
     if (!GetNext())
-        return NULL;        /* ouch */
+        return nullptr;        /* ouch */
 
     return GetNext()->Lookup(nIndex - m_nNumTabs);
 }
diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx
index 96951339a143..8a078a3b86cc 100644
--- a/lotuswordpro/source/filter/lwptblcell.hxx
+++ b/lotuswordpro/source/filter/lwptblcell.hxx
@@ -86,7 +86,7 @@ public:
     sal_uInt8 GetColumnID(){return cColumn;}
     LwpObjectID GetValueID(){return cValue;}
 
-    virtual void Convert(XFCell * pCell, LwpTableLayout* pCellsMap=NULL);
+    virtual void Convert(XFCell * pCell, LwpTableLayout* pCellsMap=nullptr);
 protected:
     virtual ~LwpCellList();
 
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index 6f84373923a5..0562eea68bc2 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -85,7 +85,7 @@ LwpFormulaInfo::~LwpFormulaInfo()
         {
             LwpFormulaArg* pArg=m_aStack.back();
             m_aStack.pop_back();
-            delete pArg; pArg=NULL;
+            delete pArg; pArg=nullptr;
         }
     }catch (...)
     {
@@ -438,7 +438,7 @@ LwpFormulaFunc::~LwpFormulaFunc()
         {
             LwpFormulaArg* pArg = m_aArgs.back();
             m_aArgs.pop_back();
-            delete pArg;pArg=NULL;
+            delete pArg;pArg=nullptr;
         }
     }catch (...) {
         assert(false);
diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx
index 40fe8b8f9476..b26dd41c522a 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -78,7 +78,7 @@
 LwpTocSuperLayout::LwpTocSuperLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
     : LwpSuperTableLayout(objHdr, pStrm)
     , m_nFrom(0)
-    , m_pCont(NULL)
+    , m_pCont(nullptr)
 {
 }
 
@@ -229,7 +229,7 @@ void  LwpTocSuperLayout::XFConvert(XFContentContainer* pCont)
 
             // one level may have several corresponding Styles
             pLevel = GetNextSearchLevelPtr(i, pLevel);  // find next LwpTocLevelData which is same index
-        }while (pLevel != NULL);
+        }while (pLevel != nullptr);
     }
 
     m_pCont = pCont;
@@ -252,7 +252,7 @@ void  LwpTocSuperLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 nSt
 {
     if(m_pFrame)
     {
-        XFFrame* pXFFrame = NULL;
+        XFFrame* pXFFrame = nullptr;
         if(nEnd < nStart)
         {
             pXFFrame = new XFFrame();
@@ -393,7 +393,7 @@ LwpTocLevelData * LwpTocSuperLayout::GetSearchLevelPtr(sal_uInt16 index)
         pObj = dynamic_cast<LwpTocLevelData *>(rID.obj().get());
     }
 
-    return NULL;
+    return nullptr;
 }
 /**
  * @short   Get next TOCLEVELDATA obj from current position
@@ -417,7 +417,7 @@ LwpTocLevelData * LwpTocSuperLayout::GetNextSearchLevelPtr(sal_uInt16 index, Lwp
         pObj = dynamic_cast<LwpTocLevelData *>(rID.obj().get());
     }
 
-    return NULL;
+    return nullptr;
 }
 
 LwpTocLevelData::LwpTocLevelData(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx
index 620290520fda..b57224c7ff17 100644
--- a/lotuswordpro/source/filter/lwptools.cxx
+++ b/lotuswordpro/source/filter/lwptools.cxx
@@ -251,9 +251,9 @@ XFDateStyle* LwpTools::GetSystemDateStyle(bool bLongFormat)
     int32_t nLength = 0;
     int32_t nLengthNeed;
     UErrorCode status = U_ZERO_ERROR;
-    UChar* pattern = NULL;
+    UChar* pattern = nullptr;
 
-    nLengthNeed = udat_toPattern(reinterpret_cast<void **>(fmt),sal_False,NULL,nLength,&status);
+    nLengthNeed = udat_toPattern(reinterpret_cast<void **>(fmt),sal_False,nullptr,nLength,&status);
     if (status == U_BUFFER_OVERFLOW_ERROR)
     {
         status = U_ZERO_ERROR;
@@ -261,8 +261,8 @@ XFDateStyle* LwpTools::GetSystemDateStyle(bool bLongFormat)
         pattern = static_cast<UChar*>(malloc(sizeof(UChar)*nLength));
         udat_toPattern(reinterpret_cast<void **>(fmt),sal_False,pattern,nLength,&status);
     }
-    if (pattern == NULL)
-        return NULL;
+    if (pattern == nullptr)
+        return nullptr;
     // 3 parse pattern string,per icu date/time format syntax, there are 20 letters reserved
     // as patter letter,each represent a element in date/time and its repeat numbers represent
     // different format: for exampel: M produces '1',MM produces '01', MMM produces 'Jan', MMMM produces 'Januaray'
@@ -597,7 +597,7 @@ XFDateStyle* LwpTools::GetSystemDateStyle(bool bLongFormat)
                 if ((cSymbol>='A' && cSymbol<='Z') || (cSymbol>='a' && cSymbol<='z') )
                 {
                     delete pDateStyle;
-                    return NULL;
+                    return nullptr;
                 }
                 else//TEXT
                 {
@@ -640,8 +640,8 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
     int32_t nLength = 0;
     int32_t nLengthNeed;
     UErrorCode status = U_ZERO_ERROR;
-    UChar* pattern = NULL;
-    nLengthNeed = udat_toPattern(reinterpret_cast<void **>(fmt),false,NULL,nLength,&status);
+    UChar* pattern = nullptr;
+    nLengthNeed = udat_toPattern(reinterpret_cast<void **>(fmt),false,nullptr,nLength,&status);
     if (status == U_BUFFER_OVERFLOW_ERROR)
     {
         status = U_ZERO_ERROR;
@@ -650,8 +650,8 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
         udat_toPattern(reinterpret_cast<void **>(fmt),false,pattern,nLength,&status);
     }
 
-    if (pattern == NULL)
-        return NULL;
+    if (pattern == nullptr)
+        return nullptr;
     // 3 parse pattern string,per icu date/time format syntax, there are 20 letters reserved
     // as patter letter,each represent a element in date/time and its repeat numbers represent
     // different format: for exampel: M produces '1',MM produces '01', MMM produces 'Jan', MMMM produces 'Januaray'
@@ -820,7 +820,7 @@ XFTimeStyle* LwpTools::GetSystemTimeStyle()
                 if ((cSymbol>='A' && cSymbol<='Z') || (cSymbol>='a' && cSymbol<='z') )
                 {
                     delete pTimeStyle;
-                    return NULL;
+                    return nullptr;
                 }
                 else//TEXT
                 {
diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx
index 25f9b07dc0b1..e829adde302d 100644
--- a/lotuswordpro/source/filter/tocread.cxx
+++ b/lotuswordpro/source/filter/tocread.cxx
@@ -209,7 +209,7 @@ CBenTOCReader::ReadTOC()
         BenObjectID ObjectID;
         if ((Err = GetDWord(&ObjectID)) != BenErr_OK)
             return Err;
-        pCBenObject pObject = NULL;
+        pCBenObject pObject = nullptr;
 
         // Read in all properties for object
         do
@@ -218,7 +218,7 @@ CBenTOCReader::ReadTOC()
 
             if ((Err = GetDWord(&PropertyID)) != BenErr_OK)
                 return Err;
-            pCBenProperty pProperty = NULL;
+            pCBenProperty pProperty = nullptr;
 
             // Read in all values for property
             do
@@ -249,7 +249,7 @@ CBenTOCReader::ReadTOC()
                 {
                     // Read property or type name
 
-                    if (pObject != NULL || TypeID != BEN_TYPEID_7_BIT_ASCII ||
+                    if (pObject != nullptr || TypeID != BEN_TYPEID_7_BIT_ASCII ||
                       LookAhead != BEN_OFFSET4_LEN4)
                         return BenErr_NamedObjectError;
 
@@ -277,7 +277,7 @@ CBenTOCReader::ReadTOC()
                     else
                     {
                         sBuffer = sStackBuffer;
-                        sAllocBuffer = NULL;
+                        sAllocBuffer = nullptr;
                     }
 
                     if ((Err = cpContainer->ReadKnownSize(sBuffer, Length)) !=
@@ -289,7 +289,7 @@ CBenTOCReader::ReadTOC()
 
                     pCUtListElmt pPrevNamedObjectListElmt;
                     if (FindNamedObject(&cpContainer->GetNamedObjects(),
-                      sBuffer, &pPrevNamedObjectListElmt) != NULL)
+                      sBuffer, &pPrevNamedObjectListElmt) != nullptr)
                     {
                         delete[] sAllocBuffer;
                         return BenErr_DuplicateName;
@@ -310,7 +310,7 @@ CBenTOCReader::ReadTOC()
                 {
                     // Don't need to read in references object--we assume
                     // that all references use object ID as key
-                    if ((Err = ReadSegments(NULL, &LookAhead)) != BenErr_OK)
+                    if ((Err = ReadSegments(nullptr, &LookAhead)) != BenErr_OK)
                         return Err;
                 }
                 else if (ObjectID == BEN_OBJID_TOC)
@@ -331,16 +331,16 @@ CBenTOCReader::ReadTOC()
                     else
                     {
                         // Ignore the other BEN_OBJID_TOC properties
-                        if ((Err = ReadSegments(NULL, &LookAhead)) != BenErr_OK)
+                        if ((Err = ReadSegments(nullptr, &LookAhead)) != BenErr_OK)
                             return Err;
                     }
                 }
                 else
                 {
-                    if (pProperty != NULL)
+                    if (pProperty != nullptr)
                         return BenErr_PropertyWithMoreThanOneValue;
 
-                    if (pObject == NULL)
+                    if (pObject == nullptr)
                         pObject = new CBenObject(cpContainer, ObjectID,
                           cpContainer->GetObjects().GetLast());
 
@@ -435,7 +435,7 @@ CBenTOCReader::ReadSegment(pCBenValue pValue, BenByte * pLookAhead)
     if (EightByteOffset)
         return BenErr_64BitOffsetNotSupported;
 
-    if (pValue != NULL)
+    if (pValue != nullptr)
     {
         if (! Immediate)
             new CBenValueSegment(pValue, Offset, Length);
diff --git a/lotuswordpro/source/filter/tocread.hxx b/lotuswordpro/source/filter/tocread.hxx
index 7888575fd672..524ece0c976e 100644
--- a/lotuswordpro/source/filter/tocread.hxx
+++ b/lotuswordpro/source/filter/tocread.hxx
@@ -63,7 +63,7 @@ class CBenTOCReader
 public: // Methods
     explicit CBenTOCReader(pLtcBenContainer pContainer)
         : cpContainer(pContainer)
-        , cpTOC(NULL)
+        , cpTOC(nullptr)
         , cBlockSize(0)
         , cCurr(0)
         , cTOCSize(0)
diff --git a/lotuswordpro/source/filter/utlist.cxx b/lotuswordpro/source/filter/utlist.cxx
index 9825cbf0baa9..a31fbede669a 100644
--- a/lotuswordpro/source/filter/utlist.cxx
+++ b/lotuswordpro/source/filter/utlist.cxx
@@ -59,10 +59,10 @@ namespace OpenStormBento
 {
 
 CUtListElmt::CUtListElmt(pCUtList pList)
-    : cpNext(NULL)
-    , cpPrev(NULL)
+    : cpNext(nullptr)
+    , cpPrev(nullptr)
 {
-    if (pList != NULL)
+    if (pList != nullptr)
         InsertAfter(pList->GetLast());
 }
 
@@ -96,11 +96,11 @@ CUtList::GetNextOrNULL(pCUtListElmt pCurr)
 {
     pCUtListElmt pNext;
 
-    if (pCurr == NULL)
+    if (pCurr == nullptr)
         pNext = GetFirst();
     else pNext = pCurr->GetNext();
     if (pNext == &GetTerminating())
-        pNext = NULL;
+        pNext = nullptr;
     return pNext;
 }
 
diff --git a/lotuswordpro/source/filter/utlist.hxx b/lotuswordpro/source/filter/utlist.hxx
index 40409c9b5c88..eeafdf2e835e 100644
--- a/lotuswordpro/source/filter/utlist.hxx
+++ b/lotuswordpro/source/filter/utlist.hxx
@@ -69,14 +69,14 @@ class CUtListElmt
 {
 public: // Methods
     CUtListElmt()
-        : cpNext(NULL)
-        , cpPrev(NULL)
+        : cpNext(nullptr)
+        , cpPrev(nullptr)
     {}
     explicit CUtListElmt(pCUtListElmt pPrev) { InsertAfter(pPrev); }
     explicit CUtListElmt(pCUtList pList);
     virtual ~CUtListElmt();
-    bool OnList() { return cpNext != NULL; }
-    void MakeNotOnList() { cpNext = NULL; } // Same as Remove but doesn't
+    bool OnList() { return cpNext != nullptr; }
+    void MakeNotOnList() { cpNext = nullptr; } // Same as Remove but doesn't
                                             // patch up list
     pCUtListElmt GetNext() const { return cpNext; }
     void SetNext(pCUtListElmt pNext) { cpNext = pNext; }
diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx
index a263a6355ce6..ddc77000b6d5 100644
--- a/lotuswordpro/source/filter/xfilter/xfcell.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx
@@ -64,8 +64,8 @@
 
 XFCell::XFCell()
 {
-    m_pSubTable = NULL;
-    m_pOwnerRow = NULL;
+    m_pSubTable = nullptr;
+    m_pOwnerRow = nullptr;
     m_nCol = 0;
     m_nColSpaned = 1;
     m_nRepeated = 0;
diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
index a6350e2f1f65..38e7a21c7739 100644
--- a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx
@@ -67,8 +67,8 @@ XFCellStyle::XFCellStyle()
     m_eHoriAlign = enumXFAlignNone;
     m_eVertAlign = enumXFAlignNone;
     m_fTextIndent = 0;
-    m_pBorders = NULL;
-    m_pBackImage = NULL;
+    m_pBorders = nullptr;
+    m_pBackImage = nullptr;
     m_bWrapText = false;
 }
 
diff --git a/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx b/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx
index dab6c9da91c7..87e146bd1107 100644
--- a/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx
@@ -60,9 +60,9 @@
 #include "xfconfigmanager.hxx"
 
 XFConfigManager::XFConfigManager()
-    : m_pLineNumberConfig(0)
-    , m_pFootnoteConfig(0)
-    , m_pEndnoteConfig(0)
+    : m_pLineNumberConfig(nullptr)
+    , m_pFootnoteConfig(nullptr)
+    , m_pEndnoteConfig(nullptr)
 
 {
 }
@@ -103,9 +103,9 @@ void    XFConfigManager::ToXml(IXFStream *pStrm)
 
     XFStyleContainer::ToXml(pStrm);
     XFStyleContainer::Reset();
-    m_pLineNumberConfig = NULL;
-    m_pFootnoteConfig = NULL;
-    m_pEndnoteConfig = NULL;
+    m_pLineNumberConfig = nullptr;
+    m_pFootnoteConfig = nullptr;
+    m_pEndnoteConfig = nullptr;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
index ece407e9f6a2..05a24f948f33 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
@@ -143,7 +143,7 @@ rtl::Reference<XFContent> XFContentContainer::GetLastContent()
         return m_aContents[index];
     }
 
-    return NULL;
+    return nullptr;
 }
 
 void XFContentContainer::RemoveLastContent()
diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
index 339625950e8e..20d067f5c2f7 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.hxx
@@ -132,7 +132,7 @@ private:
 inline rtl::Reference<XFContent> XFContentContainer::GetContent(sal_uInt32 index) const
 {
     if (index > m_aContents.size()-1)
-        return NULL;
+        return nullptr;
     return m_aContents[index];
 }
 #endif
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
index e7ffd4ca0176..e0e5ae130745 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx
@@ -68,10 +68,10 @@ XFDrawStyle::XFDrawStyle()
     m_eWrap = enumXFWrapNone;
     m_nWrapLines = 0;   //not limited.
 
-    m_pLineStyle = NULL;
-    m_pAreaStyle = NULL;
+    m_pLineStyle = nullptr;
+    m_pAreaStyle = nullptr;
 
-    m_pFontWorkStyle = NULL;
+    m_pFontWorkStyle = nullptr;
 
     m_fArrowStartSize = 0.3;
     m_fArrowEndSize = 0.3;
@@ -85,7 +85,7 @@ XFDrawStyle::~XFDrawStyle()
     if (m_pFontWorkStyle)
     {
         delete m_pFontWorkStyle;
-        m_pFontWorkStyle = NULL;
+        m_pFontWorkStyle = nullptr;
     }
 }
 
diff --git a/lotuswordpro/source/filter/xfilter/xffontfactory.cxx b/lotuswordpro/source/filter/xfilter/xffontfactory.cxx
index 7bdaf8f5ed0c..af9fd504e744 100644
--- a/lotuswordpro/source/filter/xfilter/xffontfactory.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffontfactory.cxx
@@ -87,6 +87,6 @@ rtl::Reference<XFFont> XFFontFactory::FindSameFont(rtl::Reference<XFFont> const
             return *it;
     }
 
-    return NULL;
+    return nullptr;
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
index b11ce54694e2..e5e2779ff7da 100644
--- a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx
@@ -67,10 +67,10 @@ XFFrameStyle::XFFrameStyle()
 {
     m_eWrap = enumXFWrapNone;
     m_nWrapLines = 0;   //not limited.
-    m_pBorders = NULL;
-    m_pColumns = NULL;
-    m_pShadow = NULL;
-    m_pBGImage = NULL;
+    m_pBorders = nullptr;
+    m_pColumns = nullptr;
+    m_pShadow = nullptr;
+    m_pBGImage = nullptr;
 
     m_bProtectContent = false;
     m_bProtectSize = false;
diff --git a/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx b/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
index d2521ab9bf39..4722ca168c43 100644
--- a/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfheaderstyle.cxx
@@ -66,9 +66,9 @@ XFHeaderStyle::XFHeaderStyle(bool isFooter)
     m_bDynamicSpace = true;
     m_fHeight = -1;
     m_fMinHeight = -1;
-    m_pBorders = NULL;
-    m_pShadow = NULL;
-    m_pBGImage = NULL;
+    m_pBorders = nullptr;
+    m_pShadow = nullptr;
+    m_pBGImage = nullptr;
 }
 
 XFHeaderStyle::~XFHeaderStyle()
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx
index a028aa919120..32c5fb7f30b5 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx
@@ -62,7 +62,7 @@
 
 XFIndex::XFIndex()
 {
-    m_pTitle = NULL;
+    m_pTitle = nullptr;
     m_eType = enumXFIndexTOC;
     m_bProtect = true;
     m_bSeparator = false;
diff --git a/lotuswordpro/source/filter/xfilter/xflist.cxx b/lotuswordpro/source/filter/xfilter/xflist.cxx
index a5b4722fb613..24980edafac5 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.cxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.cxx
@@ -66,7 +66,7 @@ XFList::XFList()
 {
     m_bOrdered = true;
     m_bContinueNumber = false;
-    m_pHeader = NULL;
+    m_pHeader = nullptr;
 }
 
 XFList::~XFList()
@@ -76,7 +76,7 @@ XFList::~XFList()
 void    XFList::ToXml(IXFStream *pStrm)
 {
     IXFAttrList *pAttrList = pStrm->GetAttrList();
-    assert(NULL!=pAttrList);
+    assert(nullptr!=pAttrList);
 
     pAttrList->Clear();
     if( !GetStyleName().isEmpty() )
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
index 4cfc34e523f7..7f7e868247f7 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
@@ -182,7 +182,7 @@ XFListStyle::XFListStyle(const XFListStyle& other):XFStyle(other)
             m_pListLevels[i] = new XFListLevelBullet(*pBullet);
         }
         else
-            m_pListLevels[i] = NULL;
+            m_pListLevels[i] = nullptr;
     }
 }
 
@@ -202,7 +202,7 @@ XFListStyle& XFListStyle::operator=(const XFListStyle& other)
             m_pListLevels[i] = new XFListLevelBullet(*pBullet);
         }
         else
-            m_pListLevels[i] = NULL;
+            m_pListLevels[i] = nullptr;
     }
     return *this;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
index 084f50e757cf..5fe16aa49556 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
@@ -65,8 +65,8 @@
 #include "../lwpglobalmgr.hxx"
 XFMasterPage::XFMasterPage()
 {
-    m_pHeader = NULL;
-    m_pFooter = NULL;
+    m_pHeader = nullptr;
+    m_pFooter = nullptr;
 }
 
 XFMasterPage::~XFMasterPage()
diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
index 15e2fa1e693c..e22d6f19fb23 100644
--- a/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.cxx
@@ -69,8 +69,8 @@
 #include "xfbgimage.hxx"
 
 XFPageMaster::XFPageMaster() : m_fPageWidth(0), m_fPageHeight(0), m_eUsage(enumXFPageUsageNone),
-m_eTextDir(enumXFTextDirNone), m_bPrintOrient(true), m_pBorders(NULL), m_pShadow(NULL),
-m_pColumns(NULL), m_pBGImage(NULL), m_pHeaderStyle(NULL), m_pFooterStyle(NULL),
+m_eTextDir(enumXFTextDirNone), m_bPrintOrient(true), m_pBorders(nullptr), m_pShadow(nullptr),
+m_pColumns(nullptr), m_pBGImage(nullptr), m_pHeaderStyle(nullptr), m_pFooterStyle(nullptr),
 m_eSepAlign(enumXFAlignNone), m_fSepWidth(0), m_aSepColor(0), m_fSepSpaceAbove(0),
 m_fSepSpaceBelow(0), m_nSepLengthPercent(0)
 {
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
index 78c80db96883..7eaa391813b6 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
@@ -71,8 +71,8 @@ XFParaStyle::XFParaStyle()
     , m_bJustSingleWord(false)
     , m_bKeepWithNext(false)
     , m_fTextIndent(0)
-    , m_pBorders(NULL)
-    , m_pBGImage(NULL)
+    , m_pBorders(nullptr)
+    , m_pBGImage(nullptr)
     , m_nPageNumber(0)
     , m_bNumberLines(true)
     , m_nLineNumberRestart(0)
@@ -108,12 +108,12 @@ XFParaStyle::XFParaStyle(const XFParaStyle& other)
     if( other.m_pBorders )
         m_pBorders = new XFBorders(*other.m_pBorders);
     else
-        m_pBorders = NULL;
+        m_pBorders = nullptr;
 
     if( other.m_pBGImage )
         m_pBGImage = new XFBGImage(*other.m_pBGImage);
     else
-        m_pBGImage = NULL;
+        m_pBGImage = nullptr;
 
     for (size_t i = 0; i < other.m_aTabs.GetCount(); ++i)
     {
@@ -155,12 +155,12 @@ XFParaStyle& XFParaStyle::operator=(const XFParaStyle& other)
         if( other.m_pBorders )
             m_pBorders = new XFBorders(*other.m_pBorders);
         else
-            m_pBorders = NULL;
+            m_pBorders = nullptr;
         m_aBackColor = other.m_aBackColor;
         if( other.m_pBGImage )
             m_pBGImage = new XFBGImage(*other.m_pBGImage);
         else
-            m_pBGImage = NULL;
+            m_pBGImage = nullptr;
 
         m_aShadow = other.m_aShadow;
         m_aMargin = other.m_aMargin;
diff --git a/lotuswordpro/source/filter/xfilter/xfrow.cxx b/lotuswordpro/source/filter/xfilter/xfrow.cxx
index 26c258174d50..4c2736b0ea9f 100644
--- a/lotuswordpro/source/filter/xfilter/xfrow.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfrow.cxx
@@ -67,7 +67,7 @@
 #include "xftable.hxx"
 
 XFRow::XFRow()
-    : m_pOwnerTable(NULL)
+    : m_pOwnerTable(nullptr)
     , m_nRepeat(0)
     , m_nRow(0)
 {
@@ -101,7 +101,7 @@ sal_Int32   XFRow::GetCellCount() const
 XFCell* XFRow::GetCell(sal_Int32 col) const
 {
     if( m_aCells.find(col) == m_aCells.end() )
-        return NULL;
+        return nullptr;
     else
         return m_aCells.find(col)->second;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
index a8acfbadc490..460ba39ef786 100644
--- a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx
@@ -64,7 +64,7 @@ XFRowStyle::XFRowStyle():m_fHeight(0)
 {
     m_fHeight = 0;
     m_fMinHeight = 0;
-    m_pBGImage = NULL;
+    m_pBGImage = nullptr;
 }
 
 enumXFStyle XFRowStyle::GetStyleFamily()
@@ -113,7 +113,7 @@ XFRowStyle& XFRowStyle::operator=(XFRowStyle const &other)
         if( other.m_pBGImage )
             m_pBGImage = new XFBGImage(*other.m_pBGImage);
         else
-            m_pBGImage = NULL;
+            m_pBGImage = nullptr;
     }
     return *this;
 }
diff --git a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
index cb9d5cf972f9..1db64ed1ae41 100644
--- a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx
@@ -64,8 +64,8 @@ XFSectionStyle::XFSectionStyle()
 {
     m_fMarginLeft = 0;
     m_fMarginRight = 0;
-    m_pBackImage = NULL;
-    m_pColumns = NULL;
+    m_pBackImage = nullptr;
+    m_pColumns = nullptr;
 }
 
 XFSectionStyle::~XFSectionStyle()
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
index 544402ac7c7e..7e4d60ceff07 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
@@ -108,7 +108,7 @@ IXFStyleRet XFStyleContainer::AddStyle(IXFStyle *pStyle)
 {
     IXFStyleRet aRet;
 
-    IXFStyle    *pConStyle = NULL;
+    IXFStyle    *pConStyle = nullptr;
     OUString   name;
 
     if( !pStyle )
@@ -162,7 +162,7 @@ IXFStyle*   XFStyleContainer::FindSameStyle(IXFStyle *pStyle)
             return pConStyle;
     }
 
-    return NULL;
+    return nullptr;
 }
 
 IXFStyle*   XFStyleContainer::FindStyle(const OUString& name)
@@ -176,7 +176,7 @@ IXFStyle*   XFStyleContainer::FindStyle(const OUString& name)
             return pConStyle;
     }
 
-    return NULL;
+    return nullptr;
 }
 
 const IXFStyle* XFStyleContainer::Item(size_t index) const
@@ -186,7 +186,7 @@ const IXFStyle* XFStyleContainer::Item(size_t index) const
     {
         return m_aStyles[index];
     }
-    return NULL;
+    return nullptr;
 }
 
 void    XFStyleContainer::ToXml(IXFStream *pStrm)
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
index 5757d233eaf8..de6b6f13ea16 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
@@ -70,7 +70,7 @@ struct IXFStyleRet
     IXFStyle* m_pStyle;
     bool m_bOrigDeleted;
     IXFStyleRet()
-        : m_pStyle(NULL)
+        : m_pStyle(nullptr)
         , m_bOrigDeleted(false)
     {
     }
diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
index 8704816b3fc3..6cd468b2cbcb 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
@@ -69,7 +69,7 @@ XFStyleManager::XFStyleManager() : s_aStdArrowStyles( "arrow" ), s_aTextStyles(
     s_aParaStyles( "P" ),s_aListStyles( "L" ),s_aSectionStyles( "Sect" ),
     s_aPageMasters( "PM" ),s_aMasterpages( "MP" ),s_aDateStyles( "N" ),
     s_aGraphicsStyles( "fr" ),s_aTableStyles( "table" ),s_aTableCellStyles( "cell" ),
-    s_aTableRowStyles( "row" ),s_aTableColStyles( "col" ),s_pOutlineStyle(NULL)
+    s_aTableRowStyles( "row" ),s_aTableColStyles( "col" ),s_pOutlineStyle(nullptr)
 {
 }
 
@@ -83,7 +83,7 @@ void    XFStyleManager::Reset()
     if( s_pOutlineStyle )
     {
         delete s_pOutlineStyle;
-        s_pOutlineStyle = NULL;
+        s_pOutlineStyle = nullptr;
     }
 
     s_aStdTextStyles.Reset();
@@ -276,7 +276,7 @@ IXFStyle*   XFStyleManager::FindStyle(const OUString& name)
     if( pStyle )
         return pStyle;
 
-    return NULL;
+    return nullptr;
 }
 
 XFParaStyle*    XFStyleManager::FindParaStyle(const OUString& name)
diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx
index 13d51934bd64..9a96db8d5077 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.cxx
@@ -67,7 +67,7 @@ XFTable::XFTable()
 {
     m_strName = XFGlobal::GenTableName();
     m_bSubTable = false;
-    m_pOwnerCell = NULL;
+    m_pOwnerCell = nullptr;
 }
 
 XFTable::~XFTable()
diff --git a/lotuswordpro/source/filter/xfilter/xftable.hxx b/lotuswordpro/source/filter/xfilter/xftable.hxx
index 42656c88f323..bdb0aacc1e15 100644
--- a/lotuswordpro/source/filter/xfilter/xftable.hxx
+++ b/lotuswordpro/source/filter/xfilter/xftable.hxx
@@ -125,7 +125,7 @@ inline void XFTable::SetTableName(const OUString& name)
 inline void XFTable::SetOwnerCell(XFCell *pCell)
 {
     m_pOwnerCell = pCell;
-    m_bSubTable = (pCell!=NULL);
+    m_bSubTable = (pCell!=nullptr);
 }
 
 inline bool XFTable::IsSubTable()
diff --git a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
index 0e055515c25e..ba6406d508cb 100644
--- a/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftablestyle.cxx
@@ -64,7 +64,7 @@ XFTableStyle::XFTableStyle()
 {
     m_fWidth = 2;
     m_eAlign = enumXFAlignStart;
-    m_pBGImage = NULL;
+    m_pBGImage = nullptr;
 }
 
 XFTableStyle::~XFTableStyle()
author	Stephan Bergmann <sbergman@redhat.com>	2015-11-10 10:19:46 +0100
committer	Stephan Bergmann <sbergman@redhat.com>	2015-11-10 10:31:31 +0100
commit	822a0b7046d8f0a8325ad158ea6756d33846c83e (patch)
tree	e1683caf123afd514361f85c389db52514d02890 /lotuswordpro
parent	53a2e93fc5a4872b36fb8e76ddd4b722a18cb49b (diff)