From c5d5729700a4d145cd298ec52f6f57b2d11aaafe Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Sat, 4 Nov 2017 01:49:37 +0000 Subject: Remove default values from CXFA_Node::{CountChildren|GetChild} This CL removes the default values and inlines into the call sites as needed. Change-Id: I554e9d5ac781003695f90522f9c6c3160653eb59 Reviewed-on: https://pdfium-review.googlesource.com/17572 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- xfa/fxfa/cxfa_textprovider.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'xfa/fxfa/cxfa_textprovider.cpp') diff --git a/xfa/fxfa/cxfa_textprovider.cpp b/xfa/fxfa/cxfa_textprovider.cpp index db220b3f0f..3ac35bb843 100644 --- a/xfa/fxfa/cxfa_textprovider.cpp +++ b/xfa/fxfa/cxfa_textprovider.cpp @@ -37,7 +37,8 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(bool& bRichText) { if (m_eType == XFA_TEXTPROVIDERTYPE_Text) { CXFA_Node* pElementNode = m_pWidgetAcc->GetNode(); - CXFA_Node* pValueNode = pElementNode->GetChild(0, XFA_Element::Value); + CXFA_Node* pValueNode = + pElementNode->GetChild(0, XFA_Element::Value, false); if (!pValueNode) return nullptr; @@ -71,11 +72,12 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(bool& bRichText) { if (m_eType == XFA_TEXTPROVIDERTYPE_Caption) { CXFA_Node* pCaptionNode = - m_pWidgetAcc->GetNode()->GetChild(0, XFA_Element::Caption); + m_pWidgetAcc->GetNode()->GetChild(0, XFA_Element::Caption, false); if (!pCaptionNode) return nullptr; - CXFA_Node* pValueNode = pCaptionNode->GetChild(0, XFA_Element::Value); + CXFA_Node* pValueNode = + pCaptionNode->GetChild(0, XFA_Element::Value, false); if (!pValueNode) return nullptr; @@ -91,7 +93,7 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(bool& bRichText) { } CXFA_Node* pItemNode = - m_pWidgetAcc->GetNode()->GetChild(0, XFA_Element::Items); + m_pWidgetAcc->GetNode()->GetChild(0, XFA_Element::Items, false); if (!pItemNode) return nullptr; @@ -113,16 +115,18 @@ CXFA_Para CXFA_TextProvider::GetParaNode() { if (m_eType == XFA_TEXTPROVIDERTYPE_Text) return m_pWidgetAcc->GetPara(); - CXFA_Node* pNode = m_pWidgetAcc->GetNode()->GetChild(0, XFA_Element::Caption); - return CXFA_Para(pNode->GetChild(0, XFA_Element::Para)); + CXFA_Node* pNode = + m_pWidgetAcc->GetNode()->GetChild(0, XFA_Element::Caption, false); + return CXFA_Para(pNode->GetChild(0, XFA_Element::Para, false)); } CXFA_Font CXFA_TextProvider::GetFontNode() { if (m_eType == XFA_TEXTPROVIDERTYPE_Text) return m_pWidgetAcc->GetFont(false); - CXFA_Node* pNode = m_pWidgetAcc->GetNode()->GetChild(0, XFA_Element::Caption); - pNode = pNode->GetChild(0, XFA_Element::Font); + CXFA_Node* pNode = + m_pWidgetAcc->GetNode()->GetChild(0, XFA_Element::Caption, false); + pNode = pNode->GetChild(0, XFA_Element::Font, false); return pNode ? CXFA_Font(pNode) : m_pWidgetAcc->GetFont(false); } -- cgit v1.2.3