From fc77dee8e5d0f941ea6050aa632254b588a21f87 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 11 Jan 2018 14:45:42 +0000 Subject: Cleanup duplicate CXFA_Node accessors These two accessors exist with other names or signatues, remove. Change-Id: Ieac073b746553160e4f2c41d9b63be47ad0ab61f Reviewed-on: https://pdfium-review.googlesource.com/22711 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- fxjs/xfa/cjx_object.cpp | 4 ++-- xfa/fxfa/parser/cxfa_node.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp index 027c151d3f..cb76497618 100644 --- a/fxjs/xfa/cjx_object.cpp +++ b/fxjs/xfa/cjx_object.cpp @@ -903,7 +903,7 @@ std::pair CJX_Object::GetPropertyInternal( return {nullptr, 0}; int32_t iCount = 0; - for (CXFA_Node* pNode = xfaNode->GetChildNode(); pNode; + for (CXFA_Node* pNode = xfaNode->GetFirstChild(); pNode; pNode = pNode->GetNextSibling()) { if (pNode->GetElementType() == eProperty) { iCount++; @@ -927,7 +927,7 @@ CXFA_Node* CJX_Object::GetOrCreatePropertyInternal(int32_t index, return node; if (xfaNode->HasPropertyFlags(eProperty, XFA_PROPERTYFLAG_OneOf)) { - for (CXFA_Node* pNode = xfaNode->GetChildNode(); pNode; + for (CXFA_Node* pNode = xfaNode->GetFirstChild(); pNode; pNode = pNode->GetNextSibling()) { if (xfaNode->HasPropertyFlags(pNode->GetElementType(), XFA_PROPERTYFLAG_OneOf)) { diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index f6021bd8b0..d8689859be 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -102,9 +102,6 @@ class CXFA_Node : public CXFA_Object { void SetFlag(uint32_t dwFlag, bool bNotify); void ClearFlag(uint32_t dwFlag); - CXFA_Node* GetParent() { return m_pParent; } - CXFA_Node* GetChildNode() const { return m_pChild; } - CXFA_Node* CreateInstance(bool bDataMerge); int32_t GetCount(); CXFA_Node* GetItem(int32_t iIndex); -- cgit v1.2.3