diff options
author | dsinclair <dsinclair@chromium.org> | 2018-04-23 18:35:17 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-23 18:35:17 +0000 |
commit | bb47f9a442b5ea2196f18cb2df3cedd34b81b9ad (patch) | |
tree | 447c0360d9f2f2555c1c2d19e6f8d7e007e58503 /xfa/fxfa/parser/cxfa_xmllocale.cpp | |
parent | 857231a0723c0bf74ea6c13f1c3ce56548e23303 (diff) | |
download | pdfium-bb47f9a442b5ea2196f18cb2df3cedd34b81b9ad.tar.xz |
Revert "Change CFX_XML Save to take a write stream"
This reverts commit 9a3a7709103a872037dcea1f3cf0b7785a3da191.
Reason for revert: Gerrit did not do what I expected....
Original change's description:
> Change CFX_XML Save to take a write stream
>
> This CL changes CFX_XML to use an IFX_SeekableWriteStream instead of the more
> generic IFX_SeekableStream.
>
> Change-Id: I6e4def380c43eca755d91ad5cb6146c2dfdaee10
> Reviewed-on: https://pdfium-review.googlesource.com/30877
> Commit-Queue: dsinclair <dsinclair@chromium.org>
> Reviewed-by: Tom Sepez <tsepez@chromium.org>
TBR=tsepez@chromium.org,dsinclair@chromium.org,hnakashima@chromium.org
Change-Id: I137e53bf93285b88ade6832dedefca66e3b61e13
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://pdfium-review.googlesource.com/31211
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_xmllocale.cpp')
-rw-r--r-- | xfa/fxfa/parser/cxfa_xmllocale.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/xfa/fxfa/parser/cxfa_xmllocale.cpp b/xfa/fxfa/parser/cxfa_xmllocale.cpp index cbee75725a..ffb4cd9dde 100644 --- a/xfa/fxfa/parser/cxfa_xmllocale.cpp +++ b/xfa/fxfa/parser/cxfa_xmllocale.cpp @@ -38,10 +38,11 @@ std::unique_ptr<CXFA_XMLLocale> CXFA_XMLLocale::Create( return nullptr; CFX_XMLElement* locale = nullptr; - for (const auto& child : *(root.get())) { + for (auto* child = root->GetFirstChild(); child; + child = child->GetNextSibling()) { if (child->GetType() != FX_XMLNODE_Element) continue; - CFX_XMLElement* elem = static_cast<CFX_XMLElement*>(child.get()); + CFX_XMLElement* elem = static_cast<CFX_XMLElement*>(child); if (elem->GetName() == L"locale") { locale = elem; break; @@ -125,11 +126,12 @@ WideString CXFA_XMLLocale::GetCalendarSymbol(const WideStringView& symbol, WideString pstrSymbolNames = symbol + L"Names"; CFX_XMLElement* name_child = nullptr; - for (const auto& name : *child) { + for (auto* name = child->GetFirstChild(); name; + name = name->GetNextSibling()) { if (name->GetType() != FX_XMLNODE_Element) continue; - auto* elem = static_cast<CFX_XMLElement*>(name.get()); + auto* elem = static_cast<CFX_XMLElement*>(name); if (elem->GetName() != pstrSymbolNames) continue; @@ -208,11 +210,12 @@ WideString CXFA_XMLLocale::GetNumPattern(FX_LOCALENUMSUBCATEGORY eType) const { WideString CXFA_XMLLocale::GetPattern(CFX_XMLElement* patterns, const WideStringView& bsTag, const WideStringView& wsName) const { - for (const auto& child : *patterns) { + for (auto* child = patterns->GetFirstChild(); child; + child = child->GetNextSibling()) { if (child->GetType() != FX_XMLNODE_Element) continue; - CFX_XMLElement* pattern = static_cast<CFX_XMLElement*>(child.get()); + CFX_XMLElement* pattern = static_cast<CFX_XMLElement*>(child); if (pattern->GetName() != bsTag) continue; if (pattern->GetAttribute(L"name") != wsName) |