From f44cf89c0263708b7d475fb1aeba6ba42f54766f Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 7 Nov 2017 18:42:20 +0000 Subject: 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 Commit-Queue: dsinclair --- xfa/fxfa/cxfa_fffield.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/cxfa_fffield.cpp') 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"; -- cgit v1.2.3