diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-04 11:03:26 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-04 16:46:22 +0000 |
| commit | d9dfb6cc16f689753e9b3f896fbda1aec791051a (patch) | |
| tree | 8063ebecea18abc6989cac8b67b0d2fb03a4877a /fxjs/xfa/cjx_exclgroup.cpp | |
| parent | 8ee5207f4f792295badd21f90727e8c810e7dbdf (diff) | |
| download | pdfium-d9dfb6cc16f689753e9b3f896fbda1aec791051a.tar.xz | |
Merge CXFA_WidgetData into CXFA_WidgetAcc
This CL merges the CXFA_WidgetData class into the only subclass,
CXFA_WidgetAcc. Code has been updated as needed.
Change-Id: I3f5bc83b1422bcbe065276b16bfb91e656f5c174
Reviewed-on: https://pdfium-review.googlesource.com/22252
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fxjs/xfa/cjx_exclgroup.cpp')
| -rw-r--r-- | fxjs/xfa/cjx_exclgroup.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/fxjs/xfa/cjx_exclgroup.cpp b/fxjs/xfa/cjx_exclgroup.cpp index fac58ff054..b7223ec200 100644 --- a/fxjs/xfa/cjx_exclgroup.cpp +++ b/fxjs/xfa/cjx_exclgroup.cpp @@ -16,7 +16,6 @@ #include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_exclgroup.h" -#include "xfa/fxfa/parser/cxfa_widgetdata.h" const CJX_MethodSpec CJX_ExclGroup::MethodSpecs[] = { {"execCalculate", execCalculate_static}, @@ -86,15 +85,15 @@ CJS_Return CJX_ExclGroup::selectedMember( if (!params.empty()) return CJS_Return(JSGetStringFromID(JSMessage::kParamError)); - CXFA_WidgetData* pWidgetData = GetWidgetData(); - if (!pWidgetData) + CXFA_WidgetAcc* pWidgetAcc = GetWidgetAcc(); + if (!pWidgetAcc) return CJS_Return(runtime->NewNull()); CXFA_Node* pReturnNode = nullptr; if (params.empty()) { - pReturnNode = pWidgetData->GetSelectedMember(); + pReturnNode = pWidgetAcc->GetSelectedMember(); } else { - pReturnNode = pWidgetData->SetSelectedMember( + pReturnNode = pWidgetAcc->SetSelectedMember( runtime->ToWideString(params[0]).AsStringView(), true); } if (!pReturnNode) @@ -111,13 +110,13 @@ CJS_Return CJX_ExclGroup::selectedMember( void CJX_ExclGroup::defaultValue(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute) { - CXFA_WidgetData* pWidgetData = GetXFANode()->GetWidgetData(); - if (!pWidgetData) + CXFA_WidgetAcc* pWidgetAcc = GetXFANode()->GetWidgetAcc(); + if (!pWidgetAcc) return; if (bSetting) { - pWidgetData->SetSelectedMemberByValue(pValue->ToWideString().AsStringView(), - true, true, true); + pWidgetAcc->SetSelectedMemberByValue(pValue->ToWideString().AsStringView(), + true, true, true); return; } |