Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp

Issue 2031873003: Get rid of NULLs in xfa/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@nullptr_fpdfsdk
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/fxfa/parser/xfa_layout_pagemgr_new.h ('k') | xfa/fxfa/parser/xfa_locale.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp
diff --git a/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp b/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp
index 4b36bc8e4ca098406767ff4466e64788df6150e8..2d7bb30b067800ba3a4f6c8898952c668bc3ef6e 100644
--- a/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp
+++ b/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp
@@ -192,11 +192,10 @@ FX_BOOL CheckContentAreaNotUsed(
pLayoutItem;
pLayoutItem = (CXFA_ContainerLayoutItem*)pLayoutItem->m_pNextSibling) {
if (pLayoutItem->m_pFormNode == pContentArea) {
- if (pLayoutItem->m_pFirstChild == NULL) {
- pContentAreaLayoutItem = pLayoutItem;
- return TRUE;
- }
- return FALSE;
+ if (pLayoutItem->m_pFirstChild)
+ return FALSE;
+ pContentAreaLayoutItem = pLayoutItem;
+ return TRUE;
}
}
return TRUE;
@@ -234,7 +233,7 @@ CXFA_LayoutPageMgr::CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor)
CXFA_LayoutPageMgr::~CXFA_LayoutPageMgr() {
ClearData();
CXFA_LayoutItem* pLayoutItem = GetRootLayoutItem();
- CXFA_LayoutItem* pNextLayout = NULL;
+ CXFA_LayoutItem* pNextLayout = nullptr;
for (; pLayoutItem; pLayoutItem = pNextLayout) {
pNextLayout = pLayoutItem->m_pNextSibling;
XFA_ReleaseLayoutItem(pLayoutItem);
@@ -249,9 +248,9 @@ FX_BOOL CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) {
m_pTemplatePageSetRoot = pTemplateNode->GetProperty(0, XFA_ELEMENT_PageSet);
ASSERT(m_pTemplatePageSetRoot);
if (m_pPageSetLayoutItemRoot) {
- m_pPageSetLayoutItemRoot->m_pParent = NULL;
- m_pPageSetLayoutItemRoot->m_pFirstChild = NULL;
- m_pPageSetLayoutItemRoot->m_pNextSibling = NULL;
+ m_pPageSetLayoutItemRoot->m_pParent = nullptr;
+ m_pPageSetLayoutItemRoot->m_pFirstChild = nullptr;
+ m_pPageSetLayoutItemRoot->m_pNextSibling = nullptr;
m_pPageSetLayoutItemRoot->m_pFormNode = m_pTemplatePageSetRoot;
} else {
m_pPageSetLayoutItemRoot =
@@ -266,7 +265,7 @@ FX_BOOL CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) {
m_ePageSetMode = eRelation;
}
InitPageSetMap();
- CXFA_Node* pPageArea = NULL;
+ CXFA_Node* pPageArea = nullptr;
int32_t iCount = 0;
for (pPageArea = m_pTemplatePageSetRoot->GetNodeItem(XFA_NODEITEM_FirstChild);
pPageArea;
@@ -290,7 +289,7 @@ FX_BOOL CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) {
if (!pPageArea) {
return FALSE;
}
- m_pTemplatePageSetRoot->InsertChild(pPageArea, NULL);
+ m_pTemplatePageSetRoot->InsertChild(pPageArea, nullptr);
pPageArea->SetFlag(XFA_NODEFLAG_Initialized, true);
}
CXFA_Node* pContentArea = pPageArea->GetChild(0, XFA_ELEMENT_ContentArea);
@@ -300,7 +299,7 @@ FX_BOOL CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) {
if (!pContentArea) {
return FALSE;
}
- pPageArea->InsertChild(pContentArea, NULL);
+ pPageArea->InsertChild(pContentArea, nullptr);
pContentArea->SetFlag(XFA_NODEFLAG_Initialized, true);
pContentArea->SetMeasure(XFA_ATTRIBUTE_X,
CXFA_Measurement(0.25f, XFA_UNIT_In));
@@ -318,7 +317,7 @@ FX_BOOL CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) {
if (!pContentArea) {
return FALSE;
}
- pPageArea->InsertChild(pMedium, NULL);
+ pPageArea->InsertChild(pMedium, nullptr);
pMedium->SetFlag(XFA_NODEFLAG_Initialized, true);
pMedium->SetMeasure(XFA_ATTRIBUTE_Short,
CXFA_Measurement(8.5f, XFA_UNIT_In));
@@ -329,7 +328,7 @@ FX_BOOL CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) {
}
FX_BOOL CXFA_LayoutPageMgr::PrepareFirstPage(CXFA_Node* pRootSubform) {
FX_BOOL bProBreakBefore = FALSE;
- CXFA_Node* pBreakBeforeNode = NULL;
+ CXFA_Node* pBreakBeforeNode = nullptr;
while (pRootSubform) {
for (CXFA_Node* pBreakNode =
pRootSubform->GetNodeItem(XFA_NODEITEM_FirstChild);
@@ -368,13 +367,12 @@ FX_BOOL CXFA_LayoutPageMgr::AppendNewPage(FX_BOOL bFirstTemPage) {
m_rgProposedContainerRecord.GetTailPosition()) {
return TRUE;
}
- CXFA_Node* pPageNode = GetNextAvailPageArea(NULL);
+ CXFA_Node* pPageNode = GetNextAvailPageArea(nullptr);
if (!pPageNode) {
return FALSE;
}
- if (bFirstTemPage && m_pCurrentContainerRecord == NULL) {
+ if (bFirstTemPage && !m_pCurrentContainerRecord)
m_pCurrentContainerRecord = m_rgProposedContainerRecord.GetHeadPosition();
- }
return !bFirstTemPage || m_pCurrentContainerRecord;
}
@@ -463,7 +461,7 @@ CXFA_ContainerRecord* CXFA_LayoutPageMgr::CreateContainerRecord(
FX_BOOL bCreateNew) {
CXFA_ContainerRecord* pNewRecord = new CXFA_ContainerRecord();
if (m_pCurrentContainerRecord) {
- if (!IsPageSetRootOrderedOccurrence() || pPageNode == NULL) {
+ if (!IsPageSetRootOrderedOccurrence() || !pPageNode) {
*pNewRecord = *GetCurrentContainerRecord();
m_rgProposedContainerRecord.AddTail(pNewRecord);
return pNewRecord;
@@ -475,13 +473,12 @@ CXFA_ContainerRecord* CXFA_LayoutPageMgr::CreateContainerRecord(
} else {
CXFA_ContainerLayoutItem* pParentLayoutItem =
(CXFA_ContainerLayoutItem*)pPageSet->GetUserData(XFA_LAYOUTITEMKEY);
- if (pParentLayoutItem == NULL) {
+ if (!pParentLayoutItem)
pParentLayoutItem = m_pPageSetCurRoot;
- }
pNewRecord->pCurPageSet = pParentLayoutItem;
}
} else {
- CXFA_ContainerLayoutItem* pParentPageSetLayout = NULL;
+ CXFA_ContainerLayoutItem* pParentPageSetLayout = nullptr;
if (pPageSet == GetCurrentContainerRecord()->pCurPageSet->m_pFormNode) {
pParentPageSetLayout =
(CXFA_ContainerLayoutItem*)GetCurrentContainerRecord()
@@ -495,15 +492,15 @@ CXFA_ContainerRecord* CXFA_LayoutPageMgr::CreateContainerRecord(
CXFA_ContainerLayoutItem* pPageSetLayoutItem =
new CXFA_ContainerLayoutItem(pPageSet);
pPageSet->SetUserData(XFA_LAYOUTITEMKEY, (void*)pPageSetLayoutItem);
- if (pParentPageSetLayout == NULL) {
+ if (pParentPageSetLayout) {
+ pParentPageSetLayout->AddChild(pPageSetLayoutItem);
+ } else {
CXFA_ContainerLayoutItem* pPrePageSet = m_pPageSetLayoutItemRoot;
while (pPrePageSet->m_pNextSibling) {
pPrePageSet = (CXFA_ContainerLayoutItem*)pPrePageSet->m_pNextSibling;
}
pPrePageSet->m_pNextSibling = pPageSetLayoutItem;
m_pPageSetCurRoot = pPageSetLayoutItem;
- } else {
- pParentPageSetLayout->AddChild(pPageSetLayoutItem);
}
pNewRecord->pCurPageSet = pPageSetLayoutItem;
}
@@ -528,7 +525,7 @@ CXFA_ContainerRecord* CXFA_LayoutPageMgr::CreateContainerRecord(
}
void CXFA_LayoutPageMgr::AddPageAreaLayoutItem(CXFA_ContainerRecord* pNewRecord,
CXFA_Node* pNewPageArea) {
- CXFA_ContainerLayoutItem* pNewPageAreaLayoutItem = NULL;
+ CXFA_ContainerLayoutItem* pNewPageAreaLayoutItem = nullptr;
if (m_PageArray.GetSize() > m_nAvailPages) {
CXFA_ContainerLayoutItem* pContainerItem = m_PageArray[m_nAvailPages];
pContainerItem->m_pFormNode = pNewPageArea;
@@ -546,13 +543,13 @@ void CXFA_LayoutPageMgr::AddPageAreaLayoutItem(CXFA_ContainerRecord* pNewRecord,
}
pNewRecord->pCurPageSet->AddChild(pNewPageAreaLayoutItem);
pNewRecord->pCurPageArea = pNewPageAreaLayoutItem;
- pNewRecord->pCurContentArea = NULL;
+ pNewRecord->pCurContentArea = nullptr;
}
void CXFA_LayoutPageMgr::AddContentAreaLayoutItem(
CXFA_ContainerRecord* pNewRecord,
CXFA_Node* pContentArea) {
- if (pContentArea == NULL) {
- pNewRecord->pCurContentArea = NULL;
+ if (!pContentArea) {
+ pNewRecord->pCurContentArea = nullptr;
return;
}
CXFA_ContainerLayoutItem* pNewContentAreaLayoutItem =
@@ -579,7 +576,7 @@ void CXFA_LayoutPageMgr::FinishPaginatedPageSets() {
default: { ProcessLastPageSet(); } break;
case XFA_ATTRIBUTEENUM_SimplexPaginated:
case XFA_ATTRIBUTEENUM_DuplexPaginated: {
- CXFA_LayoutItem* pLastPageAreaLayoutItem = NULL;
+ CXFA_LayoutItem* pLastPageAreaLayoutItem = nullptr;
int32_t nPageAreaCount = 0;
for (CXFA_LayoutItem* pPageAreaLayoutItem =
pPageSetLayoutItem->m_pFirstChild;
@@ -596,13 +593,13 @@ void CXFA_LayoutPageMgr::FinishPaginatedPageSets() {
break;
}
if (!FindPageAreaFromPageSet_SimplexDuplex(
- pPageSetLayoutItem->m_pFormNode, NULL, NULL, NULL, TRUE, TRUE,
- nPageAreaCount == 1 ? XFA_ATTRIBUTEENUM_Only
- : XFA_ATTRIBUTEENUM_Last) &&
+ pPageSetLayoutItem->m_pFormNode, nullptr, nullptr, nullptr,
+ TRUE, TRUE, nPageAreaCount == 1 ? XFA_ATTRIBUTEENUM_Only
+ : XFA_ATTRIBUTEENUM_Last) &&
(nPageAreaCount == 1 &&
!FindPageAreaFromPageSet_SimplexDuplex(
- pPageSetLayoutItem->m_pFormNode, NULL, NULL, NULL, TRUE,
- TRUE, XFA_ATTRIBUTEENUM_Last))) {
+ pPageSetLayoutItem->m_pFormNode, nullptr, nullptr, nullptr,
+ TRUE, TRUE, XFA_ATTRIBUTEENUM_Last))) {
break;
}
CXFA_Node* pNode = m_pCurPageArea;
@@ -716,39 +713,39 @@ FX_BOOL CXFA_LayoutPageMgr::RunBreak(XFA_ELEMENT eBreakType,
switch (eTargetType) {
case XFA_ATTRIBUTEENUM_ContentArea:
if (pTarget && pTarget->GetClassID() != XFA_ELEMENT_ContentArea) {
- pTarget = NULL;
+ pTarget = nullptr;
}
if (!pTarget || !m_pCurrentContainerRecord ||
pTarget !=
GetCurrentContainerRecord()->pCurContentArea->m_pFormNode ||
bStartNew) {
- CXFA_Node* pPageArea = NULL;
+ CXFA_Node* pPageArea = nullptr;
if (pTarget) {
pPageArea = pTarget->GetNodeItem(XFA_NODEITEM_Parent);
}
pPageArea = GetNextAvailPageArea(pPageArea, pTarget);
- bRet = pPageArea != NULL;
+ bRet = !!pPageArea;
}
break;
case XFA_ATTRIBUTEENUM_PageArea:
if (pTarget && pTarget->GetClassID() != XFA_ELEMENT_PageArea) {
- pTarget = NULL;
+ pTarget = nullptr;
}
if (!pTarget || !m_pCurrentContainerRecord ||
pTarget != GetCurrentContainerRecord()->pCurPageArea->m_pFormNode ||
bStartNew) {
- CXFA_Node* pPageArea = GetNextAvailPageArea(pTarget, NULL, TRUE);
- bRet = pPageArea != NULL;
+ CXFA_Node* pPageArea = GetNextAvailPageArea(pTarget, nullptr, TRUE);
+ bRet = !!pPageArea;
}
break;
case XFA_ATTRIBUTEENUM_PageOdd:
if (pTarget && pTarget->GetClassID() != XFA_ELEMENT_PageArea) {
- pTarget = NULL;
+ pTarget = nullptr;
}
break;
case XFA_ATTRIBUTEENUM_PageEven:
if (pTarget && pTarget->GetClassID() != XFA_ELEMENT_PageArea) {
- pTarget = NULL;
+ pTarget = nullptr;
}
break;
case XFA_ATTRIBUTEENUM_Auto:
@@ -833,14 +830,14 @@ FX_BOOL CXFA_LayoutPageMgr::ProcessBreakBeforeOrAfter(
CXFA_Node*& pBreakLeaderNode,
CXFA_Node*& pBreakTrailerNode,
FX_BOOL& bCreatePage) {
- CXFA_Node *pLeaderTemplate = NULL, *pTrailerTemplate = NULL;
+ CXFA_Node *pLeaderTemplate = nullptr, *pTrailerTemplate = nullptr;
CXFA_Node* pFormNode = pBreakNode->GetNodeItem(XFA_NODEITEM_Parent,
XFA_OBJECTTYPE_ContainerNode);
if (XFA_ItemLayoutProcessor_IsTakingSpace(pFormNode)) {
bCreatePage = ExecuteBreakBeforeOrAfter(pBreakNode, bBefore,
pLeaderTemplate, pTrailerTemplate);
CXFA_Document* pDocument = pBreakNode->GetDocument();
- CXFA_Node* pDataScope = NULL;
+ CXFA_Node* pDataScope = nullptr;
pFormNode = pFormNode->GetNodeItem(XFA_NODEITEM_Parent,
XFA_OBJECTTYPE_ContainerNode);
if (pLeaderTemplate) {
@@ -869,12 +866,12 @@ FX_BOOL CXFA_LayoutPageMgr::ProcessBookendLeaderOrTrailer(
CXFA_Node* pBookendNode,
FX_BOOL bLeader,
CXFA_Node*& pBookendAppendNode) {
- CXFA_Node* pLeaderTemplate = NULL;
+ CXFA_Node* pLeaderTemplate = nullptr;
CXFA_Node* pFormNode = pBookendNode->GetNodeItem(
XFA_NODEITEM_Parent, XFA_OBJECTTYPE_ContainerNode);
if (ResolveBookendLeaderOrTrailer(pBookendNode, bLeader, pLeaderTemplate)) {
CXFA_Document* pDocument = pBookendNode->GetDocument();
- CXFA_Node* pDataScope = NULL;
+ CXFA_Node* pDataScope = nullptr;
if (pLeaderTemplate) {
if (!pDataScope) {
pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
@@ -933,7 +930,7 @@ CXFA_Node* CXFA_LayoutPageMgr::BreakOverflow(CXFA_Node* pOverflowNode,
}
return pOverflowNode;
}
- return NULL;
+ return nullptr;
} else if (pOverflowNode->GetClassID() == XFA_ELEMENT_Overflow) {
CFX_WideStringC wsOverflowLeader;
CFX_WideStringC wsOverflowTrailer;
@@ -975,10 +972,10 @@ FX_BOOL CXFA_LayoutPageMgr::ProcessOverflow(CXFA_Node* pFormNode,
CXFA_Node*& pTrailerNode,
FX_BOOL bDataMerge,
FX_BOOL bCreatePage) {
- if (pFormNode == NULL) {
+ if (!pFormNode)
return FALSE;
- }
- CXFA_Node *pLeaderTemplate = NULL, *pTrailerTemplate = NULL;
+
+ CXFA_Node *pLeaderTemplate = nullptr, *pTrailerTemplate = nullptr;
FX_BOOL bIsOverflowNode = FALSE;
if (pFormNode->GetClassID() == XFA_ELEMENT_Overflow ||
pFormNode->GetClassID() == XFA_ELEMENT_Break) {
@@ -994,7 +991,7 @@ FX_BOOL CXFA_LayoutPageMgr::ProcessOverflow(CXFA_Node* pFormNode,
pFormNode = pCurNode->GetNodeItem(XFA_NODEITEM_Parent);
}
CXFA_Document* pDocument = pCurNode->GetDocument();
- CXFA_Node* pDataScope = NULL;
+ CXFA_Node* pDataScope = nullptr;
if (pLeaderTemplate) {
if (!pDataScope) {
pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
@@ -1057,9 +1054,9 @@ FX_BOOL CXFA_LayoutPageMgr::FindPageAreaFromPageSet(
CXFA_Node* pTargetContentArea,
FX_BOOL bNewPage,
FX_BOOL bQuery) {
- if (pPageSet == NULL && pStartChild == NULL) {
+ if (!pPageSet && !pStartChild)
return FALSE;
- }
+
if (IsPageSetRootOrderedOccurrence()) {
return FindPageAreaFromPageSet_Ordered(pPageSet, pStartChild,
pTargetPageArea, pTargetContentArea,
@@ -1098,20 +1095,19 @@ FX_BOOL CXFA_LayoutPageMgr::FindPageAreaFromPageSet_Ordered(
for (; pCurrentNode;
pCurrentNode = pCurrentNode->GetNodeItem(XFA_NODEITEM_NextSibling)) {
if (pCurrentNode->GetClassID() == XFA_ELEMENT_PageArea) {
- if ((pTargetPageArea == pCurrentNode || pTargetPageArea == NULL)) {
- if (pCurrentNode->GetFirstChildByClass(XFA_ELEMENT_ContentArea) ==
- NULL) {
+ if ((pTargetPageArea == pCurrentNode || !pTargetPageArea)) {
+ if (!pCurrentNode->GetFirstChildByClass(XFA_ELEMENT_ContentArea)) {
if (pTargetPageArea == pCurrentNode) {
CreateMinPageRecord(pCurrentNode, TRUE);
- pTargetPageArea = NULL;
+ pTargetPageArea = nullptr;
}
continue;
}
if (!bQuery) {
CXFA_ContainerRecord* pNewRecord =
- CreateContainerRecord(pCurrentNode, pStartChild == NULL);
+ CreateContainerRecord(pCurrentNode, !pStartChild);
AddPageAreaLayoutItem(pNewRecord, pCurrentNode);
- if (pTargetContentArea == NULL) {
+ if (!pTargetContentArea) {
pTargetContentArea =
pCurrentNode->GetFirstChildByClass(XFA_ELEMENT_ContentArea);
}
@@ -1126,9 +1122,9 @@ FX_BOOL CXFA_LayoutPageMgr::FindPageAreaFromPageSet_Ordered(
CreateMinPageRecord(pCurrentNode, FALSE);
}
} else if (pCurrentNode->GetClassID() == XFA_ELEMENT_PageSet) {
- if (FindPageAreaFromPageSet_Ordered(pCurrentNode, NULL, pTargetPageArea,
- pTargetContentArea, bNewPage,
- bQuery)) {
+ if (FindPageAreaFromPageSet_Ordered(pCurrentNode, nullptr,
+ pTargetPageArea, pTargetContentArea,
+ bNewPage, bQuery)) {
bRes = TRUE;
break;
}
@@ -1151,8 +1147,8 @@ FX_BOOL CXFA_LayoutPageMgr::FindPageAreaFromPageSet_SimplexDuplex(
FX_BOOL bQuery,
XFA_ATTRIBUTEENUM ePreferredPosition) {
const XFA_ATTRIBUTEENUM eFallbackPosition = XFA_ATTRIBUTEENUM_Any;
- CXFA_Node *pPreferredPageArea = NULL, *pFallbackPageArea = NULL;
- CXFA_Node* pCurrentNode = NULL;
+ CXFA_Node *pPreferredPageArea = nullptr, *pFallbackPageArea = nullptr;
+ CXFA_Node* pCurrentNode = nullptr;
if (!pStartChild || pStartChild->GetClassID() == XFA_ELEMENT_PageArea) {
pCurrentNode = pPageSet->GetNodeItem(XFA_NODEITEM_FirstChild);
} else {
@@ -1194,13 +1190,13 @@ FX_BOOL CXFA_LayoutPageMgr::FindPageAreaFromPageSet_SimplexDuplex(
}
return FALSE;
}
- if ((pTargetPageArea == pCurrentNode || pTargetPageArea == NULL)) {
+ if ((pTargetPageArea == pCurrentNode || !pTargetPageArea)) {
if (pCurrentNode->GetFirstChildByClass(XFA_ELEMENT_ContentArea) ==
- NULL) {
+ nullptr) {
if (pTargetPageArea == pCurrentNode) {
CXFA_ContainerRecord* pNewRecord = CreateContainerRecord();
AddPageAreaLayoutItem(pNewRecord, pCurrentNode);
- pTargetPageArea = NULL;
+ pTargetPageArea = nullptr;
}
continue;
}
@@ -1222,13 +1218,13 @@ FX_BOOL CXFA_LayoutPageMgr::FindPageAreaFromPageSet_SimplexDuplex(
}
} else if (pCurrentNode->GetClassID() == XFA_ELEMENT_PageSet) {
if (FindPageAreaFromPageSet_SimplexDuplex(
- pCurrentNode, NULL, pTargetPageArea, pTargetContentArea, bNewPage,
- bQuery, ePreferredPosition)) {
+ pCurrentNode, nullptr, pTargetPageArea, pTargetContentArea,
+ bNewPage, bQuery, ePreferredPosition)) {
break;
}
}
}
- CXFA_Node* pCurPageArea = NULL;
+ CXFA_Node* pCurPageArea = nullptr;
if (pPreferredPageArea) {
pCurPageArea = pPreferredPageArea;
} else if (pFallbackPageArea) {
@@ -1240,7 +1236,7 @@ FX_BOOL CXFA_LayoutPageMgr::FindPageAreaFromPageSet_SimplexDuplex(
if (!bQuery) {
CXFA_ContainerRecord* pNewRecord = CreateContainerRecord();
AddPageAreaLayoutItem(pNewRecord, pCurPageArea);
- if (pTargetContentArea == NULL) {
+ if (!pTargetContentArea) {
pTargetContentArea =
pCurPageArea->GetFirstChildByClass(XFA_ELEMENT_ContentArea);
}
@@ -1272,13 +1268,13 @@ CXFA_Node* CXFA_LayoutPageMgr::GetNextAvailPageArea(
CXFA_Node* pTargetContentArea,
FX_BOOL bNewPage,
FX_BOOL bQuery) {
- if (m_pCurPageArea == NULL) {
- FindPageAreaFromPageSet(m_pTemplatePageSetRoot, NULL, pTargetPageArea,
+ if (!m_pCurPageArea) {
+ FindPageAreaFromPageSet(m_pTemplatePageSetRoot, nullptr, pTargetPageArea,
pTargetContentArea, bNewPage, bQuery);
ASSERT(m_pCurPageArea);
return m_pCurPageArea;
}
- if (pTargetPageArea == NULL || pTargetPageArea == m_pCurPageArea) {
+ if (!pTargetPageArea || pTargetPageArea == m_pCurPageArea) {
if (!bNewPage && GetNextContentArea(pTargetContentArea)) {
return m_pCurPageArea;
}
@@ -1294,7 +1290,7 @@ CXFA_Node* CXFA_LayoutPageMgr::GetNextAvailPageArea(
CXFA_ContainerRecord* pNewRecord =
CreateContainerRecord(m_pCurPageArea);
AddPageAreaLayoutItem(pNewRecord, m_pCurPageArea);
- if (pTargetContentArea == NULL) {
+ if (!pTargetContentArea) {
pTargetContentArea =
m_pCurPageArea->GetFirstChildByClass(XFA_ELEMENT_ContentArea);
}
@@ -1315,14 +1311,14 @@ CXFA_Node* CXFA_LayoutPageMgr::GetNextAvailPageArea(
}
CXFA_Node* pPageSet = m_pCurPageArea->GetNodeItem(XFA_NODEITEM_Parent);
while (TRUE) {
- if (FindPageAreaFromPageSet(pPageSet, NULL, pTargetPageArea,
+ if (FindPageAreaFromPageSet(pPageSet, nullptr, pTargetPageArea,
pTargetContentArea, bNewPage, bQuery)) {
return m_pCurPageArea;
}
if (!bQuery && IsPageSetRootOrderedOccurrence()) {
CreateMinPageSetRecord(pPageSet);
}
- if (FindPageAreaFromPageSet(NULL, pPageSet, pTargetPageArea,
+ if (FindPageAreaFromPageSet(nullptr, pPageSet, pTargetPageArea,
pTargetContentArea, bNewPage, bQuery)) {
return m_pCurPageArea;
}
@@ -1331,23 +1327,22 @@ CXFA_Node* CXFA_LayoutPageMgr::GetNextAvailPageArea(
}
pPageSet = pPageSet->GetNodeItem(XFA_NODEITEM_Parent);
}
- return NULL;
+ return nullptr;
}
FX_BOOL CXFA_LayoutPageMgr::GetNextContentArea(CXFA_Node* pContentArea) {
CXFA_Node* pCurContentNode =
GetCurrentContainerRecord()->pCurContentArea->m_pFormNode;
- if (pContentArea == NULL) {
+ if (!pContentArea) {
pContentArea =
pCurContentNode->GetNextSameClassSibling(XFA_ELEMENT_ContentArea);
- if (pContentArea == NULL) {
+ if (!pContentArea)
return FALSE;
- }
} else {
if (pContentArea->GetNodeItem(XFA_NODEITEM_Parent) != m_pCurPageArea) {
return FALSE;
}
- CXFA_ContainerLayoutItem* pContentAreaLayout = NULL;
+ CXFA_ContainerLayoutItem* pContentAreaLayout = nullptr;
if (!CheckContentAreaNotUsed(GetCurrentContainerRecord()->pCurPageArea,
pContentArea, pContentAreaLayout)) {
return FALSE;
@@ -1385,9 +1380,9 @@ void CXFA_LayoutPageMgr::InitPageSetMap() {
int32_t CXFA_LayoutPageMgr::CreateMinPageRecord(CXFA_Node* pPageArea,
FX_BOOL bTargetPageArea,
FX_BOOL bCreateLast) {
- if (pPageArea == NULL) {
+ if (!pPageArea)
return 0;
- }
+
CXFA_Node* pOccurNode = pPageArea->GetFirstChildByClass(XFA_ELEMENT_Occur);
int32_t iMin = 0;
if ((pOccurNode && pOccurNode->TryInteger(XFA_ATTRIBUTE_Min, iMin, FALSE)) ||
@@ -1411,9 +1406,9 @@ int32_t CXFA_LayoutPageMgr::CreateMinPageRecord(CXFA_Node* pPageArea,
}
void CXFA_LayoutPageMgr::CreateMinPageSetRecord(CXFA_Node* pPageSet,
FX_BOOL bCreateAll) {
- if (pPageSet == NULL) {
+ if (!pPageSet)
return;
- }
+
int32_t iCurSetCount = 0;
if (!m_pPageSetMap.Lookup(pPageSet, iCurSetCount)) {
return;
@@ -1442,9 +1437,9 @@ void CXFA_LayoutPageMgr::CreateMinPageSetRecord(CXFA_Node* pPageSet,
}
}
void CXFA_LayoutPageMgr::CreateNextMinRecord(CXFA_Node* pRecordNode) {
- if (pRecordNode == NULL) {
+ if (!pRecordNode)
return;
- }
+
for (CXFA_Node* pCurrentNode =
pRecordNode->GetNodeItem(XFA_NODEITEM_NextSibling);
pCurrentNode;
@@ -1472,9 +1467,9 @@ void CXFA_LayoutPageMgr::ProcessLastPageSet() {
FX_BOOL CXFA_LayoutPageMgr::GetNextAvailContentHeight(FX_FLOAT fChildHeight) {
CXFA_Node* pCurContentNode =
GetCurrentContainerRecord()->pCurContentArea->m_pFormNode;
- if (pCurContentNode == NULL) {
+ if (!pCurContentNode)
return FALSE;
- }
+
pCurContentNode =
pCurContentNode->GetNextSameClassSibling(XFA_ELEMENT_ContentArea);
if (pCurContentNode) {
@@ -1490,7 +1485,8 @@ FX_BOOL CXFA_LayoutPageMgr::GetNextAvailContentHeight(FX_FLOAT fChildHeight) {
CXFA_Node* pSrcPage = m_pCurPageArea;
int32_t nSrcPageCount = m_nCurPageCount;
FX_POSITION psSrcRecord = m_rgProposedContainerRecord.GetTailPosition();
- CXFA_Node* pNextPage = GetNextAvailPageArea(NULL, NULL, FALSE, TRUE);
+ CXFA_Node* pNextPage =
+ GetNextAvailPageArea(nullptr, nullptr, FALSE, TRUE);
m_pCurPageArea = pSrcPage;
m_nCurPageCount = nSrcPageCount;
CXFA_ContainerRecord* pPrevRecord =
@@ -1548,8 +1544,8 @@ void CXFA_LayoutPageMgr::ClearRecordList() {
}
m_rgProposedContainerRecord.RemoveAll();
}
- m_pCurrentContainerRecord = NULL;
- m_pCurPageArea = NULL;
+ m_pCurrentContainerRecord = nullptr;
+ m_pCurPageArea = nullptr;
m_nCurPageCount = 0;
m_bCreateOverFlowPage = FALSE;
m_pPageSetMap.RemoveAll();
@@ -1592,9 +1588,9 @@ void CXFA_LayoutPageMgr::SaveLayoutItem(CXFA_LayoutItem* pParentLayoutItem) {
if (pCurLayoutItem->m_pFirstChild) {
SaveLayoutItem(pCurLayoutItem);
}
- pCurLayoutItem->m_pParent = NULL;
- pCurLayoutItem->m_pNextSibling = NULL;
- pCurLayoutItem->m_pFirstChild = NULL;
+ pCurLayoutItem->m_pParent = nullptr;
+ pCurLayoutItem->m_pNextSibling = nullptr;
+ pCurLayoutItem->m_pFirstChild = nullptr;
if (!pCurLayoutItem->IsContentLayoutItem() &&
pCurLayoutItem->m_pFormNode->GetClassID() != XFA_ELEMENT_PageArea) {
delete pCurLayoutItem;
@@ -1618,12 +1614,12 @@ CXFA_Node* CXFA_LayoutPageMgr::QueryOverflow(
!wsOverflowTarget.IsEmpty()) {
return pCurNode;
}
- return NULL;
+ return nullptr;
} else if (pCurNode->GetClassID() == XFA_ELEMENT_Overflow) {
return pCurNode;
}
}
- return NULL;
+ return nullptr;
}
void CXFA_LayoutPageMgr::MergePageSetContents() {
@@ -1642,7 +1638,7 @@ void CXFA_LayoutPageMgr::MergePageSetContents() {
CXFA_Node* pBindNode = pNode->GetBindData();
if (pBindNode) {
pBindNode->RemoveBindItem(pNode);
- pNode->SetObject(XFA_ATTRIBUTE_BindingNode, NULL);
+ pNode->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr);
}
}
pNode->SetFlag(XFA_NODEFLAG_UnusedNode, true);
@@ -1676,7 +1672,7 @@ void CXFA_LayoutPageMgr::MergePageSetContents() {
if (pRootPageSetContainerItem->m_pFormNode->GetUserData(
XFA_LAYOUTITEMKEY) == pRootPageSetContainerItem) {
pRootPageSetContainerItem->m_pFormNode->SetUserData(XFA_LAYOUTITEMKEY,
- NULL);
+ nullptr);
}
pRootPageSetContainerItem->m_pFormNode = pPendingPageSet;
pPendingPageSet->ClearFlag(XFA_NODEFLAG_UnusedNode);
@@ -1706,7 +1702,7 @@ void CXFA_LayoutPageMgr::MergePageSetContents() {
(CXFA_ContainerLayoutItem*)pFormLayout->m_pNextSibling;
}
}
- if (pFormLayout == NULL) {
+ if (!pFormLayout) {
bIsExistForm = FALSE;
break;
}
@@ -1898,7 +1894,7 @@ void XFA_ReleaseLayoutItem_NoPageArea(CXFA_LayoutItem* pLayoutItem) {
CXFA_LayoutItem *pNext, *pNode = pLayoutItem->m_pFirstChild;
while (pNode) {
pNext = pNode->m_pNextSibling;
- pNode->m_pParent = NULL;
+ pNode->m_pParent = nullptr;
XFA_ReleaseLayoutItem_NoPageArea(pNode);
pNode = pNext;
}
@@ -1907,7 +1903,7 @@ void XFA_ReleaseLayoutItem_NoPageArea(CXFA_LayoutItem* pLayoutItem) {
}
}
void CXFA_LayoutPageMgr::PrepareLayout() {
- m_pPageSetCurRoot = NULL;
+ m_pPageSetCurRoot = nullptr;
m_ePageSetMode = XFA_ATTRIBUTEENUM_OrderedOccurrence;
m_nAvailPages = 0;
ClearRecordList();
@@ -1921,9 +1917,9 @@ void CXFA_LayoutPageMgr::PrepareLayout() {
pRootLayoutItem->m_pFormNode->GetDocument()->m_pPendingPageSet.RemoveAll();
if (pPageSetFormNode->HasFlag(XFA_NODEFLAG_HasRemoved)) {
XFA_ReleaseLayoutItem(pRootLayoutItem);
- m_pPageSetLayoutItemRoot = NULL;
- pRootLayoutItem = NULL;
- pPageSetFormNode = NULL;
+ m_pPageSetLayoutItemRoot = nullptr;
+ pRootLayoutItem = nullptr;
+ pPageSetFormNode = nullptr;
m_PageArray.RemoveAll();
}
while (pPageSetFormNode) {
@@ -1937,11 +1933,11 @@ void CXFA_LayoutPageMgr::PrepareLayout() {
}
}
pRootLayoutItem = m_pPageSetLayoutItemRoot;
- CXFA_ContainerLayoutItem* pNextLayout = NULL;
+ CXFA_ContainerLayoutItem* pNextLayout = nullptr;
for (; pRootLayoutItem; pRootLayoutItem = pNextLayout) {
pNextLayout = (CXFA_ContainerLayoutItem*)pRootLayoutItem->m_pNextSibling;
SaveLayoutItem(pRootLayoutItem);
delete pRootLayoutItem;
}
- m_pPageSetLayoutItemRoot = NULL;
+ m_pPageSetLayoutItemRoot = nullptr;
}
« no previous file with comments | « xfa/fxfa/parser/xfa_layout_pagemgr_new.h ('k') | xfa/fxfa/parser/xfa_locale.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698