diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-04-23 18:14:16 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-23 18:14:16 +0000 |
| commit | 9a3a7709103a872037dcea1f3cf0b7785a3da191 (patch) | |
| tree | 262538d8f7f8e5b9703a7c37e7ec2f1b477aebe3 /xfa/fxfa/cxfa_textlayout.cpp | |
| parent | b557bdcbd1584a7e37f8883b0fc491e0641cfc9c (diff) | |
| download | pdfium-9a3a7709103a872037dcea1f3cf0b7785a3da191.tar.xz | |
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>
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 67b9ca4cb1..ac0eba70fa 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 (CFX_XMLNode* pXMLChild = pXMLRoot->GetFirstChild(); pXMLChild; - pXMLChild = pXMLChild->GetNextSibling()) { + for (const auto& pXMLChild : *pXMLRoot) { if (pXMLChild->GetType() == FX_XMLNODE_Element) { - CFX_XMLElement* pXMLElement = static_cast<CFX_XMLElement*>(pXMLChild); + CFX_XMLElement* pXMLElement = + static_cast<CFX_XMLElement*>(pXMLChild.get()); WideString wsTag = pXMLElement->GetLocalTagName(); if (wsTag == L"body" || wsTag == L"html") { - pXMLContainer = pXMLChild; + pXMLContainer = pXMLChild.get(); break; } } @@ -820,15 +820,15 @@ bool CXFA_TextLayout::LoadRichText( } } - for (CFX_XMLNode* pChildNode = pXMLNode->GetFirstChild(); pChildNode; - pChildNode = pChildNode->GetNextSibling()) { + for (const auto& pChildNode : *pXMLNode) { if (bCurOl) iLiCount++; - if (!LoadRichText(pChildNode, textWidth, fLinePos, + if (!LoadRichText(pChildNode.get(), textWidth, fLinePos, pContext ? pStyle : pParentStyle, bSavePieces, - pLinkData, true, bIsOl, iLiCount)) + pLinkData, true, bIsOl, iLiCount)) { return false; + } } if (m_pLoader) { |