From 33beb4e4d34547a4de43f4dee4b2b0483c526b5e Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 4 Dec 2017 19:12:16 +0000 Subject: Remove SetResultCreateNode This CL removes the SetResultCreateNode method and inlines into the one caller. The XFA_RESOLVENODE_RSTYPE enum is also renamed XFA_ResolveNode_RSType to make it easier to find XFA_RESOLVENODE_RS objects. Change-Id: I937b612be062c5b7b05fd8d2822cd12cb882ba06 Reviewed-on: https://pdfium-review.googlesource.com/20370 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_nodehelper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_nodehelper.cpp') diff --git a/xfa/fxfa/parser/cxfa_nodehelper.cpp b/xfa/fxfa/parser/cxfa_nodehelper.cpp index f11472a112..e3d6aa0bb5 100644 --- a/xfa/fxfa/parser/cxfa_nodehelper.cpp +++ b/xfa/fxfa/parser/cxfa_nodehelper.cpp @@ -18,7 +18,7 @@ CXFA_NodeHelper::CXFA_NodeHelper() : m_eLastCreateType(XFA_Element::DataValue), m_pCreateParent(nullptr), m_iCreateCount(0), - m_iCreateFlag(XFA_RESOLVENODE_RSTYPE_CreateNodeOne), + m_iCreateFlag(XFA_ResolveNode_RSType_CreateNodeOne), m_iCurAllStart(-1), m_pAllStartParent(nullptr) {} @@ -281,7 +281,7 @@ bool CXFA_NodeHelper::CreateNode_ForCondition(WideString& wsCondition) { WideString wsIndex(L"0"); bool bAll = false; if (iLen == 0) { - m_iCreateFlag = XFA_RESOLVENODE_RSTYPE_CreateNodeOne; + m_iCreateFlag = XFA_ResolveNode_RSType_CreateNodeOne; return false; } if (wsCondition[0] != '[') @@ -299,9 +299,9 @@ bool CXFA_NodeHelper::CreateNode_ForCondition(WideString& wsCondition) { } if (bAll) { wsIndex = L"1"; - m_iCreateFlag = XFA_RESOLVENODE_RSTYPE_CreateNodeAll; + m_iCreateFlag = XFA_ResolveNode_RSType_CreateNodeAll; } else { - m_iCreateFlag = XFA_RESOLVENODE_RSTYPE_CreateNodeOne; + m_iCreateFlag = XFA_ResolveNode_RSType_CreateNodeOne; wsIndex = wsCondition.Mid(i, iLen - 1 - i); } int32_t iIndex = wsIndex.GetInteger(); -- cgit v1.2.3