From dd92aa5946259b3252beec2b4760adbfa9f985a4 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 20 Sep 2018 12:56:04 +0000 Subject: Fix misc lint errors and other cleanups. Change-Id: I00ce0109251d1231858e87ffc3889abe6937fa26 Reviewed-on: https://pdfium-review.googlesource.com/42811 Commit-Queue: dsinclair Reviewed-by: dsinclair --- xfa/fgas/layout/cfx_txtbreak_unittest.cpp | 1 + xfa/fxfa/parser/cxfa_document.cpp | 3 ++- xfa/fxfa/parser/cxfa_layoutpagemgr.cpp | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'xfa') diff --git a/xfa/fgas/layout/cfx_txtbreak_unittest.cpp b/xfa/fgas/layout/cfx_txtbreak_unittest.cpp index 8cac2fa036..2deadf4193 100644 --- a/xfa/fgas/layout/cfx_txtbreak_unittest.cpp +++ b/xfa/fgas/layout/cfx_txtbreak_unittest.cpp @@ -4,6 +4,7 @@ #include "xfa/fgas/layout/cfx_txtbreak.h" +#include #include #include "core/fxcrt/fx_bidi.h" diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp index 72bba2aeb0..c9369894a6 100644 --- a/xfa/fxfa/parser/cxfa_document.cpp +++ b/xfa/fxfa/parser/cxfa_document.cpp @@ -1648,7 +1648,8 @@ void CXFA_Document::DoDataMerge() { pDatasetsRoot->SetXMLMappingNode(pDatasetsXMLNode); } - CXFA_Node *pDataRoot = nullptr, *pDDRoot = nullptr; + CXFA_Node* pDataRoot = nullptr; + CXFA_Node* pDDRoot = nullptr; WideString wsDatasetsURI = pDatasetsRoot->JSObject()->TryNamespace().value_or(WideString()); for (CXFA_Node* pChildNode = pDatasetsRoot->GetFirstChild(); pChildNode; diff --git a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp index e603d91002..a7cbe42389 100644 --- a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp +++ b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp @@ -1718,7 +1718,8 @@ void CXFA_LayoutPageMgr::MergePageSetContents() { } int32_t iIndex = 0; - for (; pRootLayout; pRootLayout = ToContainerLayoutItem(pRootLayout->m_pNextSibling)) { + for (; pRootLayout; + pRootLayout = ToContainerLayoutItem(pRootLayout->m_pNextSibling)) { CXFA_Node* pPendingPageSet = nullptr; CXFA_NodeIteratorTemplate< CXFA_ContainerLayoutItem, @@ -1972,9 +1973,9 @@ void CXFA_LayoutPageMgr::SyncLayoutData() { } void XFA_ReleaseLayoutItem_NoPageArea(CXFA_LayoutItem* pLayoutItem) { - CXFA_LayoutItem *pNext, *pNode = pLayoutItem->m_pFirstChild; + CXFA_LayoutItem* pNode = pLayoutItem->m_pFirstChild; while (pNode) { - pNext = pNode->m_pNextSibling; + CXFA_LayoutItem* pNext = pNode->m_pNextSibling; pNode->m_pParent = nullptr; XFA_ReleaseLayoutItem_NoPageArea(pNode); pNode = pNext; -- cgit v1.2.3