diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-07-26 19:34:26 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-07-26 19:34:26 +0000 |
| commit | c9171e16d9d4477501d326d8d456fdc03e0f832e (patch) | |
| tree | 89a91af4803e820b2e7f8c6e9901915c3415d72c /xfa/fxfa/cxfa_textprovider.cpp | |
| parent | ea360af9048e7083107f9e27f8967351df241f70 (diff) | |
| download | pdfium-c9171e16d9d4477501d326d8d456fdc03e0f832e.tar.xz | |
Use moar ToXMLElement() in place of static_cast<>.
Introduces checks in a few new places, but mainly just consolidates
checking/casting logic.
Change-Id: I634a03060d254db099972c6978249992367e146c
Reviewed-on: https://pdfium-review.googlesource.com/38900
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_textprovider.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_textprovider.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xfa/fxfa/cxfa_textprovider.cpp b/xfa/fxfa/cxfa_textprovider.cpp index 60c52942ed..ba48cd8490 100644 --- a/xfa/fxfa/cxfa_textprovider.cpp +++ b/xfa/fxfa/cxfa_textprovider.cpp @@ -61,13 +61,12 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(bool& bRichText) { if (m_eType == XFA_TEXTPROVIDERTYPE_Datasets) { CXFA_Node* pBind = m_pNode->GetBindData(); CFX_XMLNode* pXMLNode = pBind->GetXMLMappingNode(); - ASSERT(pXMLNode); for (CFX_XMLNode* pXMLChild = pXMLNode->GetFirstChild(); pXMLChild; pXMLChild = pXMLChild->GetNextSibling()) { - if (pXMLChild->GetType() == FX_XMLNODE_Element) { - CFX_XMLElement* pElement = static_cast<CFX_XMLElement*>(pXMLChild); - if (XFA_RecognizeRichText(pElement)) - bRichText = true; + CFX_XMLElement* pElement = ToXMLElement(pXMLChild); + if (pElement && XFA_RecognizeRichText(pElement)) { + bRichText = true; + break; } } return pBind; |