diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-03 10:43:51 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-03 17:21:30 +0000 |
| commit | cf3d40d10276686f972761bafd005a7715f6eb1c (patch) | |
| tree | d183076a13b494f0cd003c28eb13f3e12b0c5810 /xfa/fxfa/cxfa_widgetacc.cpp | |
| parent | 05dcbc931eacb72f1a11835ae282fc8434b7a434 (diff) | |
| download | pdfium-cf3d40d10276686f972761bafd005a7715f6eb1c.tar.xz | |
Fold CXFA_CalculateData into CXFA_Calculate
This CL folds CXFA_CalculateData into CXFA_Calculate as it is just a
thin wrapper.
Change-Id: I35efbee6c0244139a7ece19f3e8ee18bfb931dda
Reviewed-on: https://pdfium-review.googlesource.com/22090
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_widgetacc.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_widgetacc.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp index 63f59dcc28..dcf621f442 100644 --- a/xfa/fxfa/cxfa_widgetacc.cpp +++ b/xfa/fxfa/cxfa_widgetacc.cpp @@ -21,6 +21,7 @@ #include "xfa/fxfa/cxfa_fontmgr.h" #include "xfa/fxfa/cxfa_textlayout.h" #include "xfa/fxfa/cxfa_textprovider.h" +#include "xfa/fxfa/parser/cxfa_calculate.h" #include "xfa/fxfa/parser/cxfa_items.h" #include "xfa/fxfa/parser/cxfa_layoutprocessor.h" #include "xfa/fxfa/parser/cxfa_localevalue.h" @@ -328,15 +329,15 @@ int32_t CXFA_WidgetAcc::ProcessCalculate() { if (GetElementType() == XFA_Element::Draw) return XFA_EVENTERROR_NotExist; - CXFA_CalculateData calcData = GetCalculateData(); - if (!calcData.HasValidNode()) + CXFA_Calculate* calc = GetCalculate(); + if (!calc) return XFA_EVENTERROR_NotExist; if (GetNode()->IsUserInteractive()) return XFA_EVENTERROR_Disabled; CXFA_EventParam EventParam; EventParam.m_eType = XFA_EVENT_Calculate; - int32_t iRet = ExecuteScript(calcData.GetScript(), &EventParam); + int32_t iRet = ExecuteScript(calc->GetScript(), &EventParam); if (iRet != XFA_EVENTERROR_Success) return iRet; |