summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-02 18:32:08 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-02 18:32:08 +0000
commita95fd60b7902b9f893d05189aa6c877eb2e73e90 (patch)
tree59c7e977600be1fe1f40a792fbe369708d7797b8 /xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
parent92492c1455e59c18f274c1f2b3ecfe9d042509fa (diff)
downloadpdfium-a95fd60b7902b9f893d05189aa6c877eb2e73e90.tar.xz
Remove default value from CJX_Node::GetProperty
This CL removes the GetProperty default value and inlines into the callers. Change-Id: I0e18f27b51046fdf37ddc57f34a31154729c8db0 Reviewed-on: https://pdfium-review.googlesource.com/17510 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/xfa_document_datamerger_imp.cpp')
-rw-r--r--xfa/fxfa/parser/xfa_document_datamerger_imp.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
index be052ebce5..a259432dfb 100644
--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
@@ -61,7 +61,7 @@ CXFA_Node* FormValueNode_CreateChild(CXFA_Node* pValueNode, XFA_Element iType) {
if (!pChildNode) {
if (iType == XFA_Element::Unknown)
return nullptr;
- pChildNode = pValueNode->JSNode()->GetProperty(0, iType);
+ pChildNode = pValueNode->JSNode()->GetProperty(0, iType, true);
}
return pChildNode;
}
@@ -129,7 +129,8 @@ void CreateDataBinding(CXFA_Node* pFormNode,
CXFA_WidgetData* pWidgetData = pFormNode->GetWidgetData();
ASSERT(pWidgetData);
XFA_Element eUIType = pWidgetData->GetUIType();
- CXFA_Value defValue(pFormNode->JSNode()->GetProperty(0, XFA_Element::Value));
+ CXFA_Value defValue(
+ pFormNode->JSNode()->GetProperty(0, XFA_Element::Value, true));
if (!bDataToForm) {
WideString wsValue;
WideString wsFormattedValue;
@@ -236,7 +237,7 @@ void CreateDataBinding(CXFA_Node* pFormNode,
continue;
CXFA_Node* pValue =
- pChild->JSNode()->GetProperty(0, XFA_Element::Value);
+ pChild->JSNode()->GetProperty(0, XFA_Element::Value, true);
CXFA_Node* pItems = pChild->GetChild(0, XFA_Element::Items);
CXFA_Node* pText =
pItems ? pItems->GetNodeItem(XFA_NODEITEM_FirstChild) : nullptr;
@@ -263,7 +264,7 @@ void CreateDataBinding(CXFA_Node* pFormNode,
pDataNode->JSNode()->SetAttributeValue(wsValue, wsFormattedValue, false,
false);
CXFA_Node* pValue =
- pFormNode->JSNode()->GetProperty(0, XFA_Element::Value);
+ pFormNode->JSNode()->GetProperty(0, XFA_Element::Value, true);
FormValueNode_SetChildContent(pValue, wsValue, XFA_Element::Float);
break;
}