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_fffield.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_fffield.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_fffield.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp index 2b4748771e..827d38d8c3 100644 --- a/xfa/fxfa/cxfa_fffield.cpp +++ b/xfa/fxfa/cxfa_fffield.cpp @@ -22,6 +22,7 @@ #include "xfa/fxfa/cxfa_ffwidget.h" #include "xfa/fxfa/cxfa_fwltheme.h" #include "xfa/fxfa/cxfa_textlayout.h" +#include "xfa/fxfa/parser/cxfa_calculate.h" #include "xfa/fxfa/parser/cxfa_node.h" #include "xfa/fxfa/parser/cxfa_script.h" #include "xfa/fxgraphics/cxfa_gecolor.h" @@ -661,12 +662,12 @@ int32_t CXFA_FFField::CalculateOverride() { } int32_t CXFA_FFField::CalculateWidgetAcc(CXFA_WidgetAcc* pAcc) { - CXFA_CalculateData calcData = pAcc->GetCalculateData(); - if (!calcData.HasValidNode()) + CXFA_Calculate* calc = pAcc->GetCalculate(); + if (!calc) return 1; XFA_VERSION version = pAcc->GetDoc()->GetXFADoc()->GetCurVersionMode(); - switch (calcData.GetOverride()) { + switch (calc->GetOverride()) { case XFA_AttributeEnum::Error: { if (version <= XFA_VERSION_204) return 1; @@ -681,7 +682,7 @@ int32_t CXFA_FFField::CalculateWidgetAcc(CXFA_WidgetAcc* pAcc) { } case XFA_AttributeEnum::Warning: { if (version <= XFA_VERSION_204) { - CXFA_Script* script = calcData.GetScript(); + CXFA_Script* script = calc->GetScript(); if (!script) return 1; if (script->GetExpression().IsEmpty()) @@ -695,7 +696,7 @@ int32_t CXFA_FFField::CalculateWidgetAcc(CXFA_WidgetAcc* pAcc) { if (!pAppProvider) return 0; - WideString wsMessage = calcData.GetMessageText(); + WideString wsMessage = calc->GetMessageText(); if (!wsMessage.IsEmpty()) wsMessage += L"\r\n"; |