diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-02 20:42:18 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-02 20:42:18 +0000 |
| commit | 8bafef176a2a810373a386373fa3f558ae427984 (patch) | |
| tree | 594d42b3497583933e16b72ff161b3ffad4d96f6 /xfa/fxfa/parser/cxfa_widgetdata.cpp | |
| parent | 453d786b16e431ee9e8174de8b0c62358d81a8a0 (diff) | |
| download | pdfium-8bafef176a2a810373a386373fa3f558ae427984.tar.xz | |
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 <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_widgetdata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_widgetdata.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index e44c77d061..d65eff473c 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -253,7 +253,7 @@ XFA_Element CXFA_WidgetData::GetUIType() { } WideString CXFA_WidgetData::GetRawValue() { - return m_pNode->JSNode()->GetContent(); + return m_pNode->JSNode()->GetContent(false); } int32_t CXFA_WidgetData::GetAccess() { @@ -562,12 +562,12 @@ void CXFA_WidgetData::SetCheckState(XFA_CHECKSTATE eCheckState, bool bNotify) { if (!pItemchild) continue; - WideString text = pItemchild->JSNode()->GetContent(); + WideString text = pItemchild->JSNode()->GetContent(false); WideString wsChildValue = text; if (wsValue != text) { pItemchild = pItemchild->GetNodeItem(XFA_NODEITEM_NextSibling); if (pItemchild) - wsChildValue = pItemchild->JSNode()->GetContent(); + wsChildValue = pItemchild->JSNode()->GetContent(false); else wsChildValue.clear(); } @@ -651,11 +651,11 @@ void CXFA_WidgetData::SetSelectedMemberByValue(const WideStringView& wsValue, if (!pItemchild) continue; - WideString wsChildValue = pItemchild->JSNode()->GetContent(); + WideString wsChildValue = pItemchild->JSNode()->GetContent(false); if (wsValue != wsChildValue) { pItemchild = pItemchild->GetNodeItem(XFA_NODEITEM_NextSibling); if (pItemchild) - wsChildValue = pItemchild->JSNode()->GetContent(); + wsChildValue = pItemchild->JSNode()->GetContent(false); else wsChildValue.clear(); } else { @@ -1598,7 +1598,7 @@ IFX_Locale* CXFA_WidgetData::GetLocal() { bool CXFA_WidgetData::GetValue(WideString& wsValue, XFA_VALUEPICTURE eValueType) { - wsValue = m_pNode->JSNode()->GetContent(); + wsValue = m_pNode->JSNode()->GetContent(false); if (eValueType == XFA_VALUEPICTURE_Display) GetItemLabel(wsValue.AsStringView(), wsValue); |