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/cxfa_textlayout.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/cxfa_textlayout.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_textlayout.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp index ac0eba70fa..67b9ca4cb1 100644 --- a/xfa/fxfa/cxfa_textlayout.cpp +++ b/xfa/fxfa/cxfa_textlayout.cpp @@ -78,13 +78,13 @@ CFX_XMLNode* CXFA_TextLayout::GetXMLContainerNode() { return nullptr; CFX_XMLNode* pXMLContainer = nullptr; - for (const auto& pXMLChild : *pXMLRoot) { + for (CFX_XMLNode* pXMLChild = pXMLRoot->GetFirstChild(); pXMLChild; + pXMLChild = pXMLChild->GetNextSibling()) { if (pXMLChild->GetType() == FX_XMLNODE_Element) { - CFX_XMLElement* pXMLElement = - static_cast<CFX_XMLElement*>(pXMLChild.get()); + CFX_XMLElement* pXMLElement = static_cast<CFX_XMLElement*>(pXMLChild); WideString wsTag = pXMLElement->GetLocalTagName(); if (wsTag == L"body" || wsTag == L"html") { - pXMLContainer = pXMLChild.get(); + pXMLContainer = pXMLChild; break; } } @@ -820,15 +820,15 @@ bool CXFA_TextLayout::LoadRichText( } } - for (const auto& pChildNode : *pXMLNode) { + for (CFX_XMLNode* pChildNode = pXMLNode->GetFirstChild(); pChildNode; + pChildNode = pChildNode->GetNextSibling()) { if (bCurOl) iLiCount++; - if (!LoadRichText(pChildNode.get(), textWidth, fLinePos, + if (!LoadRichText(pChildNode, textWidth, fLinePos, pContext ? pStyle : pParentStyle, bSavePieces, - pLinkData, true, bIsOl, iLiCount)) { + pLinkData, true, bIsOl, iLiCount)) return false; - } } if (m_pLoader) { |