diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-12-04 18:20:07 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-04 18:20:07 +0000 |
| commit | 9256ad5784fc437f60fbeb836fe2ecd18e028a5d (patch) | |
| tree | 484d9e9c4697d50800c574b58d5db4cfa349b27c /xfa/fxfa/parser/cxfa_document.cpp | |
| parent | 76e336d26e78f6c6b5cdede6bb4b94ebddf3a2b1 (diff) | |
| download | pdfium-9256ad5784fc437f60fbeb836fe2ecd18e028a5d.tar.xz | |
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 <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_document.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_document.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp index a737baaafb..8e0d25d3a4 100644 --- a/xfa/fxfa/parser/cxfa_document.cpp +++ b/xfa/fxfa/parser/cxfa_document.cpp @@ -406,8 +406,8 @@ void CXFA_Document::DoProtoMerge() { XFA_RESOLVENODE_Properties | XFA_RESOLVENODE_Parent | XFA_RESOLVENODE_Siblings; XFA_RESOLVENODE_RS resolveNodeRS; - int32_t iRet = m_pScriptContext->ResolveObjects(pUseHrefNode, wsSOM, - resolveNodeRS, dwFlag); + int32_t iRet = m_pScriptContext->ResolveObjects( + pUseHrefNode, wsSOM, &resolveNodeRS, dwFlag, nullptr); if (iRet > 0 && resolveNodeRS.objects.front()->IsNode()) pProtoNode = resolveNodeRS.objects.front()->AsNode(); } else if (!wsID.IsEmpty()) { |