From e98ac2e5d77053201661cf0b82ecfb597fd72492 Mon Sep 17 00:00:00 2001 From: Wei Li Date: Fri, 18 Mar 2016 15:43:04 -0700 Subject: Fix a typo R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1808853007 . --- fpdfsdk/fsdk_baseform.cpp | 6 +++--- xfa/fxfa/app/xfa_ffdocview.cpp | 8 ++++---- xfa/fxfa/app/xfa_ffnotify.cpp | 2 +- xfa/fxfa/app/xfa_ffwidgetacc.cpp | 36 ++++++++++++++++++------------------ xfa/include/fxfa/fxfa.h | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/fpdfsdk/fsdk_baseform.cpp b/fpdfsdk/fsdk_baseform.cpp index d260ecb17b..38dd1f2d9f 100644 --- a/fpdfsdk/fsdk_baseform.cpp +++ b/fpdfsdk/fsdk_baseform.cpp @@ -243,13 +243,13 @@ FX_BOOL CPDFSDK_Widget::OnXFAAAction(PDFSDK_XFAAActionType eXFAAAT, CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hWidget); param.m_pTarget = pAcc; int32_t nRet = pXFAWidgetHandler->ProcessEvent(pAcc, ¶m); - return nRet == XFA_EVENTERROR_Sucess; + return nRet == XFA_EVENTERROR_Success; } } else { CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hWidget); param.m_pTarget = pAcc; int32_t nRet = pXFAWidgetHandler->ProcessEvent(pAcc, ¶m); - return nRet == XFA_EVENTERROR_Sucess; + return nRet == XFA_EVENTERROR_Success; } if (IXFA_DocView* pDocView = pDoc->GetXFADocView()) { @@ -1909,7 +1909,7 @@ FX_BOOL CPDFSDK_Widget::OnAAction(CPDF_AAction::AActionType type, pDocView->UpdateDocView(); } - if (nRet == XFA_EVENTERROR_Sucess) + if (nRet == XFA_EVENTERROR_Success) return TRUE; } } diff --git a/xfa/fxfa/app/xfa_ffdocview.cpp b/xfa/fxfa/app/xfa_ffdocview.cpp index 64d4b2375e..f5d3fc56ab 100644 --- a/xfa/fxfa/app/xfa_ffdocview.cpp +++ b/xfa/fxfa/app/xfa_ffdocview.cpp @@ -297,7 +297,7 @@ int32_t CXFA_FFDocView::ProcessWidgetEvent(CXFA_EventParam* pParam, break; } if (!bValidate) { - return XFA_EVENTERROR_Sucess; + return XFA_EVENTERROR_Success; } } CXFA_Node* pNode = pWidgetAcc ? pWidgetAcc->GetNode() : NULL; @@ -310,7 +310,7 @@ int32_t CXFA_FFDocView::ProcessWidgetEvent(CXFA_EventParam* pParam, pNode = pRootItem->GetChild(0, XFA_ELEMENT_Subform); } ExecEventActivityByDeepFirst(pNode, pParam->m_eType, pParam->m_bIsFormReady); - return XFA_EVENTERROR_Sucess; + return XFA_EVENTERROR_Success; } IXFA_WidgetHandler* CXFA_FFDocView::GetWidgetHandler() { if (!m_pWidgetHandler) { @@ -691,7 +691,7 @@ void CXFA_FFDocView::RunCalculateRecursive(int32_t& iIndex) { if (iRefCount > 11) { break; } - if ((pCurAcc->ProcessCalculate()) == XFA_EVENTERROR_Sucess) { + if ((pCurAcc->ProcessCalculate()) == XFA_EVENTERROR_Success) { AddValidateWidget(pCurAcc); } iIndex++; @@ -712,7 +712,7 @@ int32_t CXFA_FFDocView::RunCalculateWidgets() { pCurAcc->GetNode()->SetUserData(XFA_CalcRefCount, (void*)(uintptr_t)0); } m_CalculateAccs.RemoveAll(); - return XFA_EVENTERROR_Sucess; + return XFA_EVENTERROR_Success; } void CXFA_FFDocView::AddValidateWidget(CXFA_WidgetAcc* pWidget) { if (m_ValidateAccs.Find(pWidget) < 0) { diff --git a/xfa/fxfa/app/xfa_ffnotify.cpp b/xfa/fxfa/app/xfa_ffnotify.cpp index 845f7b82b7..60fc1603aa 100644 --- a/xfa/fxfa/app/xfa_ffnotify.cpp +++ b/xfa/fxfa/app/xfa_ffnotify.cpp @@ -289,7 +289,7 @@ FX_BOOL CXFA_FFNotify::RunScript(CXFA_Node* pScript, CXFA_Node* pFormItem) { FXJSE_HVALUE pRetValue = NULL; int32_t iRet = pWidgetAcc->ExecuteScript(CXFA_Script(pScript), &EventParam, &pRetValue); - if (iRet == XFA_EVENTERROR_Sucess && pRetValue) { + if (iRet == XFA_EVENTERROR_Success && pRetValue) { bRet = FXJSE_Value_ToBoolean(pRetValue); FXJSE_Value_Release(pRetValue); } diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp index 500235d4a5..c62256262a 100644 --- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp +++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp @@ -327,7 +327,7 @@ int32_t CXFA_WidgetAcc::ProcessEvent(int32_t iActivity, int32_t result = ProcessEvent(event, pEventParam); if (i == 0) { iRet = result; - } else if (result == XFA_EVENTERROR_Sucess) { + } else if (result == XFA_EVENTERROR_Success) { iRet = result; } } @@ -371,7 +371,7 @@ int32_t CXFA_WidgetAcc::ProcessCalculate() { EventParam.m_eType = XFA_EVENT_Calculate; CXFA_Script script = calc.GetScript(); int32_t iRet = ExecuteScript(script, &EventParam); - if (iRet == XFA_EVENTERROR_Sucess) { + if (iRet == XFA_EVENTERROR_Success) { if (GetRawValue() != EventParam.m_wsResult) { const bool bNotify = GetDoc()->GetDocType() == XFA_DOCTYPE_Static; SetValue(EventParam.m_wsResult, XFA_VALUEPICTURE_Raw); @@ -379,7 +379,7 @@ int32_t CXFA_WidgetAcc::ProcessCalculate() { if (bNotify) { NotifyEvent(XFA_WIDGETEVENT_PostContentChanged, NULL, NULL, NULL); } - iRet = XFA_EVENTERROR_Sucess; + iRet = XFA_EVENTERROR_Success; } } return iRet; @@ -388,7 +388,7 @@ void CXFA_WidgetAcc::ProcessScriptTestValidate(CXFA_Validate validate, int32_t iRet, FXJSE_HVALUE pRetValue, FX_BOOL bVersionFlag) { - if (iRet == XFA_EVENTERROR_Sucess && pRetValue) { + if (iRet == XFA_EVENTERROR_Success && pRetValue) { if (FXJSE_Value_IsBoolean(pRetValue) && !FXJSE_Value_ToBoolean(pRetValue)) { IXFA_AppProvider* pAppProvider = GetAppProvider(); if (!pAppProvider) { @@ -453,7 +453,7 @@ int32_t CXFA_WidgetAcc::ProcessFormatTestValidate(CXFA_Validate validate, GetValidateMessage(pAppProvider, wsFormatMsg, TRUE, bVersionFlag); } pAppProvider->MsgBox(wsFormatMsg, wsTitle, XFA_MBICON_Error, XFA_MB_OK); - return XFA_EVENTERROR_Sucess; + return XFA_EVENTERROR_Success; } if (GetNode()->HasFlag(XFA_NODEFLAG_UserInteractive)) { return XFA_EVENTERROR_NotExist; @@ -464,13 +464,13 @@ int32_t CXFA_WidgetAcc::ProcessFormatTestValidate(CXFA_Validate validate, if (bVersionFlag) { pAppProvider->MsgBox(wsFormatMsg, wsTitle, XFA_MBICON_Warning, XFA_MB_OK); - return XFA_EVENTERROR_Sucess; + return XFA_EVENTERROR_Success; } if (pAppProvider->MsgBox(wsFormatMsg, wsTitle, XFA_MBICON_Warning, XFA_MB_YesNo) == XFA_IDYes) { GetNode()->SetFlag(XFA_NODEFLAG_UserInteractive, TRUE, FALSE); } - return XFA_EVENTERROR_Sucess; + return XFA_EVENTERROR_Success; } } return XFA_EVENTERROR_NotExist; @@ -481,16 +481,16 @@ int32_t CXFA_WidgetAcc::ProcessNullTestValidate(CXFA_Validate validate, CFX_WideString wsValue; GetValue(wsValue, XFA_VALUEPICTURE_Raw); if (!wsValue.IsEmpty()) { - return XFA_EVENTERROR_Sucess; + return XFA_EVENTERROR_Success; } if (m_bIsNull && (m_bPreNull == m_bIsNull)) { - return XFA_EVENTERROR_Sucess; + return XFA_EVENTERROR_Success; } int32_t eNullTest = validate.GetNullTest(); CFX_WideString wsNullMsg; validate.GetNullMessageText(wsNullMsg); if (iFlags & 0x01) { - int32_t iRet = XFA_EVENTERROR_Sucess; + int32_t iRet = XFA_EVENTERROR_Success; if (eNullTest != XFA_ATTRIBUTEENUM_Disabled) { iRet = XFA_EVENTERROR_Error; } @@ -499,7 +499,7 @@ int32_t CXFA_WidgetAcc::ProcessNullTestValidate(CXFA_Validate validate, m_pDocView->m_arrNullTestMsg.Add(wsNullMsg); return XFA_EVENTERROR_Error; } - return XFA_EVENTERROR_Sucess; + return XFA_EVENTERROR_Success; } return iRet; } @@ -546,7 +546,7 @@ int32_t CXFA_WidgetAcc::ProcessNullTestValidate(CXFA_Validate validate, default: break; } - return XFA_EVENTERROR_Sucess; + return XFA_EVENTERROR_Success; } void CXFA_WidgetAcc::GetValidateCaptionName(CFX_WideString& wsCaptionName, FX_BOOL bVersionFlag) { @@ -626,7 +626,7 @@ int32_t CXFA_WidgetAcc::ProcessValidate(int32_t iFlags) { } iRet |= ProcessNullTestValidate(validate, iFlags, bVersionFlag); } - if (iFormat != XFA_EVENTERROR_Sucess) { + if (iFormat != XFA_EVENTERROR_Success) { ProcessScriptTestValidate(validate, iRet, pRetValue, bVersionFlag); } if (pRetValue) { @@ -639,7 +639,7 @@ int32_t CXFA_WidgetAcc::ExecuteScript(CXFA_Script script, FXJSE_HVALUE* pRetValue) { static const uint32_t MAX_RECURSION_DEPTH = 2; if (m_nRecursionDepth > MAX_RECURSION_DEPTH) - return XFA_EVENTERROR_Sucess; + return XFA_EVENTERROR_Success; FXSYS_assert(pEventParam); if (!script) { return XFA_EVENTERROR_NotExist; @@ -654,7 +654,7 @@ int32_t CXFA_WidgetAcc::ExecuteScript(CXFA_Script script, } XFA_SCRIPTTYPE eScriptType = script.GetContentType(); if (eScriptType == XFA_SCRIPTTYPE_Unkown) { - return XFA_EVENTERROR_Sucess; + return XFA_EVENTERROR_Success; } CXFA_FFDoc* pDoc = GetDoc(); IXFA_ScriptContext* pContext = pDoc->GetXFADoc()->GetScriptContext(); @@ -672,7 +672,7 @@ int32_t CXFA_WidgetAcc::ExecuteScript(CXFA_Script script, --m_nRecursionDepth; int32_t iRet = XFA_EVENTERROR_Error; if (bRet) { - iRet = XFA_EVENTERROR_Sucess; + iRet = XFA_EVENTERROR_Success; if (pEventParam->m_eType == XFA_EVENT_Calculate || pEventParam->m_eType == XFA_EVENT_InitCalculate) { if (!FXJSE_Value_IsUndefined(hRetValue)) { @@ -682,12 +682,12 @@ int32_t CXFA_WidgetAcc::ExecuteScript(CXFA_Script script, pEventParam->m_wsResult = CFX_WideString::FromUTF8(bsString, bsString.GetLength()); } - iRet = XFA_EVENTERROR_Sucess; + iRet = XFA_EVENTERROR_Success; } else { iRet = XFA_EVENTERROR_Error; } if (pEventParam->m_eType == XFA_EVENT_InitCalculate) { - if ((iRet == XFA_EVENTERROR_Sucess) && + if ((iRet == XFA_EVENTERROR_Success) && (GetRawValue() != pEventParam->m_wsResult)) { SetValue(pEventParam->m_wsResult, XFA_VALUEPICTURE_Raw); m_pDocView->AddValidateWidget(this); diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h index 5e9dd0dde8..202d616f07 100644 --- a/xfa/include/fxfa/fxfa.h +++ b/xfa/include/fxfa/fxfa.h @@ -594,7 +594,7 @@ class CXFA_EventParam { FX_BOOL m_bIsFormReady; int32_t m_iValidateActivities; }; -#define XFA_EVENTERROR_Sucess 1 +#define XFA_EVENTERROR_Success 1 #define XFA_EVENTERROR_Error -1 #define XFA_EVENTERROR_NotExist 0 #define XFA_EVENTERROR_Disabled 2 -- cgit v1.2.3