From 9aeb0caba4cda9c6bd39ed079f88000a712f9890 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 4 Jan 2018 16:53:15 -0500 Subject: Remove CXFA_WidgetData::{GetElementType|GetDatasets} The GetElementType and GetDatasets methods have been removed from the CXFA_WidgetData class and we call the CXFA_Node methods directly. Change-Id: I5178be76c929ac3405eb6a65f9b8775b2f0283e2 Reviewed-on: https://pdfium-review.googlesource.com/22264 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/cxfa_ffwidgethandler.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'xfa/fxfa/cxfa_ffwidgethandler.cpp') diff --git a/xfa/fxfa/cxfa_ffwidgethandler.cpp b/xfa/fxfa/cxfa_ffwidgethandler.cpp index 4c21c24e2e..8988cf1903 100644 --- a/xfa/fxfa/cxfa_ffwidgethandler.cpp +++ b/xfa/fxfa/cxfa_ffwidgethandler.cpp @@ -188,8 +188,11 @@ bool CXFA_FFWidgetHandler::HasEvent(CXFA_WidgetAcc* pWidgetAcc, if (eEventType == XFA_EVENT_Unknown) return false; - if (!pWidgetAcc || pWidgetAcc->GetElementType() == XFA_Element::Draw) + if (!pWidgetAcc || + (pWidgetAcc->GetNode() && + pWidgetAcc->GetNode()->GetElementType() == XFA_Element::Draw)) { return false; + } switch (eEventType) { case XFA_EVENT_Calculate: { @@ -211,8 +214,11 @@ int32_t CXFA_FFWidgetHandler::ProcessEvent(CXFA_WidgetAcc* pWidgetAcc, CXFA_EventParam* pParam) { if (!pParam || pParam->m_eType == XFA_EVENT_Unknown) return XFA_EVENTERROR_NotExist; - if (!pWidgetAcc || pWidgetAcc->GetElementType() == XFA_Element::Draw) + if (!pWidgetAcc || + (pWidgetAcc->GetNode() && + pWidgetAcc->GetNode()->GetElementType() == XFA_Element::Draw)) { return XFA_EVENTERROR_NotExist; + } switch (pParam->m_eType) { case XFA_EVENT_Calculate: -- cgit v1.2.3