diff options
| author | dan sinclair <dsinclair@chromium.org> | 2018-04-16 21:24:57 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-16 21:24:57 +0000 |
| commit | 8b0cf76f00c6e89e8bb7bf4bcf2189b27baac31c (patch) | |
| tree | ec18d4aa800ccd9d32f113f8ec41d89948479ab3 /xfa/fxfa/parser/cxfa_xmllocale.cpp | |
| parent | 262b496f25be27978abe7d98f20978820ecaeec8 (diff) | |
| download | pdfium-8b0cf76f00c6e89e8bb7bf4bcf2189b27baac31c.tar.xz | |
Merge CFX_XMLElement and CFX_XMLAttributeNode
CFX_XMLElement is the only subclass of CFX_XMLAttributeNode. This CL
merges the two classes together. The {Set|Get}String method has been
renamed to {Set|Get}Attribute to make it clearer what you're retrieving.
Change-Id: I158c961d4d8c5f563d937a3e7a35321a33622562
Reviewed-on: https://pdfium-review.googlesource.com/30710
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_xmllocale.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_xmllocale.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fxfa/parser/cxfa_xmllocale.cpp b/xfa/fxfa/parser/cxfa_xmllocale.cpp index 6720d56cba..4354ed98de 100644 --- a/xfa/fxfa/parser/cxfa_xmllocale.cpp +++ b/xfa/fxfa/parser/cxfa_xmllocale.cpp @@ -65,7 +65,7 @@ CXFA_XMLLocale::CXFA_XMLLocale(std::unique_ptr<CFX_XMLElement> root, CXFA_XMLLocale::~CXFA_XMLLocale() {} WideString CXFA_XMLLocale::GetName() const { - return locale_->GetString(L"name"); + return locale_->GetAttribute(L"name"); } WideString CXFA_XMLLocale::GetDecimalSymbol() const { @@ -136,7 +136,7 @@ WideString CXFA_XMLLocale::GetCalendarSymbol(const WideStringView& symbol, if (elem->GetName() != pstrSymbolNames) continue; - WideString abbr = elem->GetString(L"abbr"); + WideString abbr = elem->GetAttribute(L"abbr"); bool abbr_value = false; if (!abbr.IsEmpty()) abbr_value = abbr == L"1"; @@ -219,7 +219,7 @@ WideString CXFA_XMLLocale::GetPattern(CFX_XMLElement* patterns, CFX_XMLElement* pattern = static_cast<CFX_XMLElement*>(child); if (pattern->GetName() != bsTag) continue; - if (pattern->GetString(L"name") != wsName) + if (pattern->GetAttribute(L"name") != wsName) continue; return pattern->GetTextData(); |