summaryrefslogtreecommitdiff
path: root/xfa/fxfa/cxfa_fffield.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-07 18:42:20 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-07 18:42:20 +0000
commitf44cf89c0263708b7d475fb1aeba6ba42f54766f (patch)
tree34e9d3d2919bfbc1c251e1096c4911373f26adb3 /xfa/fxfa/cxfa_fffield.cpp
parentcce8e2f46d0fb64c2558c24a2aa33ac929dfdad6 (diff)
downloadpdfium-f44cf89c0263708b7d475fb1aeba6ba42f54766f.tar.xz
Rename CXFA_Calculate to CXFA_CalculateData
This CL renames CXFA_Calculate to CXFA_CalculateData to make it clear it's part of the data hierarchy. Change-Id: I259b9816bde9cc6c70550944906fcafa954ef32e Reviewed-on: https://pdfium-review.googlesource.com/17976 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_fffield.cpp')
-rw-r--r--xfa/fxfa/cxfa_fffield.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp
index f6c21d9fd7..b1c8c32684 100644
--- a/xfa/fxfa/cxfa_fffield.cpp
+++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -662,12 +662,12 @@ int32_t CXFA_FFField::CalculateOverride() {
}
int32_t CXFA_FFField::CalculateWidgetAcc(CXFA_WidgetAcc* pAcc) {
- CXFA_Calculate calc = pAcc->GetCalculate();
- if (!calc)
+ CXFA_CalculateData calcData = pAcc->GetCalculateData();
+ if (!calcData)
return 1;
XFA_VERSION version = pAcc->GetDoc()->GetXFADoc()->GetCurVersionMode();
- switch (calc.GetOverride()) {
+ switch (calcData.GetOverride()) {
case XFA_ATTRIBUTEENUM_Error: {
if (version <= XFA_VERSION_204)
return 1;
@@ -682,7 +682,7 @@ int32_t CXFA_FFField::CalculateWidgetAcc(CXFA_WidgetAcc* pAcc) {
}
case XFA_ATTRIBUTEENUM_Warning: {
if (version <= XFA_VERSION_204) {
- CXFA_Script script = calc.GetScript();
+ CXFA_Script script = calcData.GetScript();
if (!script)
return 1;
@@ -700,7 +700,7 @@ int32_t CXFA_FFField::CalculateWidgetAcc(CXFA_WidgetAcc* pAcc) {
return 0;
WideString wsMessage;
- calc.GetMessageText(wsMessage);
+ calcData.GetMessageText(wsMessage);
if (!wsMessage.IsEmpty())
wsMessage += L"\r\n";