| Index: xfa/fxfa/parser/xfa_object.h
|
| diff --git a/xfa/fxfa/parser/xfa_object.h b/xfa/fxfa/parser/xfa_object.h
|
| index c4eaa4cc60fbeab2f3a2bdb804c572ffdbaf08c8..036843fa318eaf183210c1ebd7cd9dc5cefe151d 100644
|
| --- a/xfa/fxfa/parser/xfa_object.h
|
| +++ b/xfa/fxfa/parser/xfa_object.h
|
| @@ -248,19 +248,19 @@ class CXFA_Node : public CXFA_Object {
|
| CXFA_Measurement GetMeasure(XFA_ATTRIBUTE eAttr) const;
|
| FX_BOOL SetObject(XFA_ATTRIBUTE eAttr,
|
| void* pData,
|
| - XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = NULL);
|
| + XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = nullptr);
|
| FX_BOOL TryObject(XFA_ATTRIBUTE eAttr, void*& pData);
|
| void* GetObject(XFA_ATTRIBUTE eAttr) {
|
| void* pData;
|
| - return TryObject(eAttr, pData) ? pData : NULL;
|
| + return TryObject(eAttr, pData) ? pData : nullptr;
|
| }
|
| FX_BOOL SetUserData(void* pKey,
|
| void* pData,
|
| - XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = NULL);
|
| + XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = nullptr);
|
| FX_BOOL TryUserData(void* pKey, void*& pData, FX_BOOL bProtoAlso = FALSE);
|
| void* GetUserData(void* pKey, FX_BOOL bProtoAlso = FALSE) {
|
| void* pData;
|
| - return TryUserData(pKey, pData, bProtoAlso) ? pData : NULL;
|
| + return TryUserData(pKey, pData, bProtoAlso) ? pData : nullptr;
|
| }
|
| CXFA_Node* GetProperty(int32_t index,
|
| XFA_ELEMENT eProperty,
|
| @@ -270,7 +270,7 @@ class CXFA_Node : public CXFA_Object {
|
| XFA_ELEMENT eElement,
|
| FX_BOOL bOnlyChild = FALSE);
|
| int32_t InsertChild(int32_t index, CXFA_Node* pNode);
|
| - FX_BOOL InsertChild(CXFA_Node* pNode, CXFA_Node* pBeforeNode = NULL);
|
| + FX_BOOL InsertChild(CXFA_Node* pNode, CXFA_Node* pBeforeNode = nullptr);
|
| FX_BOOL RemoveChild(CXFA_Node* pNode, bool bNotify = true);
|
| CXFA_Node* Clone(FX_BOOL bRecursive);
|
| CXFA_Node* GetNodeItem(XFA_NODEITEM eItem) const;
|
| @@ -313,7 +313,7 @@ class CXFA_Node : public CXFA_Object {
|
| void Script_Som_ResolveNodeList(CFXJSE_Value* pValue,
|
| CFX_WideString wsExpression,
|
| uint32_t dwFlag,
|
| - CXFA_Node* refNode = NULL);
|
| + CXFA_Node* refNode = nullptr);
|
| void Script_TreeClass_All(CFXJSE_Value* pValue,
|
| FX_BOOL bSetting,
|
| XFA_ATTRIBUTE eAttribute);
|
| @@ -621,16 +621,17 @@ class CXFA_Node : public CXFA_Object {
|
| FX_BOOL GetMapModuleValue(void* pKey, void*& pValue);
|
| void SetMapModuleString(void* pKey, const CFX_WideStringC& wsValue);
|
| FX_BOOL GetMapModuleString(void* pKey, CFX_WideStringC& wsValue);
|
| - void SetMapModuleBuffer(void* pKey,
|
| - void* pValue,
|
| - int32_t iBytes,
|
| - XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = NULL);
|
| + void SetMapModuleBuffer(
|
| + void* pKey,
|
| + void* pValue,
|
| + int32_t iBytes,
|
| + XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = nullptr);
|
| FX_BOOL GetMapModuleBuffer(void* pKey,
|
| void*& pValue,
|
| int32_t& iBytes,
|
| FX_BOOL bProtoAlso = TRUE) const;
|
| FX_BOOL HasMapModuleKey(void* pKey, FX_BOOL bProtoAlso = FALSE);
|
| - void RemoveMapModuleKey(void* pKey = NULL);
|
| + void RemoveMapModuleKey(void* pKey = nullptr);
|
| void MergeAllData(void* pDstModule, FX_BOOL bUseSrcAttr = TRUE);
|
| void MoveBufferMapData(CXFA_Node* pDstModule, void* pKey);
|
| void MoveBufferMapData(CXFA_Node* pSrcModule,
|
| @@ -667,8 +668,8 @@ class CXFA_ThisProxy : public CXFA_Object {
|
| public:
|
| CXFA_ThisProxy(CXFA_Node* pThisNode, CXFA_Node* pScriptNode)
|
| : CXFA_Object(pThisNode->GetDocument(), XFA_OBJECTTYPE_VariablesThis),
|
| - m_pThisNode(NULL),
|
| - m_pScriptNode(NULL) {
|
| + m_pThisNode(nullptr),
|
| + m_pScriptNode(nullptr) {
|
| m_pThisNode = pThisNode;
|
| m_pScriptNode = pScriptNode;
|
| }
|
| @@ -731,17 +732,17 @@ class CXFA_AttachNodeList : public CXFA_NodeList {
|
| class CXFA_TraverseStrategy_XFAContainerNode {
|
| public:
|
| static CXFA_Node* GetFirstChild(CXFA_Node* pTemplateNode,
|
| - void* pUserData = NULL) {
|
| + void* pUserData = nullptr) {
|
| return pTemplateNode->GetNodeItem(XFA_NODEITEM_FirstChild,
|
| XFA_OBJECTTYPE_ContainerNode);
|
| }
|
| static CXFA_Node* GetNextSibling(CXFA_Node* pTemplateNode,
|
| - void* pUserData = NULL) {
|
| + void* pUserData = nullptr) {
|
| return pTemplateNode->GetNodeItem(XFA_NODEITEM_NextSibling,
|
| XFA_OBJECTTYPE_ContainerNode);
|
| }
|
| static CXFA_Node* GetParent(CXFA_Node* pTemplateNode,
|
| - void* pUserData = NULL) {
|
| + void* pUserData = nullptr) {
|
| return pTemplateNode->GetNodeItem(XFA_NODEITEM_Parent,
|
| XFA_OBJECTTYPE_ContainerNode);
|
| }
|
|
|