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_nodelocale.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_nodelocale.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_nodelocale.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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(); |