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 ++++++------ xfa/fxfa/cxfa_textlayout.cpp | 4 ++-- xfa/fxfa/cxfa_widgetacc.cpp | 2 +- xfa/fxfa/parser/cxfa_nodelocale.cpp | 6 +++--- xfa/fxfa/parser/cxfa_widgetdata.cpp | 12 ++++++------ 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'xfa/fxfa') 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; diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp index 5d4d262999..84b183f76b 100644 --- a/xfa/fxfa/cxfa_textlayout.cpp +++ b/xfa/fxfa/cxfa_textlayout.cpp @@ -241,7 +241,7 @@ int32_t CXFA_TextLayout::GetText(WideString& wsText) { GetTextDataNode(); wsText.clear(); if (!m_bRichText) - wsText = m_pTextDataNode->JSNode()->GetContent(); + wsText = m_pTextDataNode->JSNode()->GetContent(false); return wsText.GetLength(); } @@ -676,7 +676,7 @@ void CXFA_TextLayout::LoadText(CXFA_Node* pNode, } } - WideString wsText = pNode->JSNode()->GetContent(); + WideString wsText = pNode->JSNode()->GetContent(false); wsText.TrimRight(L" "); bool bRet = AppendChar(wsText, fLinePos, fSpaceAbove, bSavePieces); if (bRet && m_pLoader) diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp index a75fa2a2b4..9dc9603377 100644 --- a/xfa/fxfa/cxfa_widgetacc.cpp +++ b/xfa/fxfa/cxfa_widgetacc.cpp @@ -226,7 +226,7 @@ void CXFA_WidgetAcc::ResetData() { if (pItems->CountChildren(XFA_Element::Unknown) > 1) { itemText = pItems->GetChild(1, XFA_Element::Unknown) ->JSNode() - ->GetContent(); + ->GetContent(false); } pAcc->SetValue(itemText, XFA_VALUEPICTURE_Raw); diff --git a/xfa/fxfa/parser/cxfa_nodelocale.cpp b/xfa/fxfa/parser/cxfa_nodelocale.cpp index 5a3eb20887..7a941dff66 100644 --- a/xfa/fxfa/parser/cxfa_nodelocale.cpp +++ b/xfa/fxfa/parser/cxfa_nodelocale.cpp @@ -71,7 +71,7 @@ WideString CXFA_NodeLocale::GetDateTimeSymbols() const { CXFA_Node* pSymbols = m_pLocale ? m_pLocale->GetChild(0, XFA_Element::DateTimeSymbols) : nullptr; - return pSymbols ? pSymbols->JSNode()->GetContent() : WideString(); + return pSymbols ? pSymbols->JSNode()->GetContent(false) : WideString(); } WideString CXFA_NodeLocale::GetMonthName(int32_t nMonth, bool bAbbr) const { @@ -149,7 +149,7 @@ WideString CXFA_NodeLocale::GetSymbol(XFA_Element eElement, const WideStringView& symbol_type) const { CXFA_Node* pSymbols = m_pLocale ? m_pLocale->GetChild(0, eElement) : nullptr; CXFA_Node* pSymbol = GetNodeByName(pSymbols, symbol_type); - return pSymbol ? pSymbol->JSNode()->GetContent() : WideString(); + return pSymbol ? pSymbol->JSNode()->GetContent(false) : WideString(); } WideString CXFA_NodeLocale::GetCalendarSymbol(XFA_Element eElement, @@ -165,7 +165,7 @@ WideString CXFA_NodeLocale::GetCalendarSymbol(XFA_Element eElement, for (; pNode; pNode = pNode->GetNextSameClassSibling(eElement)) { if (pNode->JSNode()->GetBoolean(XFA_ATTRIBUTE_Abbr) == bAbbr) { CXFA_Node* pSymbol = pNode->GetChild(index, XFA_Element::Unknown); - return pSymbol ? pSymbol->JSNode()->GetContent() : WideString(); + return pSymbol ? pSymbol->JSNode()->GetContent(false) : WideString(); } } return WideString(); 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); -- cgit v1.2.3