From 5e332f1275dd6f4b6d487d313f4db8497df339ab Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 29 Jan 2018 19:52:07 +0000 Subject: Cleanup the FFWidget determination code. This CL converts the UIType to an XFA_FFWidgetType instead of reusing the XFA_Element type. The creation code is cleaned up to make it clearer what's happening. Change-Id: I5d3e4967d5c8b8a50dbb25e574b0d31fe0cf407a Reviewed-on: https://pdfium-review.googlesource.com/24390 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- fxjs/xfa/cjx_node.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'fxjs/xfa/cjx_node.cpp') diff --git a/fxjs/xfa/cjx_node.cpp b/fxjs/xfa/cjx_node.cpp index 1d6e022060..0508651932 100644 --- a/fxjs/xfa/cjx_node.cpp +++ b/fxjs/xfa/cjx_node.cpp @@ -505,21 +505,18 @@ int32_t CJX_Node::execSingleEventByName(const WideStringView& wsEventName, case EventAppliesToo::kSignature: { if (!GetXFANode()->IsWidgetReady()) return XFA_EVENTERROR_NotExist; - - CXFA_Node* pUINode = GetXFANode()->GetUIChild(); - if (pUINode->GetElementType() != XFA_Element::Signature) + if (GetXFANode()->GetUIChildNode()->GetElementType() != + XFA_Element::Signature) { return XFA_EVENTERROR_NotExist; - + } return pNotify->ExecEventByDeepFirst( GetXFANode(), eventParaInfo->m_eventType, false, false); } case EventAppliesToo::kChoiceList: { if (!GetXFANode()->IsWidgetReady()) return XFA_EVENTERROR_NotExist; - - CXFA_Node* pUINode = GetXFANode()->GetUIChild(); - if (pUINode->GetElementType() != XFA_Element::ChoiceList || - GetXFANode()->IsListBox()) { + if (GetXFANode()->GetUIChildNode()->GetElementType() != + XFA_Element::ChoiceList) { return XFA_EVENTERROR_NotExist; } return pNotify->ExecEventByDeepFirst( -- cgit v1.2.3