From 18a6069f5ce332b2bab97bf3a6d8ea9528d69791 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 10 Jan 2018 16:30:56 +0000 Subject: Remove CXFA_Node::GetNodeItem This CL removes the generic CXFA_Node::GetNodeItem(type) method for specific calls to get the parent, child or siblings. Change-Id: Ief68284ac7b954aaa4ed7120dd82a39f8b52656a Reviewed-on: https://pdfium-review.googlesource.com/22650 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- xfa/fxfa/cxfa_textprovider.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/cxfa_textprovider.cpp') diff --git a/xfa/fxfa/cxfa_textprovider.cpp b/xfa/fxfa/cxfa_textprovider.cpp index 1007c6d646..e3222a9c8b 100644 --- a/xfa/fxfa/cxfa_textprovider.cpp +++ b/xfa/fxfa/cxfa_textprovider.cpp @@ -48,7 +48,7 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(bool& bRichText) { if (!pValueNode) return nullptr; - CXFA_Node* pChildNode = pValueNode->GetNodeItem(XFA_NODEITEM_FirstChild); + CXFA_Node* pChildNode = pValueNode->GetFirstChild(); if (pChildNode && pChildNode->GetElementType() == XFA_Element::ExData) { Optional contentType = pChildNode->JSObject()->TryAttribute( XFA_Attribute::ContentType, false); @@ -87,7 +87,7 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(bool& bRichText) { if (!pValueNode) return nullptr; - CXFA_Node* pChildNode = pValueNode->GetNodeItem(XFA_NODEITEM_FirstChild); + CXFA_Node* pChildNode = pValueNode->GetFirstChild(); if (pChildNode && pChildNode->GetElementType() == XFA_Element::ExData) { Optional contentType = pChildNode->JSObject()->TryAttribute( XFA_Attribute::ContentType, false); @@ -102,7 +102,7 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(bool& bRichText) { if (!pItemNode) return nullptr; - CXFA_Node* pNode = pItemNode->GetNodeItem(XFA_NODEITEM_FirstChild); + CXFA_Node* pNode = pItemNode->GetFirstChild(); while (pNode) { WideString wsName = pNode->JSObject()->GetCData(XFA_Attribute::Name); if (m_eType == XFA_TEXTPROVIDERTYPE_Rollover && wsName == L"rollover") @@ -110,7 +110,7 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(bool& bRichText) { if (m_eType == XFA_TEXTPROVIDERTYPE_Down && wsName == L"down") return pNode; - pNode = pNode->GetNodeItem(XFA_NODEITEM_NextSibling); + pNode = pNode->GetNextSibling(); } return nullptr; } @@ -152,7 +152,7 @@ bool CXFA_TextProvider::GetEmbbedObj(bool bURI, return false; CXFA_Node* pWidgetNode = m_pWidgetAcc->GetNode(); - CXFA_Node* pParent = pWidgetNode->GetNodeItem(XFA_NODEITEM_Parent); + CXFA_Node* pParent = pWidgetNode->GetParent(); CXFA_Document* pDocument = pWidgetNode->GetDocument(); CXFA_Node* pIDNode = nullptr; CXFA_WidgetAcc* pEmbAcc = nullptr; -- cgit v1.2.3