summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/xfa_script_resolveprocessor.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_script_resolveprocessor.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_script_resolveprocessor.cpp')
-rw-r--r--xfa/fxfa/parser/xfa_script_resolveprocessor.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
index bcfaa113d4..2ca137e510 100644
--- a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
+++ b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
@@ -25,7 +25,7 @@ CXFA_ResolveProcessor::~CXFA_ResolveProcessor() {
}
int32_t CXFA_ResolveProcessor::XFA_ResolveNodes(CXFA_ResolveNodesData& rnd) {
- if (rnd.m_CurNode == NULL) {
+ if (!rnd.m_CurNode) {
return -1;
}
if (!rnd.m_CurNode->IsNode()) {
@@ -84,7 +84,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_AnyChild(
CXFA_ResolveNodesData& rnd) {
CFX_WideString wsName = rnd.m_wsName;
CFX_WideString wsCondition = rnd.m_wsCondition;
- CXFA_Node* findNode = NULL;
+ CXFA_Node* findNode = nullptr;
CXFA_NodeArray siblings;
FX_BOOL bClassName = FALSE;
if (wsName.GetAt(0) == '#') {
@@ -93,7 +93,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_AnyChild(
}
findNode = m_pNodeHelper->XFA_ResolveNodes_GetOneChild(
ToNode(rnd.m_CurNode), wsName.c_str(), bClassName);
- if (findNode == NULL) {
+ if (!findNode) {
return 0;
}
if (wsCondition.IsEmpty()) {
@@ -226,8 +226,8 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Normal(
rndFind.m_uHashName = uNameHash;
CXFA_NodeArray children;
CXFA_NodeArray properties;
- CXFA_Node* pVariablesNode = NULL;
- CXFA_Node* pPageSetNode = NULL;
+ CXFA_Node* pVariablesNode = nullptr;
+ CXFA_Node* pPageSetNode = nullptr;
CXFA_Node* pChild = curNode->GetNodeItem(XFA_NODEITEM_FirstChild);
while (pChild) {
if (pChild->GetElementType() == XFA_Element::Variables) {
@@ -353,7 +353,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Normal(
}
return 0;
}
- CXFA_Node* pProp = NULL;
+ CXFA_Node* pProp = nullptr;
if (XFA_Element::Subform == curNode->GetElementType() &&
XFA_HASHCODE_Occur == uNameHash) {
CXFA_Node* pInstanceManager =
@@ -650,7 +650,7 @@ void CXFA_ResolveProcessor::XFA_ResolveNode_ConditionArray(
m_pNodeHelper->m_iCreateCount = 1;
findNodes.RemoveAll();
m_pNodeHelper->m_iCurAllStart = -1;
- m_pNodeHelper->m_pAllStartParent = NULL;
+ m_pNodeHelper->m_pAllStartParent = nullptr;
} else {
if (m_pNodeHelper->m_iCurAllStart == -1) {
m_pNodeHelper->m_iCurAllStart = m_iCurStart;
@@ -826,14 +826,14 @@ void CXFA_ResolveProcessor::XFA_ResolveNode_SetIndexDataBind(
CXFA_ResolveNodesData::CXFA_ResolveNodesData(CXFA_ScriptContext* pSC)
: m_pSC(pSC),
- m_CurNode(NULL),
+ m_CurNode(nullptr),
m_wsName(),
m_uHashName(XFA_HASHCODE_None),
m_wsCondition(),
m_nLevel(0),
m_Nodes(),
m_dwStyles(XFA_RESOLVENODE_Children),
- m_pScriptAttribute(NULL),
+ m_pScriptAttribute(nullptr),
m_dwFlag(XFA_RESOVENODE_RSTYPE_Nodes) {}
CXFA_ResolveNodesData::~CXFA_ResolveNodesData() {