From ed4038bc335385b7e341d8de5c2bec8db5dcdcb6 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 22 Jan 2018 18:43:17 +0000 Subject: Move the UI elements from CXFA_WidgetAcc to CXFA_Node This CL moves the methods and members related to the UI nodes from the CXFA_WidgetAcc class to the CXFA_Node class. Change-Id: I1fdc5173787141065f1e607bbfefa3b22af738b4 Reviewed-on: https://pdfium-review.googlesource.com/23290 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- fxjs/xfa/cjx_field.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'fxjs/xfa/cjx_field.cpp') diff --git a/fxjs/xfa/cjx_field.cpp b/fxjs/xfa/cjx_field.cpp index 03927cd02e..2af988f1fe 100644 --- a/fxjs/xfa/cjx_field.cpp +++ b/fxjs/xfa/cjx_field.cpp @@ -256,8 +256,7 @@ void CJX_Field::defaultValue(CFXJSE_Value* pValue, if (pValue && !(pValue->IsNull() || pValue->IsUndefined())) wsNewText = pValue->ToWideString(); - CXFA_Node* pUIChild = pWidgetAcc->GetUIChild(); - if (pUIChild->GetElementType() == XFA_Element::NumericEdit) { + if (xfaNode->GetUIChild()->GetElementType() == XFA_Element::NumericEdit) { wsNewText = pWidgetAcc->NumericLimit( wsNewText, pWidgetAcc->GetLeadDigits(), pWidgetAcc->GetFracDigits()); } @@ -277,11 +276,10 @@ void CJX_Field::defaultValue(CFXJSE_Value* pValue, return; } - CXFA_Node* pUIChild = pWidgetAcc->GetUIChild(); CXFA_Node* formValue = xfaNode->GetFormValueIfExists(); CXFA_Node* pNode = formValue ? formValue->GetFirstChild() : nullptr; if (pNode && pNode->GetElementType() == XFA_Element::Decimal) { - if (pUIChild->GetElementType() == XFA_Element::NumericEdit && + if (xfaNode->GetUIChild()->GetElementType() == XFA_Element::NumericEdit && (pNode->JSObject()->GetInteger(XFA_Attribute::FracDigits) == -1)) { pValue->SetString(content.UTF8Encode().AsStringView()); } else { -- cgit v1.2.3