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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2018733002: Clean up part of CXFA_Node class (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fxfa/parser/xfa_object_imp.cpp
diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp
index 3864c1a32ca900cfe5de65731f41414796714b96..5beb52bce7c8a0aa592874b1ebbe5ee39bfcc6bf 100644
--- a/xfa/fxfa/parser/xfa_object_imp.cpp
+++ b/xfa/fxfa/parser/xfa_object_imp.cpp
@@ -28,30 +28,59 @@
#include "xfa/fxfa/parser/xfa_utils.h"
#include "xfa/fxjse/cfxjse_arguments.h"
+namespace {
+
+void XFA_DeleteWideString(void* pData) {
+ delete static_cast<CFX_WideString*>(pData);
+}
+
+void XFA_CopyWideString(void*& pData) {
+ if (pData) {
+ CFX_WideString* pNewData = new CFX_WideString(*(CFX_WideString*)pData);
+ pData = pNewData;
+ }
+}
+
+XFA_MAPDATABLOCKCALLBACKINFO deleteWideStringCallBack = {XFA_DeleteWideString,
Tom Sepez 2016/05/26 23:55:04 nit: const FA_MAPDATABLOCKCALLBACKINFO
Wei Li 2016/05/27 00:51:45 Let's defer this change since it requires changing
+ XFA_CopyWideString};
+
+XFA_OBJECTTYPE XFA_GetElementObjectType(XFA_ELEMENT eElement) {
+ return (XFA_OBJECTTYPE)XFA_GetElementByID(eElement)->eObjectType;
Tom Sepez 2016/05/26 23:55:04 nit: static cast.
Wei Li 2016/05/27 00:51:46 Done.
+}
+
+void XFA_DataNodeDeleteBindItem(void* pData) {
+ delete static_cast<CXFA_NodeArray*>(pData);
+}
+
+XFA_MAPDATABLOCKCALLBACKINFO deleteBindItemCallBack = {
Tom Sepez 2016/05/26 23:55:03 const XFA_MAPDATABLOCKCALLBACKINFO
Wei Li 2016/05/27 00:51:45 Let's defer this since it requires changing SetObj
+ XFA_DataNodeDeleteBindItem, nullptr};
+
+} // namespace
+
CXFA_Object::CXFA_Object(CXFA_Document* pDocument, uint32_t uFlags)
: m_pDocument(pDocument), m_uFlags(uFlags) {}
+
void CXFA_Object::GetClassName(CFX_WideStringC& wsName) const {
wsName = XFA_GetElementByID(GetClassID())->pName;
}
+
uint32_t CXFA_Object::GetClassHashCode() const {
return XFA_GetElementByID(GetClassID())->uHash;
}
+
XFA_ELEMENT CXFA_Object::GetClassID() const {
- if (IsNode()) {
+ if (IsNode())
return AsNode()->GetClassID();
- }
- if (IsOrdinaryObject()) {
+ if (IsOrdinaryObject())
return AsOrdinaryObject()->GetClassID();
- }
- if (IsNodeList()) {
+ if (IsNodeList())
return AsNodeList()->GetClassID();
- }
- if (IsOrdinaryList()) {
+ if (IsOrdinaryList())
return XFA_ELEMENT_List;
- }
ASSERT(FALSE);
return (XFA_ELEMENT)0;
}
+
void CXFA_Object::Script_ObjectClass_ClassName(CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {
@@ -65,6 +94,7 @@ void CXFA_Object::Script_ObjectClass_ClassName(CFXJSE_Value* pValue,
ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
}
}
+
void CXFA_Object::ThrowScriptErrorMessage(int32_t iStringID, ...) {
IXFA_AppProvider* pAppProvider = m_pDocument->GetNotify()->GetAppProvider();
ASSERT(pAppProvider);
@@ -79,21 +109,6 @@ void CXFA_Object::ThrowScriptErrorMessage(int32_t iStringID, ...) {
"", FX_UTF8Encode(wsMessage.c_str(), wsMessage.GetLength()).AsStringC());
}
-static void XFA_DeleteWideString(void* pData) {
- delete static_cast<CFX_WideString*>(pData);
-}
-
-static void XFA_CopyWideString(void*& pData) {
- if (pData) {
- CFX_WideString* pNewData = new CFX_WideString(*(CFX_WideString*)pData);
- pData = pNewData;
- }
-}
-static XFA_MAPDATABLOCKCALLBACKINFO deleteWideStringCallBack = {
- XFA_DeleteWideString, XFA_CopyWideString};
-static XFA_OBJECTTYPE XFA_GetElementObjectType(XFA_ELEMENT eElement) {
- return (XFA_OBJECTTYPE)XFA_GetElementByID(eElement)->eObjectType;
-}
CXFA_Node::CXFA_Node(CXFA_Document* pDoc,
uint16_t ePacket,
XFA_ELEMENT eElement)
@@ -110,30 +125,32 @@ CXFA_Node::CXFA_Node(CXFA_Document* pDoc,
m_pMapModuleData(nullptr) {
ASSERT(m_pDocument);
}
+
CXFA_Node::~CXFA_Node() {
- ASSERT(m_pParent == NULL);
+ ASSERT(!m_pParent);
RemoveMapModuleKey();
- CXFA_Node *pNext, *pNode = m_pChild;
+ CXFA_Node* pNext;
Tom Sepez 2016/05/26 23:55:03 make pNode local to body of loop
Wei Li 2016/05/27 00:51:46 pNext? Done.
+ CXFA_Node* pNode = m_pChild;
while (pNode) {
pNext = pNode->m_pNext;
- pNode->m_pParent = NULL;
+ pNode->m_pParent = nullptr;
delete pNode;
pNode = pNext;
}
- if (m_pXMLNode && HasFlag(XFA_NODEFLAG_OwnXMLNode)) {
+ if (m_pXMLNode && HasFlag(XFA_NODEFLAG_OwnXMLNode))
m_pXMLNode->Release();
- }
}
+
CXFA_Node* CXFA_Node::Clone(FX_BOOL bRecursive) {
CXFA_Document* pFactory = m_pDocument->GetParser()->GetFactory();
CXFA_Node* pClone = pFactory->CreateNode(m_ePacket, m_eNodeClass);
- if (!pClone) {
- return NULL;
- }
+ if (!pClone)
+ return nullptr;
+
MergeAllData(pClone);
pClone->UpdateNameHash();
if (IsNeedSavingXMLNode()) {
- CFDE_XMLNode* pCloneXML = NULL;
+ CFDE_XMLNode* pCloneXML = nullptr;
if (IsAttributeInXML()) {
CFX_WideString wsName;
GetAttribute(XFA_ATTRIBUTE_Name, wsName, FALSE);
@@ -143,7 +160,7 @@ CXFA_Node* CXFA_Node::Clone(FX_BOOL bRecursive) {
pCloneXMLElement->SetTextData(CFX_WideString(wsValue));
}
pCloneXML = pCloneXMLElement;
- pCloneXMLElement = NULL;
+ pCloneXMLElement = nullptr;
pClone->SetEnum(XFA_ATTRIBUTE_Contains, XFA_ATTRIBUTEENUM_Unknown);
} else {
pCloneXML = m_pXMLNode->Clone(FALSE);
@@ -158,9 +175,10 @@ CXFA_Node* CXFA_Node::Clone(FX_BOOL bRecursive) {
}
}
pClone->SetFlag(XFA_NODEFLAG_Initialized, true);
- pClone->SetObject(XFA_ATTRIBUTE_BindingNode, NULL);
+ pClone->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr);
return pClone;
}
+
CXFA_Node* CXFA_Node::GetNodeItem(XFA_NODEITEM eItem) const {
switch (eItem) {
case XFA_NODEITEM_NextSibling:
@@ -172,45 +190,43 @@ CXFA_Node* CXFA_Node::GetNodeItem(XFA_NODEITEM eItem) const {
case XFA_NODEITEM_PrevSibling:
if (m_pParent) {
CXFA_Node* pSibling = m_pParent->m_pChild;
- CXFA_Node* pPrev = NULL;
+ CXFA_Node* pPrev = nullptr;
while (pSibling && pSibling != this) {
pPrev = pSibling;
pSibling = pSibling->m_pNext;
}
return pPrev;
}
- return NULL;
+ return nullptr;
default:
break;
}
- return NULL;
+ return nullptr;
}
+
CXFA_Node* CXFA_Node::GetNodeItem(XFA_NODEITEM eItem,
XFA_OBJECTTYPE eType) const {
- CXFA_Node* pNode = NULL;
+ CXFA_Node* pNode = nullptr;
switch (eItem) {
case XFA_NODEITEM_NextSibling:
pNode = m_pNext;
if (eType != XFA_OBJECTTYPEMASK) {
- while (pNode && pNode->GetObjectType() != eType) {
+ while (pNode && pNode->GetObjectType() != eType)
pNode = pNode->m_pNext;
- }
}
break;
case XFA_NODEITEM_FirstChild:
pNode = m_pChild;
if (eType != XFA_OBJECTTYPEMASK) {
- while (pNode && pNode->GetObjectType() != eType) {
+ while (pNode && pNode->GetObjectType() != eType)
pNode = pNode->m_pNext;
- }
}
break;
case XFA_NODEITEM_Parent:
pNode = m_pParent;
if (eType != XFA_OBJECTTYPEMASK) {
- while (pNode && pNode->GetObjectType() != eType) {
+ while (pNode && pNode->GetObjectType() != eType)
pNode = pNode->m_pParent;
- }
}
break;
case XFA_NODEITEM_PrevSibling:
@@ -230,6 +246,7 @@ CXFA_Node* CXFA_Node::GetNodeItem(XFA_NODEITEM eItem,
}
return pNode;
}
+
int32_t CXFA_Node::GetNodeList(CXFA_NodeArray& nodes,
uint32_t dwTypeFilter,
XFA_ELEMENT eElementFilter,
@@ -259,10 +276,10 @@ int32_t CXFA_Node::GetNodeList(CXFA_NodeArray& nodes,
pChild = pChild->m_pNext;
}
} else if (dwTypeFilter != 0) {
- FX_BOOL bFilterChildren = (dwTypeFilter & XFA_NODEFILTER_Children) != 0;
- FX_BOOL bFilterProperties = (dwTypeFilter & XFA_NODEFILTER_Properties) != 0;
- FX_BOOL bFilterOneOfProperties =
- (dwTypeFilter & XFA_NODEFILTER_OneOfProperty) != 0;
+ bool bFilterChildren = !!(dwTypeFilter & XFA_NODEFILTER_Children);
Tom Sepez 2016/05/26 23:55:04 nice.
+ bool bFilterProperties = !!(dwTypeFilter & XFA_NODEFILTER_Properties);
+ bool bFilterOneOfProperties =
+ !!(dwTypeFilter & XFA_NODEFILTER_OneOfProperty);
CXFA_Node* pChild = m_pChild;
while (pChild) {
const XFA_PROPERTY* pProperty = XFA_GetPropertyOfElement(
@@ -278,10 +295,8 @@ int32_t CXFA_Node::GetNodeList(CXFA_NodeArray& nodes,
pChild->GetClassID() == XFA_ELEMENT_PageSet)) {
nodes.Add(pChild);
}
- } else {
- if (bFilterChildren) {
- nodes.Add(pChild);
- }
+ } else if (bFilterChildren) {
+ nodes.Add(pChild);
}
pChild = pChild->m_pNext;
}
@@ -289,19 +304,17 @@ int32_t CXFA_Node::GetNodeList(CXFA_NodeArray& nodes,
int32_t iProperties = 0;
const XFA_PROPERTY* pProperty =
XFA_GetElementProperties(GetClassID(), iProperties);
- if (pProperty == NULL || iProperties < 1) {
+ if (!pProperty || iProperties < 1)
return 0;
- }
for (int32_t i = 0; i < iProperties; i++) {
if (pProperty[i].uFlags & XFA_PROPERTYFLAG_DefaultOneOf) {
CXFA_Document* pFactory = m_pDocument->GetParser()->GetFactory();
const XFA_PACKETINFO* pPacket = XFA_GetPacketByID(GetPacketID());
CXFA_Node* pNewNode =
pFactory->CreateNode(pPacket, (XFA_ELEMENT)pProperty[i].eName);
- if (!pNewNode) {
+ if (!pNewNode)
break;
- }
- InsertChild(pNewNode, NULL);
+ InsertChild(pNewNode, nullptr);
pNewNode->SetFlag(XFA_NODEFLAG_Initialized, true);
nodes.Add(pNewNode);
break;
@@ -311,6 +324,7 @@ int32_t CXFA_Node::GetNodeList(CXFA_NodeArray& nodes,
}
return nodes.GetSize();
}
+
CXFA_Node* CXFA_Node::CreateSamePacketNode(XFA_ELEMENT eElement,
uint32_t dwFlags) {
CXFA_Document* pFactory = m_pDocument->GetParser()->GetFactory();
@@ -318,13 +332,14 @@ CXFA_Node* CXFA_Node::CreateSamePacketNode(XFA_ELEMENT eElement,
pNode->SetFlag(dwFlags, true);
return pNode;
}
+
CXFA_Node* CXFA_Node::CloneTemplateToForm(FX_BOOL bRecursive) {
ASSERT(m_ePacket == XFA_XDPPACKET_Template);
CXFA_Document* pFactory = m_pDocument->GetParser()->GetFactory();
CXFA_Node* pClone = pFactory->CreateNode(XFA_XDPPACKET_Form, m_eNodeClass);
- if (!pClone) {
- return NULL;
- }
+ if (!pClone)
+ return nullptr;
+
pClone->SetTemplateNode(this);
pClone->UpdateNameHash();
pClone->SetXMLMappingNode(GetXMLMappingNode());
@@ -345,35 +360,30 @@ CXFA_Node* CXFA_Node::GetTemplateNode() const {
void CXFA_Node::SetTemplateNode(CXFA_Node* pTemplateNode) {
m_pAuxNode = pTemplateNode;
}
+
CXFA_Node* CXFA_Node::GetBindData() {
ASSERT(GetPacketID() == XFA_XDPPACKET_Form);
return static_cast<CXFA_Node*>(GetObject(XFA_ATTRIBUTE_BindingNode));
}
+
int32_t CXFA_Node::GetBindItems(CXFA_NodeArray& formItems) {
if (m_uFlags & XFA_NODEFLAG_BindFormItems) {
- CXFA_NodeArray* pItems = NULL;
+ CXFA_NodeArray* pItems = nullptr;
TryObject(XFA_ATTRIBUTE_BindingNode, (void*&)pItems);
formItems.Copy(*pItems);
return formItems.GetSize();
}
CXFA_Node* pFormNode =
static_cast<CXFA_Node*>(GetObject(XFA_ATTRIBUTE_BindingNode));
- if (pFormNode) {
+ if (pFormNode)
formItems.Add(pFormNode);
- }
return formItems.GetSize();
}
-static void XFA_DataNodeDeleteBindItem(void* pData) {
- delete static_cast<CXFA_NodeArray*>(pData);
-}
-
-static XFA_MAPDATABLOCKCALLBACKINFO deleteBindItemCallBack = {
- XFA_DataNodeDeleteBindItem, NULL};
int32_t CXFA_Node::AddBindItem(CXFA_Node* pFormNode) {
ASSERT(pFormNode);
if (m_uFlags & XFA_NODEFLAG_BindFormItems) {
- CXFA_NodeArray* pItems = NULL;
+ CXFA_NodeArray* pItems = nullptr;
TryObject(XFA_ATTRIBUTE_BindingNode, (void*&)pItems);
ASSERT(pItems);
if (pItems->Find(pFormNode) < 0) {
@@ -396,17 +406,17 @@ int32_t CXFA_Node::AddBindItem(CXFA_Node* pFormNode) {
m_uFlags |= XFA_NODEFLAG_BindFormItems;
return 2;
}
+
int32_t CXFA_Node::RemoveBindItem(CXFA_Node* pFormNode) {
if (m_uFlags & XFA_NODEFLAG_BindFormItems) {
- CXFA_NodeArray* pItems = NULL;
+ CXFA_NodeArray* pItems = nullptr;
TryObject(XFA_ATTRIBUTE_BindingNode, (void*&)pItems);
ASSERT(pItems);
int32_t iIndex = pItems->Find(pFormNode);
int32_t iCount = pItems->GetSize();
if (iIndex >= 0) {
- if (iIndex != iCount - 1) {
+ if (iIndex != iCount - 1)
pItems->SetAt(iIndex, pItems->GetAt(iCount - 1));
- }
pItems->RemoveAt(iCount - 1);
if (iCount == 2) {
CXFA_Node* pLastFormNode = pItems->GetAt(0);
@@ -420,122 +430,114 @@ int32_t CXFA_Node::RemoveBindItem(CXFA_Node* pFormNode) {
CXFA_Node* pOldFormItem =
static_cast<CXFA_Node*>(GetObject(XFA_ATTRIBUTE_BindingNode));
if (pOldFormItem == pFormNode) {
- SetObject(XFA_ATTRIBUTE_BindingNode, NULL);
- pOldFormItem = NULL;
+ SetObject(XFA_ATTRIBUTE_BindingNode, nullptr);
+ pOldFormItem = nullptr;
}
- return pOldFormItem == NULL ? 0 : 1;
+ return pOldFormItem ? 1 : 0;
}
+
FX_BOOL CXFA_Node::HasBindItem() {
- return (GetPacketID() == XFA_XDPPACKET_Datasets) &&
- GetObject(XFA_ATTRIBUTE_BindingNode) != NULL;
+ return GetPacketID() == XFA_XDPPACKET_Datasets &&
+ GetObject(XFA_ATTRIBUTE_BindingNode);
}
+
CXFA_WidgetData* CXFA_Node::GetWidgetData() {
return (CXFA_WidgetData*)GetObject(XFA_ATTRIBUTE_WidgetData);
}
+
CXFA_WidgetData* CXFA_Node::GetContainerWidgetData() {
- if (GetPacketID() != XFA_XDPPACKET_Form) {
- return NULL;
- }
+ if (GetPacketID() != XFA_XDPPACKET_Form)
+ return nullptr;
XFA_ELEMENT classID = GetClassID();
- if (classID == XFA_ELEMENT_ExclGroup) {
- return NULL;
- }
+ if (classID == XFA_ELEMENT_ExclGroup)
+ return nullptr;
CXFA_Node* pParentNode = GetNodeItem(XFA_NODEITEM_Parent);
- if (pParentNode && pParentNode->GetClassID() == XFA_ELEMENT_ExclGroup) {
- return NULL;
- }
+ if (pParentNode && pParentNode->GetClassID() == XFA_ELEMENT_ExclGroup)
+ return nullptr;
+
if (classID == XFA_ELEMENT_Field) {
CXFA_WidgetData* pFieldWidgetData = GetWidgetData();
if (pFieldWidgetData &&
pFieldWidgetData->GetChoiceListOpen() ==
XFA_ATTRIBUTEENUM_MultiSelect) {
- return NULL;
+ return nullptr;
} else {
CFX_WideString wsPicture;
if (pFieldWidgetData) {
pFieldWidgetData->GetPictureContent(wsPicture,
XFA_VALUEPICTURE_DataBind);
}
- if (!wsPicture.IsEmpty()) {
+ if (!wsPicture.IsEmpty())
return pFieldWidgetData;
- }
CXFA_Node* pDataNode = GetBindData();
- if (!pDataNode) {
- return NULL;
- }
- pFieldWidgetData = NULL;
+ if (!pDataNode)
+ return nullptr;
+ pFieldWidgetData = nullptr;
CXFA_NodeArray formNodes;
pDataNode->GetBindItems(formNodes);
for (int32_t i = 0; i < formNodes.GetSize(); i++) {
CXFA_Node* pFormNode = formNodes.GetAt(i);
- if (!pFormNode || pFormNode->HasFlag(XFA_NODEFLAG_HasRemoved)) {
+ if (!pFormNode || pFormNode->HasFlag(XFA_NODEFLAG_HasRemoved))
continue;
- }
pFieldWidgetData = pFormNode->GetWidgetData();
if (pFieldWidgetData) {
pFieldWidgetData->GetPictureContent(wsPicture,
XFA_VALUEPICTURE_DataBind);
}
- if (!wsPicture.IsEmpty()) {
+ if (!wsPicture.IsEmpty())
break;
- }
- pFieldWidgetData = NULL;
+ pFieldWidgetData = nullptr;
}
return pFieldWidgetData;
}
}
CXFA_Node* pGrandNode =
- pParentNode ? pParentNode->GetNodeItem(XFA_NODEITEM_Parent) : NULL;
+ pParentNode ? pParentNode->GetNodeItem(XFA_NODEITEM_Parent) : nullptr;
CXFA_Node* pValueNode =
(pParentNode && pParentNode->GetClassID() == XFA_ELEMENT_Value)
? pParentNode
- : NULL;
+ : nullptr;
if (!pValueNode) {
pValueNode = (pGrandNode && pGrandNode->GetClassID() == XFA_ELEMENT_Value)
? pGrandNode
- : NULL;
+ : nullptr;
}
CXFA_Node* pParentOfValueNode =
- pValueNode ? pValueNode->GetNodeItem(XFA_NODEITEM_Parent) : NULL;
+ pValueNode ? pValueNode->GetNodeItem(XFA_NODEITEM_Parent) : nullptr;
return pParentOfValueNode ? pParentOfValueNode->GetContainerWidgetData()
- : NULL;
+ : nullptr;
}
+
FX_BOOL CXFA_Node::GetLocaleName(CFX_WideString& wsLocaleName) {
CXFA_Node* pForm = GetDocument()->GetXFAObject(XFA_HASHCODE_Form)->AsNode();
CXFA_Node* pTopSubform = pForm->GetFirstChildByClass(XFA_ELEMENT_Subform);
ASSERT(pTopSubform);
CXFA_Node* pLocaleNode = this;
- FX_BOOL bLocale = FALSE;
+ bool bLocale = false;
do {
bLocale = pLocaleNode->TryCData(XFA_ATTRIBUTE_Locale, wsLocaleName, FALSE);
if (!bLocale) {
pLocaleNode = pLocaleNode->GetNodeItem(XFA_NODEITEM_Parent);
}
} while (pLocaleNode && pLocaleNode != pTopSubform && !bLocale);
- if (bLocale) {
- return bLocale;
- }
+ if (bLocale)
+ return TRUE;
CXFA_Node* pConfig = ToNode(GetDocument()->GetXFAObject(XFA_HASHCODE_Config));
wsLocaleName = GetDocument()->GetLocalMgr()->GetConfigLocaleName(pConfig);
- if (!wsLocaleName.IsEmpty()) {
- bLocale = TRUE;
- }
- if (bLocale) {
- return bLocale;
- }
- if (pTopSubform) {
- bLocale = pTopSubform->TryCData(XFA_ATTRIBUTE_Locale, wsLocaleName, FALSE);
- }
- if (bLocale) {
- return bLocale;
+ if (!wsLocaleName.IsEmpty())
+ return TRUE;
+ if (pTopSubform &&
+ pTopSubform->TryCData(XFA_ATTRIBUTE_Locale, wsLocaleName, FALSE)) {
+ return TRUE;
}
IFX_Locale* pLocale = GetDocument()->GetLocalMgr()->GetDefLocale();
if (pLocale) {
wsLocaleName = pLocale->GetName();
- bLocale = TRUE;
+ return TRUE;
}
- return bLocale;
+ return FALSE;
}
+
XFA_ATTRIBUTEENUM CXFA_Node::GetIntact() {
XFA_ELEMENT eElement = GetClassID();
CXFA_Node* pKeep = GetFirstChildByClass(XFA_ELEMENT_Keep);
@@ -552,21 +554,17 @@ XFA_ATTRIBUTEENUM CXFA_Node::GetIntact() {
pPreviewRow->GetEnum(XFA_ATTRIBUTE_Layout) ==
XFA_ATTRIBUTEENUM_Row) {
XFA_ATTRIBUTEENUM eValue;
- if (pKeep->TryEnum(XFA_ATTRIBUTE_Previous, eValue, FALSE)) {
- if (eValue == XFA_ATTRIBUTEENUM_ContentArea ||
- eValue == XFA_ATTRIBUTEENUM_PageArea) {
- return XFA_ATTRIBUTEENUM_ContentArea;
- }
+ if (pKeep->TryEnum(XFA_ATTRIBUTE_Previous, eValue, FALSE) &&
+ (eValue == XFA_ATTRIBUTEENUM_ContentArea ||
+ eValue == XFA_ATTRIBUTEENUM_PageArea)) {
+ return XFA_ATTRIBUTEENUM_ContentArea;
}
CXFA_Node* pKeep =
Tom Sepez 2016/05/26 23:55:03 this is a shadow of the variable on line 543. Let
Wei Li 2016/05/27 00:51:45 Done.
pPreviewRow->GetFirstChildByClass(XFA_ELEMENT_Keep);
- if (pKeep) {
- if (pKeep->TryEnum(XFA_ATTRIBUTE_Next, eValue, FALSE)) {
- if (eValue == XFA_ATTRIBUTEENUM_ContentArea ||
- eValue == XFA_ATTRIBUTEENUM_PageArea) {
- return XFA_ATTRIBUTEENUM_ContentArea;
- }
- }
+ if (pKeep && pKeep->TryEnum(XFA_ATTRIBUTE_Next, eValue, FALSE) &&
+ (eValue == XFA_ATTRIBUTEENUM_ContentArea ||
+ eValue == XFA_ATTRIBUTEENUM_PageArea)) {
+ return XFA_ATTRIBUTEENUM_ContentArea;
}
}
}
@@ -590,9 +588,8 @@ XFA_ATTRIBUTEENUM CXFA_Node::GetIntact() {
break;
case XFA_ELEMENT_Field: {
CXFA_Node* pParentNode = GetNodeItem(XFA_NODEITEM_Parent);
- if (!pParentNode || pParentNode->GetClassID() == XFA_ELEMENT_PageArea) {
+ if (!pParentNode || pParentNode->GetClassID() == XFA_ELEMENT_PageArea)
return XFA_ATTRIBUTEENUM_ContentArea;
- }
if (pParentNode->GetIntact() == XFA_ATTRIBUTEENUM_None) {
XFA_ATTRIBUTEENUM eParLayout =
pParentNode->GetEnum(XFA_ATTRIBUTE_Layout);
@@ -604,9 +601,8 @@ XFA_ATTRIBUTEENUM CXFA_Node::GetIntact() {
XFA_VERSION version = m_pDocument->GetCurVersionMode();
if (eParLayout == XFA_ATTRIBUTEENUM_Tb && version < XFA_VERSION_208) {
CXFA_Measurement measureH;
- if (TryMeasure(XFA_ATTRIBUTE_H, measureH, FALSE)) {
+ if (TryMeasure(XFA_ATTRIBUTE_H, measureH, FALSE))
return XFA_ATTRIBUTEENUM_ContentArea;
- }
}
return XFA_ATTRIBUTEENUM_None;
}
@@ -619,16 +615,18 @@ XFA_ATTRIBUTEENUM CXFA_Node::GetIntact() {
}
return XFA_ATTRIBUTEENUM_None;
}
+
CXFA_Node* CXFA_Node::GetDataDescriptionNode() {
- if (m_ePacket == XFA_XDPPACKET_Datasets) {
+ if (m_ePacket == XFA_XDPPACKET_Datasets)
return m_pAuxNode;
- }
- return NULL;
+ return nullptr;
}
+
void CXFA_Node::SetDataDescriptionNode(CXFA_Node* pDataDescriptionNode) {
ASSERT(m_ePacket == XFA_XDPPACKET_Datasets);
m_pAuxNode = pDataDescriptionNode;
}
+
void CXFA_Node::Script_TreeClass_ResolveNode(CFXJSE_Arguments* pArguments) {
int32_t iLength = pArguments->GetLength();
if (iLength != 1) {
@@ -638,22 +636,20 @@ void CXFA_Node::Script_TreeClass_ResolveNode(CFXJSE_Arguments* pArguments) {
CFX_WideString wsExpression =
CFX_WideString::FromUTF8(pArguments->GetUTF8String(0).AsStringC());
CXFA_ScriptContext* pScriptContext = m_pDocument->GetScriptContext();
- if (!pScriptContext) {
+ if (!pScriptContext)
return;
- }
CXFA_Node* refNode = this;
- if (refNode->GetClassID() == XFA_ELEMENT_Xfa) {
+ if (refNode->GetClassID() == XFA_ELEMENT_Xfa)
refNode = ToNode(pScriptContext->GetThisObject());
- }
uint32_t dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Attributes |
XFA_RESOLVENODE_Properties | XFA_RESOLVENODE_Parent |
XFA_RESOLVENODE_Siblings;
XFA_RESOLVENODE_RS resoveNodeRS;
int32_t iRet = pScriptContext->ResolveObjects(
refNode, wsExpression.AsStringC(), resoveNodeRS, dwFlag);
- if (iRet < 1) {
+ if (iRet < 1)
return FXJSE_Value_SetNull(pArguments->GetReturnValue());
- }
+
CFXJSE_Value* pValue = nullptr;
if (resoveNodeRS.dwFlags == XFA_RESOVENODE_RSTYPE_Nodes) {
CXFA_Object* pNode = resoveNodeRS.nodes[0];
@@ -673,6 +669,7 @@ void CXFA_Node::Script_TreeClass_ResolveNode(CFXJSE_Arguments* pArguments) {
}
}
}
+
void CXFA_Node::Script_TreeClass_ResolveNodes(CFXJSE_Arguments* pArguments) {
int32_t iLength = pArguments->GetLength();
if (iLength != 1) {
@@ -683,30 +680,27 @@ void CXFA_Node::Script_TreeClass_ResolveNodes(CFXJSE_Arguments* pArguments) {
CFX_WideString wsExpression =
CFX_WideString::FromUTF8(pArguments->GetUTF8String(0).AsStringC());
CFXJSE_Value* pValue = pArguments->GetReturnValue();
- if (!pValue) {
+ if (!pValue)
return;
- }
uint32_t dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Attributes |
XFA_RESOLVENODE_Properties | XFA_RESOLVENODE_Parent |
XFA_RESOLVENODE_Siblings;
CXFA_Node* refNode = this;
- if (refNode->GetClassID() == XFA_ELEMENT_Xfa) {
+ if (refNode->GetClassID() == XFA_ELEMENT_Xfa)
refNode = ToNode(m_pDocument->GetScriptContext()->GetThisObject());
- }
Script_Som_ResolveNodeList(pValue, wsExpression, dwFlag, refNode);
}
+
void CXFA_Node::Script_Som_ResolveNodeList(CFXJSE_Value* pValue,
CFX_WideString wsExpression,
uint32_t dwFlag,
CXFA_Node* refNode) {
CXFA_ScriptContext* pScriptContext = m_pDocument->GetScriptContext();
- if (!pScriptContext) {
+ if (!pScriptContext)
return;
- }
XFA_RESOLVENODE_RS resoveNodeRS;
- if (refNode == NULL) {
+ if (!refNode)
refNode = this;
- }
pScriptContext->ResolveObjects(refNode, wsExpression.AsStringC(),
resoveNodeRS, dwFlag);
CXFA_ArrayNodeList* pNodeList = new CXFA_ArrayNodeList(m_pDocument);
@@ -729,6 +723,7 @@ void CXFA_Node::Script_Som_ResolveNodeList(CFXJSE_Value* pValue,
FXJSE_Value_SetObject(pValue, (CXFA_Object*)pNodeList,
pScriptContext->GetJseNormalClass());
}
+
void CXFA_Node::Script_TreeClass_All(CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {
@@ -742,13 +737,13 @@ void CXFA_Node::Script_TreeClass_All(CFXJSE_Value* pValue,
Script_Som_ResolveNodeList(pValue, wsExpression, dwFlag);
}
}
+
void CXFA_Node::Script_TreeClass_Nodes(CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {
CXFA_ScriptContext* pScriptContext = m_pDocument->GetScriptContext();
- if (!pScriptContext) {
+ if (!pScriptContext)
return;
- }
if (bSetting) {
IXFA_AppProvider* pAppProvider = m_pDocument->GetNotify()->GetAppProvider();
ASSERT(pAppProvider);
@@ -763,6 +758,7 @@ void CXFA_Node::Script_TreeClass_Nodes(CFXJSE_Value* pValue,
pScriptContext->GetJseNormalClass());
}
}
+
void CXFA_Node::Script_TreeClass_ClassAll(CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {
@@ -776,6 +772,7 @@ void CXFA_Node::Script_TreeClass_ClassAll(CFXJSE_Value* pValue,
Script_Som_ResolveNodeList(pValue, wsExpression, dwFlag);
}
}
+
void CXFA_Node::Script_TreeClass_Parent(CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {
@@ -791,24 +788,25 @@ void CXFA_Node::Script_TreeClass_Parent(CFXJSE_Value* pValue,
}
}
}
+
void CXFA_Node::Script_TreeClass_Index(CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {
- if (bSetting) {
+ if (bSetting)
ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
- } else {
+ else
FXJSE_Value_SetInteger(pValue, GetNodeSameNameIndex());
- }
}
+
void CXFA_Node::Script_TreeClass_ClassIndex(CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {
- if (bSetting) {
+ if (bSetting)
ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
- } else {
+ else
FXJSE_Value_SetInteger(pValue, GetNodeSameClassIndex());
- }
}
+
void CXFA_Node::Script_TreeClass_SomExpression(CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {
@@ -821,6 +819,7 @@ void CXFA_Node::Script_TreeClass_SomExpression(CFXJSE_Value* pValue,
FX_UTF8Encode(wsSOMExpression).AsStringC());
}
}
+
void CXFA_Node::Script_NodeClass_ApplyXSL(CFXJSE_Arguments* pArguments) {
int32_t iLength = pArguments->GetLength();
if (iLength != 1) {
@@ -843,10 +842,8 @@ void CXFA_Node::Script_NodeClass_AssignNode(CFXJSE_Arguments* pArguments) {
CFX_WideString wsExpression;
CFX_WideString wsValue;
int32_t iAction = 0;
- if (iLength >= 1) {
- wsExpression =
- CFX_WideString::FromUTF8(pArguments->GetUTF8String(0).AsStringC());
- }
+ wsExpression =
+ CFX_WideString::FromUTF8(pArguments->GetUTF8String(0).AsStringC());
if (iLength >= 2) {
wsValue =
CFX_WideString::FromUTF8(pArguments->GetUTF8String(1).AsStringC());
@@ -866,13 +863,13 @@ void CXFA_Node::Script_NodeClass_Clone(CFXJSE_Arguments* pArguments) {
ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"clone");
return;
}
- FX_BOOL bClone = TRUE;
- bClone = pArguments->GetInt32(0) == 0 ? FALSE : TRUE;
+ bool bClone = !!pArguments->GetInt32(0);
CXFA_Node* pCloneNode = Clone(bClone);
FXJSE_Value_Set(
pArguments->GetReturnValue(),
m_pDocument->GetScriptContext()->GetJSValueFromMap(pCloneNode));
}
+
void CXFA_Node::Script_NodeClass_GetAttribute(CFXJSE_Arguments* pArguments) {
int32_t iLength = pArguments->GetLength();
if (iLength != 1) {
@@ -885,10 +882,10 @@ void CXFA_Node::Script_NodeClass_GetAttribute(CFXJSE_Arguments* pArguments) {
CFX_WideString wsValue;
GetAttribute(wsExpression.AsStringC(), wsValue);
CFXJSE_Value* pValue = pArguments->GetReturnValue();
- if (pValue) {
+ if (pValue)
FXJSE_Value_SetUTF8String(pValue, FX_UTF8Encode(wsValue).AsStringC());
- }
}
+
void CXFA_Node::Script_NodeClass_GetElement(CFXJSE_Arguments* pArguments) {
int32_t iLength = pArguments->GetLength();
if (iLength < 1 || iLength > 2) {
@@ -897,13 +894,10 @@ void CXFA_Node::Script_NodeClass_GetElement(CFXJSE_Arguments* pArguments) {
}
CFX_WideString wsExpression;
int32_t iValue = 0;
- if (iLength >= 1) {
- CFX_ByteString bsExpression = pArguments->GetUTF8String(0);
- wsExpression = CFX_WideString::FromUTF8(bsExpression.AsStringC());
- }
- if (iLength >= 2) {
+ wsExpression =
+ CFX_WideString::FromUTF8(pArguments->GetUTF8String(0).AsStringC());
+ if (iLength >= 2)
iValue = pArguments->GetInt32(1);
- }
const XFA_ELEMENTINFO* pElementInfo =
XFA_GetElementByName(wsExpression.AsStringC());
CXFA_Node* pNode = GetProperty(iValue, pElementInfo->eName);
@@ -920,17 +914,15 @@ void CXFA_Node::Script_NodeClass_IsPropertySpecified(
return;
}
CFX_WideString wsExpression;
- FX_BOOL bParent = TRUE;
+ bool bParent = true;
int32_t iIndex = 0;
- if (iLength >= 1) {
- wsExpression =
- CFX_WideString::FromUTF8(pArguments->GetUTF8String(0).AsStringC());
- }
+ wsExpression =
+ CFX_WideString::FromUTF8(pArguments->GetUTF8String(0).AsStringC());
if (iLength >= 2)
- bParent = !!pArguments->GetInt32(1) ? TRUE : FALSE;
+ bParent = !!pArguments->GetInt32(1);
if (iLength >= 3)
iIndex = pArguments->GetInt32(2);
- FX_BOOL bHas = FALSE;
+ bool bHas = false;
const XFA_ATTRIBUTEINFO* pAttributeInfo =
XFA_GetAttributeByName(wsExpression.AsStringC());
CFX_WideString wsValue;
@@ -959,36 +951,28 @@ void CXFA_Node::Script_NodeClass_LoadXML(CFXJSE_Arguments* pArguments) {
return;
}
CFX_WideString wsExpression;
- FX_BOOL bIgnoreRoot = TRUE;
- FX_BOOL bOverwrite = 0;
- if (iLength >= 1) {
- CFX_ByteString bsExpression = pArguments->GetUTF8String(0);
- wsExpression = CFX_WideString::FromUTF8(bsExpression.AsStringC());
- if (wsExpression.IsEmpty()) {
- return;
- }
- }
- if (iLength >= 2) {
- bIgnoreRoot = pArguments->GetInt32(1) == 0 ? FALSE : TRUE;
- }
- if (iLength >= 3) {
- bOverwrite = pArguments->GetInt32(2) == 0 ? FALSE : TRUE;
- }
- IXFA_Parser* pParser = IXFA_Parser::Create(m_pDocument);
- if (!pParser) {
+ bool bIgnoreRoot = true;
+ bool bOverwrite = 0;
+ wsExpression =
+ CFX_WideString::FromUTF8(pArguments->GetUTF8String(0).AsStringC());
+ if (wsExpression.IsEmpty())
return;
- }
- CFDE_XMLNode* pXMLNode = NULL;
- int32_t iParserStatus = pParser->ParseXMLData(wsExpression, pXMLNode, NULL);
- if (iParserStatus != XFA_PARSESTATUS_Done || !pXMLNode) {
- pParser->Release();
- pParser = NULL;
+ if (iLength >= 2)
+ bIgnoreRoot = !!pArguments->GetInt32(1);
+ if (iLength >= 3)
+ bOverwrite = !!pArguments->GetInt32(2);
+ std::unique_ptr<IXFA_Parser> pParser(IXFA_Parser::Create(m_pDocument));
Tom Sepez 2016/05/26 23:55:03 Did we get rid of the Release() in IXFA_Parser in
Wei Li 2016/05/27 00:51:45 thanks, added for the other two unique_ptrs as wel
+ if (!pParser)
+ return;
+ CFDE_XMLNode* pXMLNode = nullptr;
+ int32_t iParserStatus =
+ pParser->ParseXMLData(wsExpression, pXMLNode, nullptr);
+ if (iParserStatus != XFA_PARSESTATUS_Done || !pXMLNode)
return;
- }
if (bIgnoreRoot &&
(pXMLNode->GetType() != FDE_XMLNODE_Element ||
XFA_RecognizeRichText(static_cast<CFDE_XMLElement*>(pXMLNode)))) {
- bIgnoreRoot = FALSE;
+ bIgnoreRoot = false;
}
CXFA_Node* pFakeRoot = Clone(FALSE);
CFX_WideStringC wsContentType = GetCData(XFA_ATTRIBUTE_ContentType);
@@ -999,7 +983,7 @@ void CXFA_Node::Script_NodeClass_LoadXML(CFXJSE_Arguments* pArguments) {
CFDE_XMLNode* pFakeXMLRoot = pFakeRoot->GetXMLMappingNode();
if (!pFakeXMLRoot) {
CFDE_XMLNode* pThisXMLRoot = GetXMLMappingNode();
- pFakeXMLRoot = pThisXMLRoot ? pThisXMLRoot->Clone(FALSE) : NULL;
+ pFakeXMLRoot = pThisXMLRoot ? pThisXMLRoot->Clone(FALSE) : nullptr;
}
if (!pFakeXMLRoot) {
CFX_WideStringC wsClassName;
@@ -1047,11 +1031,10 @@ void CXFA_Node::Script_NodeClass_LoadXML(CFXJSE_Arguments* pArguments) {
CFDE_XMLNode* pTempXMLNode = GetXMLMappingNode();
SetXMLMappingNode(pFakeXMLRoot);
SetFlag(XFA_NODEFLAG_OwnXMLNode, false);
- if (pTempXMLNode &&
- pTempXMLNode->GetNodeItem(CFDE_XMLNode::Parent) == NULL) {
+ if (pTempXMLNode && !pTempXMLNode->GetNodeItem(CFDE_XMLNode::Parent)) {
pFakeXMLRoot = pTempXMLNode;
} else {
- pFakeXMLRoot = NULL;
+ pFakeXMLRoot = nullptr;
}
}
MoveBufferMapData(pFakeRoot, this, XFA_CalcData, TRUE);
@@ -1073,13 +1056,13 @@ void CXFA_Node::Script_NodeClass_LoadXML(CFXJSE_Arguments* pArguments) {
} else {
if (pFakeXMLRoot) {
pFakeXMLRoot->Release();
- pFakeXMLRoot = NULL;
+ pFakeXMLRoot = nullptr;
}
}
- pParser->Release();
- pParser = NULL;
}
+
void CXFA_Node::Script_NodeClass_SaveFilteredXML(CFXJSE_Arguments* pArguments) {
+ // TODO(weili): Check whether we need to implement this, pdfium:501.
}
void CXFA_Node::Script_NodeClass_SaveXML(CFXJSE_Arguments* pArguments) {
@@ -1088,13 +1071,13 @@ void CXFA_Node::Script_NodeClass_SaveXML(CFXJSE_Arguments* pArguments) {
ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"saveXML");
return;
}
- FX_BOOL bPrettyMode = FALSE;
+ bool bPrettyMode = false;
if (iLength == 1) {
if (pArguments->GetUTF8String(0) != "pretty") {
ThrowScriptErrorMessage(XFA_IDS_ARGUMENT_MISMATCH);
return;
}
- bPrettyMode = TRUE;
+ bPrettyMode = true;
}
CFX_ByteStringC bsXMLHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
if (GetPacketID() == XFA_XDPPACKET_Form ||
@@ -1120,7 +1103,7 @@ void CXFA_Node::Script_NodeClass_SaveXML(CFXJSE_Arguments* pArguments) {
pStream->SetCodePage(FX_CODEPAGE_UTF8);
pStream->WriteData(bsXMLHeader.raw_str(), bsXMLHeader.GetLength());
if (GetPacketID() == XFA_XDPPACKET_Form)
- XFA_DataExporter_RegenerateFormFile(this, pStream.get(), NULL, TRUE);
+ XFA_DataExporter_RegenerateFormFile(this, pStream.get(), nullptr, TRUE);
else
pElement->SaveXMLNode(pStream.get());
// TODO(weili): Check whether we need to save pretty print XML, pdfium:501.
@@ -1145,7 +1128,7 @@ void CXFA_Node::Script_NodeClass_SetAttribute(CFXJSE_Arguments* pArguments) {
CFX_WideString::FromUTF8(pArguments->GetUTF8String(0).AsStringC());
CFX_WideString wsAttribute =
CFX_WideString::FromUTF8(pArguments->GetUTF8String(1).AsStringC());
- SetAttribute(wsAttribute.AsStringC(), wsAttributeValue.AsStringC(), TRUE);
+ SetAttribute(wsAttribute.AsStringC(), wsAttributeValue.AsStringC(), true);
}
void CXFA_Node::Script_NodeClass_SetElement(CFXJSE_Arguments* pArguments) {
@@ -1156,11 +1139,9 @@ void CXFA_Node::Script_NodeClass_SetElement(CFXJSE_Arguments* pArguments) {
}
CXFA_Node* pNode = nullptr;
CFX_WideString wsName;
- if (iLength >= 1)
- pNode = static_cast<CXFA_Node*>(pArguments->GetObject(0));
- if (iLength >= 2) {
+ pNode = static_cast<CXFA_Node*>(pArguments->GetObject(0));
+ if (iLength == 2)
wsName = CFX_WideString::FromUTF8(pArguments->GetUTF8String(1).AsStringC());
- }
// TODO(weili): check whether we need to implement this, pdfium:501.
// For now, just put the variables here to avoid unused variable warning.
(void)pNode;
@@ -1178,6 +1159,7 @@ void CXFA_Node::Script_NodeClass_Ns(CFXJSE_Value* pValue,
FXJSE_Value_SetUTF8String(pValue, FX_UTF8Encode(wsNameSpace).AsStringC());
}
}
+
void CXFA_Node::Script_NodeClass_Model(CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {
@@ -1188,15 +1170,16 @@ void CXFA_Node::Script_NodeClass_Model(CFXJSE_Value* pValue,
GetModelNode()));
}
}
+
void CXFA_Node::Script_NodeClass_IsContainer(CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {
- if (bSetting) {
+ if (bSetting)
ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
- } else {
+ else
FXJSE_Value_SetBoolean(pValue, IsContainerNode());
- }
}
+
void CXFA_Node::Script_NodeClass_IsNull(CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {
@@ -1211,6 +1194,7 @@ void CXFA_Node::Script_NodeClass_IsNull(CFXJSE_Value* pValue,
FXJSE_Value_SetBoolean(pValue, !TryContent(strValue) || strValue.IsEmpty());
}
}
+
void CXFA_Node::Script_NodeClass_OneOfChild(CFXJSE_Value* pValue,
FX_BOOL bSetting,
XFA_ATTRIBUTE eAttribute) {
@@ -1226,6 +1210,7 @@ void CXFA_Node::Script_NodeClass_OneOfChild(CFXJSE_Value* pValue,
}
}
}
+
void CXFA_Node::Script_ContainerClass_GetDelta(CFXJSE_Arguments* pArguments) {}
void CXFA_Node::Script_ContainerClass_GetDeltas(CFXJSE_Arguments* pArguments) {
CXFA_ArrayNodeList* pFormNodes = new CXFA_ArrayNodeList(m_pDocument);
@@ -1475,7 +1460,7 @@ void CXFA_Node::Script_Attribute_String(CFXJSE_Value* pValue,
wsSOM = wsUseVal;
}
}
- CXFA_Node* pProtoNode = NULL;
+ CXFA_Node* pProtoNode = nullptr;
if (!wsSOM.IsEmpty()) {
uint32_t dwFlag = XFA_RESOLVENODE_Children |
XFA_RESOLVENODE_Attributes |
@@ -1653,7 +1638,7 @@ void CXFA_Node::Script_Som_DefaultValue(CFXJSE_Value* pValue,
}
CFX_WideString wsNewValue = CFX_WideString::FromUTF8(newValue.AsStringC());
CFX_WideString wsFormatValue(wsNewValue);
- CXFA_WidgetData* pContainerWidgetData = NULL;
+ CXFA_WidgetData* pContainerWidgetData = nullptr;
if (GetPacketID() == XFA_XDPPACKET_Datasets) {
CXFA_NodeArray formNodes;
GetBindItems(formNodes);
@@ -1671,7 +1656,7 @@ void CXFA_Node::Script_Som_DefaultValue(CFXJSE_Value* pValue,
if (!wsPicture.IsEmpty()) {
break;
}
- pContainerWidgetData = NULL;
+ pContainerWidgetData = nullptr;
}
} else if (GetPacketID() == XFA_XDPPACKET_Form) {
pContainerWidgetData = GetContainerWidgetData();
@@ -2414,7 +2399,7 @@ void CXFA_Node::Script_ExclGroup_SelectedMember(CFXJSE_Arguments* pArguments) {
if (!pWidgetData) {
FXJSE_Value_SetNull(pArguments->GetReturnValue());
} else {
- CXFA_Node* pReturnNode = NULL;
+ CXFA_Node* pReturnNode = nullptr;
if (argc == 0) {
pReturnNode = pWidgetData->GetSelectedMember();
} else {
@@ -2498,7 +2483,7 @@ static CXFA_Node* XFA_ScriptInstanceManager_GetItem(CXFA_Node* pInstMgrNode,
CFX_WideStringC wsInstName = pInstMgrNode->GetCData(XFA_ATTRIBUTE_Name);
if (wsInstName.GetLength() < 1 || wsInstName.GetAt(0) != '_' ||
wsInstName.Mid(1) != wsName) {
- return NULL;
+ return nullptr;
}
dwNameHash = pNode->GetNameHash();
}
@@ -2510,7 +2495,7 @@ static CXFA_Node* XFA_ScriptInstanceManager_GetItem(CXFA_Node* pInstMgrNode,
return pNode;
}
}
- return NULL;
+ return nullptr;
}
void CXFA_Node::Script_Som_InstanceIndex(CFXJSE_Value* pValue,
FX_BOOL bSetting,
@@ -2518,7 +2503,7 @@ void CXFA_Node::Script_Som_InstanceIndex(CFXJSE_Value* pValue,
if (bSetting) {
int32_t iTo = FXJSE_Value_ToInteger(pValue);
int32_t iFrom = Subform_and_SubformSet_InstanceIndex();
- CXFA_Node* pManagerNode = NULL;
+ CXFA_Node* pManagerNode = nullptr;
for (CXFA_Node* pNode = GetNodeItem(XFA_NODEITEM_PrevSibling); pNode;
pNode = pNode->GetNodeItem(XFA_NODEITEM_PrevSibling)) {
if (pNode->GetClassID() == XFA_ELEMENT_InstanceManager) {
@@ -2552,7 +2537,7 @@ void CXFA_Node::Script_Subform_InstanceManager(CFXJSE_Value* pValue,
XFA_ATTRIBUTE eAttribute) {
if (!bSetting) {
CFX_WideStringC wsName = GetCData(XFA_ATTRIBUTE_Name);
- CXFA_Node* pInstanceMgr = NULL;
+ CXFA_Node* pInstanceMgr = nullptr;
for (CXFA_Node* pNode = GetNodeItem(XFA_NODEITEM_PrevSibling); pNode;
pNode = pNode->GetNodeItem(XFA_NODEITEM_PrevSibling)) {
if (pNode->GetClassID() == XFA_ELEMENT_InstanceManager) {
@@ -3051,7 +3036,7 @@ static void XFA_ScriptInstanceManager_RemoveItem(
pDataParent->RemoveChild(pDataNode);
}
}
- pFormNode->SetObject(XFA_ATTRIBUTE_BindingNode, NULL);
+ pFormNode->SetObject(XFA_ATTRIBUTE_BindingNode, nullptr);
}
}
static CXFA_Node* XFA_ScriptInstanceManager_CreateInstance(
@@ -3060,7 +3045,7 @@ static CXFA_Node* XFA_ScriptInstanceManager_CreateInstance(
CXFA_Document* pDocument = pInstMgrNode->GetDocument();
CXFA_Node* pTemplateNode = pInstMgrNode->GetTemplateNode();
CXFA_Node* pFormParent = pInstMgrNode->GetNodeItem(XFA_NODEITEM_Parent);
- CXFA_Node* pDataScope = NULL;
+ CXFA_Node* pDataScope = nullptr;
for (CXFA_Node* pRootBoundNode = pFormParent;
pRootBoundNode &&
pRootBoundNode->GetObjectType() == XFA_OBJECTTYPE_ContainerNode;
@@ -3717,9 +3702,9 @@ FX_BOOL CXFA_Node::SetAttribute(XFA_ATTRIBUTE eAttr,
const CFX_WideStringC& wsValue,
bool bNotify) {
const XFA_ATTRIBUTEINFO* pAttr = XFA_GetAttributeByID(eAttr);
- if (pAttr == NULL) {
+ if (!pAttr)
return FALSE;
- }
+
XFA_ATTRIBUTETYPE eType = pAttr->eType;
if (eType == XFA_ATTRIBUTETYPE_NOTSURE) {
const XFA_NOTSUREATTRIBUTE* pNotsure =
@@ -3754,7 +3739,7 @@ FX_BOOL CXFA_Node::GetAttribute(XFA_ATTRIBUTE eAttr,
CFX_WideString& wsValue,
FX_BOOL bUseDefault) {
const XFA_ATTRIBUTEINFO* pAttr = XFA_GetAttributeByID(eAttr);
- if (pAttr == NULL) {
+ if (!pAttr) {
return FALSE;
}
XFA_ATTRIBUTETYPE eType = pAttr->eType;
@@ -3842,7 +3827,7 @@ FX_BOOL CXFA_Node::RemoveAttribute(const CFX_WideStringC& wsAttr) {
FX_BOOL CXFA_Node::TryBoolean(XFA_ATTRIBUTE eAttr,
FX_BOOL& bValue,
FX_BOOL bUseDefault) {
- void* pValue = NULL;
+ void* pValue = nullptr;
if (!GetValue(eAttr, XFA_ATTRIBUTETYPE_Boolean, bUseDefault, pValue)) {
Tom Sepez 2016/05/26 23:55:03 nit: no {}
Wei Li 2016/05/27 00:51:46 Done.
return FALSE;
}
@@ -3852,7 +3837,7 @@ FX_BOOL CXFA_Node::TryBoolean(XFA_ATTRIBUTE eAttr,
FX_BOOL CXFA_Node::TryInteger(XFA_ATTRIBUTE eAttr,
int32_t& iValue,
FX_BOOL bUseDefault) {
- void* pValue = NULL;
+ void* pValue = nullptr;
if (!GetValue(eAttr, XFA_ATTRIBUTETYPE_Integer, bUseDefault, pValue)) {
Tom Sepez 2016/05/26 23:55:04 ditto
Wei Li 2016/05/27 00:51:45 Done.
return FALSE;
}
@@ -3862,7 +3847,7 @@ FX_BOOL CXFA_Node::TryInteger(XFA_ATTRIBUTE eAttr,
FX_BOOL CXFA_Node::TryEnum(XFA_ATTRIBUTE eAttr,
XFA_ATTRIBUTEENUM& eValue,
FX_BOOL bUseDefault) {
- void* pValue = NULL;
+ void* pValue = nullptr;
if (!GetValue(eAttr, XFA_ATTRIBUTETYPE_Enum, bUseDefault, pValue)) {
Tom Sepez 2016/05/26 23:55:04 ditto
Wei Li 2016/05/27 00:51:45 Done.
return FALSE;
}
@@ -4046,7 +4031,7 @@ FX_BOOL CXFA_Node::TryCData(XFA_ATTRIBUTE eAttr,
if (!bUseDefault) {
return FALSE;
}
- void* pValue = NULL;
+ void* pValue = nullptr;
if (XFA_GetAttributeDefaultValue(pValue, GetClassID(), eAttr,
XFA_ATTRIBUTETYPE_Cdata, m_ePacket)) {
wsValue = (const FX_WCHAR*)pValue;
@@ -4073,7 +4058,7 @@ FX_BOOL CXFA_Node::TryCData(XFA_ATTRIBUTE eAttr,
if (!bUseDefault) {
return FALSE;
}
- void* pValue = NULL;
+ void* pValue = nullptr;
if (XFA_GetAttributeDefaultValue(pValue, GetClassID(), eAttr,
XFA_ATTRIBUTETYPE_Cdata, m_ePacket)) {
wsValue = (CFX_WideStringC)(const FX_WCHAR*)pValue;
@@ -4090,7 +4075,7 @@ FX_BOOL CXFA_Node::SetObject(XFA_ATTRIBUTE eAttr,
FX_BOOL CXFA_Node::TryObject(XFA_ATTRIBUTE eAttr, void*& pData) {
void* pKey = XFA_GetMapKey_Element(GetClassID(), eAttr);
pData = GetUserData(pKey);
- return pData != NULL;
+ return pData != nullptr;
}
FX_BOOL CXFA_Node::SetValue(XFA_ATTRIBUTE eAttr,
XFA_ATTRIBUTETYPE eType,
@@ -4143,7 +4128,7 @@ FX_BOOL CXFA_Node::GetValue(XFA_ATTRIBUTE eAttr,
}
static void XFA_DefaultFreeData(void* pData) {}
static XFA_MAPDATABLOCKCALLBACKINFO gs_XFADefaultFreeData = {
- XFA_DefaultFreeData, NULL};
+ XFA_DefaultFreeData, nullptr};
FX_BOOL CXFA_Node::SetUserData(void* pKey,
void* pData,
XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo) {
@@ -4163,8 +4148,8 @@ FX_BOOL CXFA_Node::SetScriptContent(const CFX_WideString& wsContent,
bool bNotify,
FX_BOOL bScriptModify,
FX_BOOL bSyncData) {
- CXFA_Node* pNode = NULL;
- CXFA_Node* pBindNode = NULL;
+ CXFA_Node* pNode = nullptr;
+ CXFA_Node* pBindNode = nullptr;
switch (GetObjectType()) {
case XFA_OBJECTTYPE_ContainerNode: {
if (XFA_FieldIsMultiListBox(this)) {
@@ -4207,7 +4192,7 @@ FX_BOOL CXFA_Node::SetScriptContent(const CFX_WideString& wsContent,
valueNodes, XFA_NODEFILTER_Children, XFA_ELEMENT_DataValue);
if (iDatas < iSize) {
int32_t iAddNodes = iSize - iDatas;
- CXFA_Node* pValueNodes = NULL;
+ CXFA_Node* pValueNodes = nullptr;
while (iAddNodes-- > 0) {
pValueNodes =
pBind->CreateSamePacketNode(XFA_ELEMENT_DataValue);
@@ -4215,7 +4200,7 @@ FX_BOOL CXFA_Node::SetScriptContent(const CFX_WideString& wsContent,
pValueNodes->CreateXMLMappingNode();
pBind->InsertChild(pValueNodes);
}
- pValueNodes = NULL;
+ pValueNodes = nullptr;
} else if (iDatas > iSize) {
int32_t iDelNodes = iDatas - iSize;
while (iDelNodes-- > 0) {
@@ -4267,7 +4252,7 @@ FX_BOOL CXFA_Node::SetScriptContent(const CFX_WideString& wsContent,
pNode->SetScriptContent(wsContent, wsContent, bNotify, true, FALSE);
}
}
- pBindNode = NULL;
+ pBindNode = nullptr;
break;
}
case XFA_OBJECTTYPE_ContentNode: {
@@ -4352,7 +4337,7 @@ CFX_WideString CXFA_Node::GetContent() {
FX_BOOL CXFA_Node::TryContent(CFX_WideString& wsContent,
FX_BOOL bScriptModify,
FX_BOOL bProto) {
- CXFA_Node* pNode = NULL;
+ CXFA_Node* pNode = nullptr;
switch (GetObjectType()) {
case XFA_OBJECTTYPE_ContainerNode:
if (GetClassID() == XFA_ELEMENT_ExclGroup) {
@@ -4473,9 +4458,9 @@ CXFA_Node* CXFA_Node::GetProperty(int32_t index,
uint32_t dwPacket = GetPacketID();
const XFA_PROPERTY* pProperty =
XFA_GetPropertyOfElement(eElement, eProperty, dwPacket);
- if (pProperty == NULL || index >= pProperty->uOccur) {
- return NULL;
- }
+ if (!pProperty || index >= pProperty->uOccur)
+ return nullptr;
+
CXFA_Node* pNode = m_pChild;
int32_t iCount = 0;
for (; pNode; pNode = pNode->GetNodeItem(XFA_NODEITEM_NextSibling)) {
@@ -4486,16 +4471,16 @@ CXFA_Node* CXFA_Node::GetProperty(int32_t index,
}
}
}
- if (!bCreateProperty) {
- return NULL;
- }
+ if (!bCreateProperty)
+ return nullptr;
+
if (pProperty->uFlags & XFA_PROPERTYFLAG_OneOf) {
pNode = m_pChild;
for (; pNode; pNode = pNode->GetNodeItem(XFA_NODEITEM_NextSibling)) {
const XFA_PROPERTY* pExistProperty =
XFA_GetPropertyOfElement(eElement, pNode->GetClassID(), dwPacket);
if (pExistProperty && (pExistProperty->uFlags & XFA_PROPERTYFLAG_OneOf)) {
Tom Sepez 2016/05/26 23:55:03 nit: no {}
Wei Li 2016/05/27 00:51:45 Done.
- return NULL;
+ return nullptr;
}
}
}
@@ -4505,7 +4490,7 @@ CXFA_Node* CXFA_Node::GetProperty(int32_t index,
for (; iCount <= index; iCount++) {
pNewNode = pFactory->CreateNode(pPacket, eProperty);
if (!pNewNode) {
Tom Sepez 2016/05/26 23:55:03 nit: no {}
Wei Li 2016/05/27 00:51:45 Done.
- return NULL;
+ return nullptr;
}
InsertChild(pNewNode, nullptr);
pNewNode->SetFlag(XFA_NODEFLAG_Initialized, true);
@@ -4550,7 +4535,7 @@ CXFA_Node* CXFA_Node::GetChild(int32_t index,
}
}
}
- return NULL;
+ return nullptr;
}
int32_t CXFA_Node::InsertChild(int32_t index, CXFA_Node* pNode) {
ASSERT(!pNode->m_pNext);
@@ -4559,7 +4544,7 @@ int32_t CXFA_Node::InsertChild(int32_t index, CXFA_Node* pNode) {
ASSERT(ret);
(void)ret; // Avoid unused variable warning.
- if (m_pChild == NULL || index == 0) {
+ if (!m_pChild || index == 0) {
if (index > 0) {
return -1;
}
@@ -4581,18 +4566,18 @@ int32_t CXFA_Node::InsertChild(int32_t index, CXFA_Node* pNode) {
pPrev->m_pNext = pNode;
index = iCount;
}
- if (pNode->m_pNext == NULL) {
+ if (!pNode->m_pNext) {
m_pLastChild = pNode;
}
ASSERT(m_pLastChild);
- ASSERT(m_pLastChild->m_pNext == NULL);
+ ASSERT(!m_pLastChild->m_pNext);
pNode->ClearFlag(XFA_NODEFLAG_HasRemoved);
CXFA_FFNotify* pNotify = m_pDocument->GetParser()->GetNotify();
if (pNotify)
pNotify->OnChildAdded(this);
if (IsNeedSavingXMLNode() && pNode->m_pXMLNode) {
- ASSERT(pNode->m_pXMLNode->GetNodeItem(CFDE_XMLNode::Parent) == NULL);
+ ASSERT(!pNode->m_pXMLNode->GetNodeItem(CFDE_XMLNode::Parent));
m_pXMLNode->InsertChildNode(pNode->m_pXMLNode, index);
pNode->ClearFlag(XFA_NODEFLAG_OwnXMLNode);
}
@@ -4611,7 +4596,7 @@ FX_BOOL CXFA_Node::InsertChild(CXFA_Node* pNode, CXFA_Node* pBeforeNode) {
int32_t nIndex = -1;
pNode->m_pParent = this;
- if (m_pChild == NULL || pBeforeNode == m_pChild) {
+ if (!m_pChild || pBeforeNode == m_pChild) {
pNode->m_pNext = m_pChild;
m_pChild = pNode;
nIndex = 0;
@@ -4628,18 +4613,18 @@ FX_BOOL CXFA_Node::InsertChild(CXFA_Node* pNode, CXFA_Node* pBeforeNode) {
pNode->m_pNext = pPrev->m_pNext;
pPrev->m_pNext = pNode;
}
- if (pNode->m_pNext == NULL) {
+ if (!pNode->m_pNext) {
m_pLastChild = pNode;
}
ASSERT(m_pLastChild);
- ASSERT(m_pLastChild->m_pNext == NULL);
+ ASSERT(!m_pLastChild->m_pNext);
pNode->ClearFlag(XFA_NODEFLAG_HasRemoved);
CXFA_FFNotify* pNotify = m_pDocument->GetParser()->GetNotify();
if (pNotify)
pNotify->OnChildAdded(this);
if (IsNeedSavingXMLNode() && pNode->m_pXMLNode) {
- ASSERT(pNode->m_pXMLNode->GetNodeItem(CFDE_XMLNode::Parent) == NULL);
+ ASSERT(!pNode->m_pXMLNode->GetNodeItem(CFDE_XMLNode::Parent));
m_pXMLNode->InsertChildNode(pNode->m_pXMLNode, nIndex);
pNode->ClearFlag(XFA_NODEFLAG_OwnXMLNode);
}
@@ -4647,7 +4632,7 @@ FX_BOOL CXFA_Node::InsertChild(CXFA_Node* pNode, CXFA_Node* pBeforeNode) {
}
CXFA_Node* CXFA_Node::Deprecated_GetPrevSibling() {
if (!m_pParent) {
- return NULL;
+ return nullptr;
}
for (CXFA_Node* pSibling = m_pParent->m_pChild; pSibling;
pSibling = pSibling->m_pNext) {
@@ -4655,10 +4640,10 @@ CXFA_Node* CXFA_Node::Deprecated_GetPrevSibling() {
return pSibling;
}
}
- return NULL;
+ return nullptr;
}
FX_BOOL CXFA_Node::RemoveChild(CXFA_Node* pNode, bool bNotify) {
- if (pNode == NULL || pNode->m_pParent != this) {
+ if (!pNode || pNode->m_pParent != this) {
ASSERT(FALSE);
return FALSE;
}
@@ -4667,18 +4652,18 @@ FX_BOOL CXFA_Node::RemoveChild(CXFA_Node* pNode, bool bNotify) {
if (m_pLastChild == pNode) {
m_pLastChild = pNode->m_pNext;
}
- pNode->m_pNext = NULL;
- pNode->m_pParent = NULL;
+ pNode->m_pNext = nullptr;
+ pNode->m_pParent = nullptr;
} else {
CXFA_Node* pPrev = pNode->Deprecated_GetPrevSibling();
pPrev->m_pNext = pNode->m_pNext;
if (m_pLastChild == pNode) {
m_pLastChild = pNode->m_pNext ? pNode->m_pNext : pPrev;
}
- pNode->m_pNext = NULL;
- pNode->m_pParent = NULL;
+ pNode->m_pNext = nullptr;
+ pNode->m_pParent = nullptr;
}
- ASSERT(m_pLastChild == NULL || m_pLastChild->m_pNext == NULL);
+ ASSERT(!m_pLastChild || !m_pLastChild->m_pNext);
OnRemoved(bNotify);
pNode->SetFlag(XFA_NODEFLAG_HasRemoved, true);
m_pDocument->AddPurgeNode(pNode);
@@ -4719,7 +4704,7 @@ CXFA_Node* CXFA_Node::GetFirstChildByName(uint32_t dwNameHash) const {
return pNode;
}
}
- return NULL;
+ return nullptr;
}
CXFA_Node* CXFA_Node::GetFirstChildByClass(XFA_ELEMENT eElement) const {
for (CXFA_Node* pNode = GetNodeItem(XFA_NODEITEM_FirstChild); pNode;
@@ -4728,7 +4713,7 @@ CXFA_Node* CXFA_Node::GetFirstChildByClass(XFA_ELEMENT eElement) const {
return pNode;
}
}
- return NULL;
+ return nullptr;
}
CXFA_Node* CXFA_Node::GetNextSameNameSibling(uint32_t dwNameHash) const {
for (CXFA_Node* pNode = GetNodeItem(XFA_NODEITEM_NextSibling); pNode;
@@ -4737,7 +4722,7 @@ CXFA_Node* CXFA_Node::GetNextSameNameSibling(uint32_t dwNameHash) const {
return pNode;
}
}
- return NULL;
+ return nullptr;
}
CXFA_Node* CXFA_Node::GetNextSameNameSibling(
const CFX_WideStringC& wsNodeName) const {
@@ -4750,7 +4735,7 @@ CXFA_Node* CXFA_Node::GetNextSameClassSibling(XFA_ELEMENT eElement) const {
return pNode;
}
}
- return NULL;
+ return nullptr;
}
int32_t CXFA_Node::GetNodeSameNameIndex() const {
CXFA_ScriptContext* pScriptContext = m_pDocument->GetScriptContext();
@@ -4774,7 +4759,7 @@ void CXFA_Node::GetSOMExpression(CFX_WideString& wsSOMExpression) {
pScriptContext->GetSomExpression(this, wsSOMExpression);
}
CXFA_Node* CXFA_Node::GetInstanceMgrOfSubform() {
- CXFA_Node* pInstanceMgr = NULL;
+ CXFA_Node* pInstanceMgr = nullptr;
if (m_ePacket == XFA_XDPPACKET_Form) {
CXFA_Node* pParentNode = GetNodeItem(XFA_NODEITEM_Parent);
if (!pParentNode || pParentNode->GetClassID() == XFA_ELEMENT_Area) {
@@ -4970,7 +4955,7 @@ FX_BOOL CXFA_Node::GetMapModuleValue(void* pKey, void*& pValue) {
}
pNode = pNode->GetPacketID() != XFA_XDPPACKET_Datasets
? pNode->GetTemplateNode()
- : NULL;
+ : nullptr;
}
return FALSE;
}
@@ -4994,7 +4979,7 @@ void CXFA_Node::SetMapModuleBuffer(
XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo) {
XFA_MAPMODULEDATA* pModule = CreateMapModuleData();
XFA_MAPDATABLOCK*& pBuffer = pModule->m_BufferMap[pKey];
- if (pBuffer == NULL) {
+ if (!pBuffer) {
pBuffer =
(XFA_MAPDATABLOCK*)FX_Alloc(uint8_t, sizeof(XFA_MAPDATABLOCK) + iBytes);
} else if (pBuffer->iBytes != iBytes) {
@@ -5006,9 +4991,9 @@ void CXFA_Node::SetMapModuleBuffer(
} else if (pBuffer->pCallbackInfo && pBuffer->pCallbackInfo->pFree) {
pBuffer->pCallbackInfo->pFree(*(void**)pBuffer->GetData());
}
- if (pBuffer == NULL) {
+ if (!pBuffer)
return;
- }
+
pBuffer->pCallbackInfo = pCallbackInfo;
pBuffer->iBytes = iBytes;
FXSYS_memcpy(pBuffer->GetData(), pValue, iBytes);
@@ -5017,7 +5002,7 @@ FX_BOOL CXFA_Node::GetMapModuleBuffer(void* pKey,
void*& pValue,
int32_t& iBytes,
FX_BOOL bProtoAlso) const {
- XFA_MAPDATABLOCK* pBuffer = NULL;
+ XFA_MAPDATABLOCK* pBuffer = nullptr;
const CXFA_Node* pNode = this;
while (pNode) {
XFA_MAPMODULEDATA* pModule = pNode->GetMapModuleData();
@@ -5026,9 +5011,9 @@ FX_BOOL CXFA_Node::GetMapModuleBuffer(void* pKey,
}
pNode = (bProtoAlso && pNode->GetPacketID() != XFA_XDPPACKET_Datasets)
? pNode->GetTemplateNode()
- : NULL;
+ : nullptr;
}
- if (pBuffer == NULL) {
+ if (!pBuffer) {
return FALSE;
}
pValue = pBuffer->GetData();
@@ -5047,7 +5032,7 @@ FX_BOOL CXFA_Node::HasMapModuleKey(void* pKey, FX_BOOL bProtoAlso) {
}
pNode = (bProtoAlso && pNode->GetPacketID() != XFA_XDPPACKET_Datasets)
? pNode->GetTemplateNode()
- : NULL;
+ : nullptr;
}
return FALSE;
}
@@ -5057,7 +5042,7 @@ void CXFA_Node::RemoveMapModuleKey(void* pKey) {
return;
if (pKey) {
- XFA_MAPDATABLOCK* pBuffer = NULL;
+ XFA_MAPDATABLOCK* pBuffer = nullptr;
pModule->m_BufferMap.Lookup(pKey, pBuffer);
if (pBuffer) {
if (pBuffer->pCallbackInfo && pBuffer->pCallbackInfo->pFree) {
@@ -5117,7 +5102,7 @@ void CXFA_Node::MergeAllData(void* pDstModule, FX_BOOL bUseSrcAttr) {
}
continue;
}
- if (pBuffer == NULL) {
+ if (!pBuffer) {
pBuffer = (XFA_MAPDATABLOCK*)FX_Alloc(
uint8_t, sizeof(XFA_MAPDATABLOCK) + pSrcBuffer->iBytes);
} else if (pBuffer->iBytes != pSrcBuffer->iBytes) {
@@ -5129,7 +5114,7 @@ void CXFA_Node::MergeAllData(void* pDstModule, FX_BOOL bUseSrcAttr) {
} else if (pBuffer->pCallbackInfo && pBuffer->pCallbackInfo->pFree) {
pBuffer->pCallbackInfo->pFree(*(void**)pBuffer->GetData());
}
- if (pBuffer == NULL) {
+ if (!pBuffer) {
continue;
}
pBuffer->pCallbackInfo = pSrcBuffer->pCallbackInfo;
@@ -5151,8 +5136,8 @@ void CXFA_Node::MoveBufferMapData(CXFA_Node* pDstModule, void* pKey) {
if (pDstModule->GetClassID() != GetClassID()) {
bNeedMove = FALSE;
}
- XFA_MAPMODULEDATA* pSrcModuleData = NULL;
- XFA_MAPMODULEDATA* pDstModuleData = NULL;
+ XFA_MAPMODULEDATA* pSrcModuleData = nullptr;
+ XFA_MAPMODULEDATA* pDstModuleData = nullptr;
if (bNeedMove) {
pSrcModuleData = GetMapModuleData();
if (!pSrcModuleData) {
@@ -5209,7 +5194,7 @@ CXFA_Node* CXFA_NodeList::NamedItem(const CFX_WideStringC& wsName) {
if (dwHashCode == ret->GetNameHash())
return ret;
}
- return NULL;
+ return nullptr;
}
void CXFA_NodeList::Script_ListClass_Append(CFXJSE_Arguments* pArguments) {
int32_t argc = pArguments->GetLength();
@@ -5307,7 +5292,7 @@ FX_BOOL CXFA_ArrayNodeList::Append(CXFA_Node* pNode) {
}
FX_BOOL CXFA_ArrayNodeList::Insert(CXFA_Node* pNewNode,
CXFA_Node* pBeforeNode) {
- if (pBeforeNode == NULL) {
+ if (!pBeforeNode) {
m_array.Add(pNewNode);
} else {
int32_t iSize = m_array.GetSize();
@@ -5335,7 +5320,7 @@ CXFA_Node* CXFA_ArrayNodeList::Item(int32_t iIndex) {
if (iIndex >= 0 && iIndex < iSize) {
return m_array[iIndex];
}
- return NULL;
+ return nullptr;
}
CXFA_AttachNodeList::CXFA_AttachNodeList(CXFA_Document* pDocument,
CXFA_Node* pAttachNode)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698