From 8bafef176a2a810373a386373fa3f558ae427984 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 2 Nov 2017 20:42:18 +0000 Subject: Roll {Set|Get}ScriptContent into {Set|Get}Content The SetContent method was a proxy to SetScriptContent. The GetContent added a default param value. The methods have been merged and the GetContent call sites updated to pass in the needed value. Change-Id: I61f950bef8beec7157bdb22e0a25904729f9e00a Reviewed-on: https://pdfium-review.googlesource.com/17613 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- xfa/fxfa/cxfa_ffdocview.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'xfa/fxfa/cxfa_ffdocview.cpp') diff --git a/xfa/fxfa/cxfa_ffdocview.cpp b/xfa/fxfa/cxfa_ffdocview.cpp index 7d48a309ee..a2c4893446 100644 --- a/xfa/fxfa/cxfa_ffdocview.cpp +++ b/xfa/fxfa/cxfa_ffdocview.cpp @@ -281,7 +281,7 @@ int32_t CXFA_FFDocView::ProcessWidgetEvent(CXFA_EventParam* pParam, : nullptr; } if (pValidateNode) - wsValidateStr = pValidateNode->JSNode()->GetContent(); + wsValidateStr = pValidateNode->JSNode()->GetContent(false); } if (!wsValidateStr.Contains(L"preSubmit")) @@ -746,20 +746,20 @@ void CXFA_FFDocView::RunBindItems() { continue; if (bValueUseContent) { - wsValue = refNode->JSNode()->GetContent(); + wsValue = refNode->JSNode()->GetContent(false); } else { CXFA_Node* nodeValue = refNode->GetFirstChildByName(uValueHash); - wsValue = nodeValue ? nodeValue->JSNode()->GetContent() - : refNode->JSNode()->GetContent(); + wsValue = nodeValue ? nodeValue->JSNode()->GetContent(false) + : refNode->JSNode()->GetContent(false); } if (!bUseValue) { if (bLabelUseContent) { - wsLabel = refNode->JSNode()->GetContent(); + wsLabel = refNode->JSNode()->GetContent(false); } else { CXFA_Node* nodeLabel = refNode->GetFirstChildByName(wsLabelRef); if (nodeLabel) - wsLabel = nodeLabel->JSNode()->GetContent(); + wsLabel = nodeLabel->JSNode()->GetContent(false); } } else { wsLabel = wsValue; -- cgit v1.2.3