diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2016-02-24 09:51:16 -0500 |
---|---|---|
committer | Dan Sinclair <dsinclair@chromium.org> | 2016-02-24 09:51:16 -0500 |
commit | 50cce609050e1a40e1d6936e0a3f0614b4483eee (patch) | |
tree | bdcd3399ee0c2fc5352ec8b008499a91ee08a422 /xfa/src/fxfa | |
parent | a7f70cc1ff7d54b92d9c55326c1439a25116e00c (diff) | |
download | pdfium-50cce609050e1a40e1d6936e0a3f0614b4483eee.tar.xz |
Fixing whitespace lint errors.
This CL enables several of the diabled whitelist/* lint checks.
R=thestig@chromium.org, tsepez@chromium.org
Review URL: https://codereview.chromium.org/1730553002 .
Diffstat (limited to 'xfa/src/fxfa')
-rw-r--r-- | xfa/src/fxfa/src/app/xfa_ffwidget.cpp | 1 | ||||
-rw-r--r-- | xfa/src/fxfa/src/app/xfa_textlayout.cpp | 11 | ||||
-rw-r--r-- | xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp | 2 | ||||
-rw-r--r-- | xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp | 2 | ||||
-rw-r--r-- | xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp | 2 | ||||
-rw-r--r-- | xfa/src/fxfa/src/parser/xfa_utils_imp.cpp | 1 |
6 files changed, 6 insertions, 13 deletions
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp index c93e945071..a26bc0ba46 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp @@ -1060,7 +1060,6 @@ CFX_DIBitmap* XFA_LoadImageFromBuffer(IFX_FileRead* pImageFileRead, dibAttr.m_nXDPI = (int32_t)(dibAttr.m_nXDPI / (FX_FLOAT)100 * 2.54f); dibAttr.m_nYDPI = (int32_t)(dibAttr.m_nYDPI / (FX_FLOAT)100 * 2.54f); break; - ; default: break; } diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/src/app/xfa_textlayout.cpp index 37260bba0a..8c53248a65 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp +++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp @@ -1460,11 +1460,10 @@ FX_BOOL CXFA_TextLayout::LoadRichText(IFDE_XMLNode* pXMLNode, wsText = 0x00B7 + FX_WSTRC(L" "); } } else if (!bContentNode) { - if (iTabCount > 0) - while (iTabCount-- > 0) { + if (iTabCount > 0) { + while (iTabCount-- > 0) wsText += L'\t'; - } - else { + } else { m_textParser.GetEmbbedObj(m_pTextProvider, pXMLNode, wsText); } } @@ -1485,9 +1484,7 @@ FX_BOOL CXFA_TextLayout::LoadRichText(IFDE_XMLNode* pXMLNode, } else if (wsText.GetLength() > 0 && (0x20 == wsText.GetAt(wsText.GetLength() - 1))) { m_pLoader->m_dwFlags |= XFA_LOADERCNTXTFLG_FILTERSPACE; - } else if (wsText.GetLength() == 0) - ; - else { + } else if (wsText.GetLength() != 0) { m_pLoader->m_dwFlags &= ~XFA_LOADERCNTXTFLG_FILTERSPACE; } } diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp index 3f5e47d214..2066a9fb8c 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp @@ -521,7 +521,6 @@ void CXFA_LayoutPageMgr::FinishPaginatedPageSets() { CXFA_ContainerRecord* pRecord = CreateContainerRecord(); AddPageAreaLayoutItem(pRecord, pNode); break; - ; } } FX_BOOL bUsable = TRUE; @@ -670,7 +669,6 @@ FX_BOOL CXFA_LayoutPageMgr::RunBreak(XFA_ELEMENT eBreakType, case XFA_ATTRIBUTEENUM_Auto: default: break; - ; } return bRet; } diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp index 7c50b4dab7..63fe272872 100644 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp +++ b/xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp @@ -12,4 +12,4 @@ TEST_F(XFAParserImpEmbeddertest, Bug_216) { FPDF_PAGE page = LoadPage(0); EXPECT_NE(nullptr, page); UnloadPage(page); -}
\ No newline at end of file +} diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp index 1574ef5148..243dae8c2d 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp @@ -307,8 +307,8 @@ FX_BOOL CXFA_NodeHelper::XFA_CreateNode_ForCondition( CFX_WideString& wsCondition) { int32_t iLen = wsCondition.GetLength(); CFX_WideString wsIndex = FX_WSTRC(L"0"); - ; FX_BOOL bAll = FALSE; + if (iLen == 0) { m_iCreateFlag = XFA_RESOLVENODE_RSTYPE_CreateNodeOne; return FALSE; diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp index be096d08ee..1ca7b64faa 100644 --- a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp @@ -47,7 +47,6 @@ CXFA_Node* XFA_CreateUIChild(CXFA_Node* pNode, XFA_ELEMENT& eWidgetType) { eUIType = XFA_ELEMENT_ImageEdit; eWidgetType = XFA_ELEMENT_Image; break; - ; case XFA_ELEMENT_Arc: case XFA_ELEMENT_Line: case XFA_ELEMENT_Rectangle: |