diff options
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/source/filter/lwpfootnote.cxx | |
parent | loplugin:nullptr (automatic rewrite) (diff) | |
download | core-822a0b7046d8f0a8325ad158ea6756d33846c83e.tar.gz core-822a0b7046d8f0a8325ad158ea6756d33846c83e.zip |
loplugin:nullptr (automatic rewrite)
Change-Id: Id11454397abad090741c5d98e2ae585531c886f6
Diffstat (limited to 'lotuswordpro/source/filter/lwpfootnote.cxx')
-rw-r--r-- | lotuswordpro/source/filter/lwpfootnote.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
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(); |