From cf705715c5311057933ac03b395d9ea75b6f0660 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Sat, 4 Nov 2017 01:34:07 +0000 Subject: Remove default values from CXFA_Node::{Remove|Insert|Item} This CL removes the default values and inlines into the call sites as needed. Change-Id: I8ba6acfc99b5db508ce8711108e0676465eda47b Reviewed-on: https://pdfium-review.googlesource.com/17670 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- fxjs/cjx_node.cpp | 4 ++-- xfa/fxfa/parser/cxfa_node.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fxjs/cjx_node.cpp b/fxjs/cjx_node.cpp index 17553c940a..dc32e205bf 100644 --- a/fxjs/cjx_node.cpp +++ b/fxjs/cjx_node.cpp @@ -378,7 +378,7 @@ int32_t CJX_Node::InstanceManager_SetInstances(int32_t iDesired) { break; } if (pRemoveInstance->GetNameHash() == dInstanceNameHash) { - GetXFANode()->RemoveItem(pRemoveInstance); + GetXFANode()->RemoveItem(pRemoveInstance, true); iCount--; } } @@ -2510,7 +2510,7 @@ void CJX_Node::Script_InstanceManager_RemoveInstance( return; } CXFA_Node* pRemoveInstance = GetXFANode()->GetItem(iIndex); - GetXFANode()->RemoveItem(pRemoveInstance); + GetXFANode()->RemoveItem(pRemoveInstance, true); CXFA_FFNotify* pNotify = GetDocument()->GetNotify(); if (pNotify) { for (int32_t i = iIndex; i < iCount - 1; i++) { diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index 01f9b3df15..d8472eb3e9 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -63,11 +63,11 @@ class CXFA_Node : public CXFA_Object { CXFA_Node* CreateInstance(bool bDataMerge); int32_t GetCount(); CXFA_Node* GetItem(int32_t iIndex); - void RemoveItem(CXFA_Node* pRemoveInstance, bool bRemoveDataBinding = true); + void RemoveItem(CXFA_Node* pRemoveInstance, bool bRemoveDataBinding); void InsertItem(CXFA_Node* pNewInstance, int32_t iPos, - int32_t iCount = -1, - bool bMoveDataBindingNodes = true); + int32_t iCount, + bool bMoveDataBindingNodes); bool IsInitialized() const { return HasFlag(XFA_NodeFlag_Initialized); } bool IsOwnXMLNode() const { return HasFlag(XFA_NodeFlag_OwnXMLNode); } -- cgit v1.2.3