From 8946aec4c3e727aae806f9858c2329ce368dd517 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 2 Nov 2017 19:15:03 +0000 Subject: Remove default values from CJX_Node::TryContent This CL removes the default values from TryContent and inlines into the call sites. Change-Id: I2d3f41f77364a0b923931479a60e07eae98dd5a9 Reviewed-on: https://pdfium-review.googlesource.com/17550 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/parser/xfa_document_datamerger_imp.cpp') diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp index ee9e78f0e3..478a1783f6 100644 --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp @@ -221,7 +221,7 @@ void CreateDataBinding(CXFA_Node* pFormNode, continue; WideString wsContent; - if (pText->JSNode()->TryContent(wsContent) && + if (pText->JSNode()->TryContent(wsContent, false, true) && (wsContent == wsValue)) { pChecked = pChild; wsFormattedValue = wsValue; @@ -252,7 +252,7 @@ void CreateDataBinding(CXFA_Node* pFormNode, WideString wsContent; if (pText) - pText->JSNode()->TryContent(wsContent); + pText->JSNode()->TryContent(wsContent, false, true); FormValueNode_SetChildContent(pValue, wsContent, XFA_Element::Text); } @@ -288,7 +288,7 @@ void CreateDataBinding(CXFA_Node* pFormNode, } WideString wsXMLValue; - pDataNode->JSNode()->TryContent(wsXMLValue); + pDataNode->JSNode()->TryContent(wsXMLValue, false, true); WideString wsNormalizeValue; pWidgetData->GetNormalizeDataValue(wsXMLValue, wsNormalizeValue); pDataNode->JSNode()->SetAttributeValue(wsNormalizeValue, wsXMLValue, false, @@ -325,7 +325,7 @@ void CreateDataBinding(CXFA_Node* pFormNode, wsNormalizeValue.clear(); WideString wsItem; for (CXFA_Node* pNode : items) { - pNode->JSNode()->TryContent(wsItem); + pNode->JSNode()->TryContent(wsItem, false, true); wsItem = single ? wsItem : wsItem + L"\n"; wsNormalizeValue += wsItem; } -- cgit v1.2.3