summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/xfa_document_layout_imp.cpp
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-06-23 12:40:16 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-23 12:40:16 -0700
commit85d1f2c2f9f1e746bedb1b6f03576613f54fbc27 (patch)
treeff5b393fb9b89f006327bee7bc8c955522defb67 /xfa/fxfa/parser/xfa_document_layout_imp.cpp
parent6e12478cb298c3a8277493ee79ae0b73d6df8554 (diff)
downloadpdfium-85d1f2c2f9f1e746bedb1b6f03576613f54fbc27.tar.xz
Remove NULL in xfa/
This CL converts all NULL's to nullptr. All instances of comparison to nullptr have been removed. Review-Url: https://codereview.chromium.org/2095653002
Diffstat (limited to 'xfa/fxfa/parser/xfa_document_layout_imp.cpp')
-rw-r--r--xfa/fxfa/parser/xfa_document_layout_imp.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/xfa/fxfa/parser/xfa_document_layout_imp.cpp b/xfa/fxfa/parser/xfa_document_layout_imp.cpp
index 723ae1db69..416982b749 100644
--- a/xfa/fxfa/parser/xfa_document_layout_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_layout_imp.cpp
@@ -31,8 +31,8 @@ CXFA_LayoutProcessor* CXFA_Document::GetDocLayout() {
}
CXFA_LayoutProcessor::CXFA_LayoutProcessor(CXFA_Document* pDocument)
: m_pDocument(pDocument),
- m_pRootItemLayoutProcessor(NULL),
- m_pLayoutPageMgr(NULL),
+ m_pRootItemLayoutProcessor(nullptr),
+ m_pLayoutPageMgr(nullptr),
m_nProgressCounter(0),
m_bNeeLayout(TRUE) {}
CXFA_LayoutProcessor::~CXFA_LayoutProcessor() {
@@ -110,7 +110,7 @@ int32_t CXFA_LayoutProcessor::DoLayout(IFX_Pause* pPause) {
FX_BOOL CXFA_LayoutProcessor::IncrementLayout() {
if (m_bNeeLayout) {
StartLayout(TRUE);
- return DoLayout(NULL) == 100;
+ return DoLayout(nullptr) == 100;
}
for (int32_t i = 0, c = m_rgChangedContainers.GetSize(); i < c; i++) {
CXFA_Node* pNode = m_rgChangedContainers[i];
@@ -131,7 +131,7 @@ int32_t CXFA_LayoutProcessor::CountPages() const {
return m_pLayoutPageMgr ? m_pLayoutPageMgr->GetPageCount() : 0;
}
CXFA_ContainerLayoutItem* CXFA_LayoutProcessor::GetPage(int32_t index) const {
- return m_pLayoutPageMgr ? m_pLayoutPageMgr->GetPage(index) : NULL;
+ return m_pLayoutPageMgr ? m_pLayoutPageMgr->GetPage(index) : nullptr;
}
CXFA_LayoutItem* CXFA_LayoutProcessor::GetLayoutItem(CXFA_Node* pFormItem) {
return static_cast<CXFA_LayoutItem*>(
@@ -143,7 +143,7 @@ void CXFA_LayoutProcessor::AddChangedContainer(CXFA_Node* pContainer) {
}
}
CXFA_ContainerLayoutItem* CXFA_LayoutProcessor::GetRootLayoutItem() const {
- return m_pLayoutPageMgr ? m_pLayoutPageMgr->GetRootLayoutItem() : NULL;
+ return m_pLayoutPageMgr ? m_pLayoutPageMgr->GetRootLayoutItem() : nullptr;
}
void CXFA_LayoutProcessor::ClearLayoutData() {
@@ -159,13 +159,13 @@ FX_BOOL CXFA_LayoutProcessor::IsNeedLayout() {
}
CXFA_LayoutItem::CXFA_LayoutItem(CXFA_Node* pNode, FX_BOOL bIsContentLayoutItem)
: m_pFormNode(pNode),
- m_pParent(NULL),
- m_pNextSibling(NULL),
- m_pFirstChild(NULL),
+ m_pParent(nullptr),
+ m_pNextSibling(nullptr),
+ m_pFirstChild(nullptr),
m_bIsContentLayoutItem(bIsContentLayoutItem) {}
CXFA_LayoutItem::~CXFA_LayoutItem() {}
CXFA_ContainerLayoutItem::CXFA_ContainerLayoutItem(CXFA_Node* pNode)
- : CXFA_LayoutItem(pNode, FALSE), m_pOldSubform(NULL) {}
+ : CXFA_LayoutItem(pNode, FALSE), m_pOldSubform(nullptr) {}
CXFA_LayoutProcessor* CXFA_ContainerLayoutItem::GetLayout() const {
return m_pFormNode->GetDocument()->GetLayoutProcessor();
}
@@ -195,11 +195,11 @@ CXFA_Node* CXFA_ContainerLayoutItem::GetMasterPage() const {
}
CXFA_ContentLayoutItem::CXFA_ContentLayoutItem(CXFA_Node* pNode)
: CXFA_LayoutItem(pNode, TRUE),
- m_pPrev(NULL),
- m_pNext(NULL),
+ m_pPrev(nullptr),
+ m_pNext(nullptr),
m_dwStatus(0) {}
CXFA_ContentLayoutItem::~CXFA_ContentLayoutItem() {
if (m_pFormNode->GetUserData(XFA_LAYOUTITEMKEY) == this) {
- m_pFormNode->SetUserData(XFA_LAYOUTITEMKEY, NULL);
+ m_pFormNode->SetUserData(XFA_LAYOUTITEMKEY, nullptr);
}
}