From 9256ad5784fc437f60fbeb836fe2ecd18e028a5d Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 4 Dec 2017 18:20:07 +0000 Subject: Cleanup ResolveObjects params and return The return value of ResolveObjects is always used as a boolean, so change from int32_t. The XFA_RESOLVENODE_RS object was made a pointer from a ref. Change-Id: I030036c01101680e36f4ddf524b468354a2e6850 Reviewed-on: https://pdfium-review.googlesource.com/20331 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- fxjs/cfxjse_resolveprocessor.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'fxjs/cfxjse_resolveprocessor.cpp') diff --git a/fxjs/cfxjse_resolveprocessor.cpp b/fxjs/cfxjse_resolveprocessor.cpp index fb7bc555c6..eeeeefcf08 100644 --- a/fxjs/cfxjse_resolveprocessor.cpp +++ b/fxjs/cfxjse_resolveprocessor.cpp @@ -714,19 +714,19 @@ void CFXJSE_ResolveProcessor::SetStylesForChild(uint32_t dwParentStyles, } int32_t CFXJSE_ResolveProcessor::SetResultCreateNode( - XFA_RESOLVENODE_RS& resolveNodeRS, + XFA_RESOLVENODE_RS* resolveNodeRS, WideString& wsLastCondition) { if (m_pNodeHelper->m_pCreateParent) - resolveNodeRS.objects.push_back(m_pNodeHelper->m_pCreateParent); + resolveNodeRS->objects.push_back(m_pNodeHelper->m_pCreateParent); else m_pNodeHelper->CreateNode_ForCondition(wsLastCondition); - resolveNodeRS.dwFlags = m_pNodeHelper->m_iCreateFlag; - if (resolveNodeRS.dwFlags == XFA_RESOLVENODE_RSTYPE_CreateNodeOne) { + resolveNodeRS->dwFlags = m_pNodeHelper->m_iCreateFlag; + if (resolveNodeRS->dwFlags == XFA_RESOLVENODE_RSTYPE_CreateNodeOne) { if (m_pNodeHelper->m_iCurAllStart != -1) - resolveNodeRS.dwFlags = XFA_RESOLVENODE_RSTYPE_CreateNodeMidAll; + resolveNodeRS->dwFlags = XFA_RESOLVENODE_RSTYPE_CreateNodeMidAll; } - return pdfium::CollectionSize(resolveNodeRS.objects); + return pdfium::CollectionSize(resolveNodeRS->objects); } void CFXJSE_ResolveProcessor::SetIndexDataBind(WideString& wsNextCondition, -- cgit v1.2.3