diff options
author | Hans Wennborg <hans@chromium.org> | 2018-10-22 18:28:52 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-22 18:28:52 +0000 |
commit | c320e9c7ad01ab48625e51fb3b6476d98b6167de (patch) | |
tree | 4ef9b9083a5969b60c445340a47500c46c5ce623 /fpdfsdk/cpdfsdk_interactiveform.cpp | |
parent | 8298d25cf3ac41d71a8533700d929cadac1c360d (diff) | |
download | pdfium-c320e9c7ad01ab48625e51fb3b6476d98b6167de.tar.xz |
Add k prefixes to CPDF_AAction::AActionType enumerators
The GetFocus enumerator was shadowing the GetFocus function in winuser.h.
Change the enumerators to all have a k prefix to avoid the warning, and since I
believe pdfium wants to move towards that style anyway.
Bug: chromium:895475
Change-Id: I740afa4f29d895e7e3cbb488fd311a7487d67a82
Reviewed-on: https://pdfium-review.googlesource.com/c/44470
Commit-Queue: Hans Wennborg <hans@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk/cpdfsdk_interactiveform.cpp')
-rw-r--r-- | fpdfsdk/cpdfsdk_interactiveform.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fpdfsdk/cpdfsdk_interactiveform.cpp b/fpdfsdk/cpdfsdk_interactiveform.cpp index 76df3c93e0..c48ff70e47 100644 --- a/fpdfsdk/cpdfsdk_interactiveform.cpp +++ b/fpdfsdk/cpdfsdk_interactiveform.cpp @@ -303,10 +303,10 @@ void CPDFSDK_InteractiveForm::OnCalculate(CPDF_FormField* pFormField) { continue; CPDF_AAction aAction = pField->GetAdditionalAction(); - if (!aAction.GetDict() || !aAction.ActionExist(CPDF_AAction::Calculate)) + if (!aAction.GetDict() || !aAction.ActionExist(CPDF_AAction::kCalculate)) continue; - CPDF_Action action = aAction.GetAction(CPDF_AAction::Calculate); + CPDF_Action action = aAction.GetAction(CPDF_AAction::kCalculate); if (!action.GetDict()) continue; @@ -341,8 +341,8 @@ Optional<WideString> CPDFSDK_InteractiveForm::OnFormat( } CPDF_AAction aAction = pFormField->GetAdditionalAction(); - if (aAction.GetDict() && aAction.ActionExist(CPDF_AAction::Format)) { - CPDF_Action action = aAction.GetAction(CPDF_AAction::Format); + if (aAction.GetDict() && aAction.ActionExist(CPDF_AAction::kFormat)) { + CPDF_Action action = aAction.GetAction(CPDF_AAction::kFormat); if (action.GetDict()) { WideString script = action.GetJavaScript(); if (!script.IsEmpty()) { @@ -388,10 +388,10 @@ void CPDFSDK_InteractiveForm::UpdateField(CPDF_FormField* pFormField) { bool CPDFSDK_InteractiveForm::OnKeyStrokeCommit(CPDF_FormField* pFormField, const WideString& csValue) { CPDF_AAction aAction = pFormField->GetAdditionalAction(); - if (!aAction.GetDict() || !aAction.ActionExist(CPDF_AAction::KeyStroke)) + if (!aAction.GetDict() || !aAction.ActionExist(CPDF_AAction::kKeyStroke)) return true; - CPDF_Action action = aAction.GetAction(CPDF_AAction::KeyStroke); + CPDF_Action action = aAction.GetAction(CPDF_AAction::kKeyStroke); if (!action.GetDict()) return true; @@ -400,17 +400,17 @@ bool CPDFSDK_InteractiveForm::OnKeyStrokeCommit(CPDF_FormField* pFormField, fa.bShift = false; fa.sValue = csValue; m_pFormFillEnv->GetActionHandler()->DoAction_FieldJavaScript( - action, CPDF_AAction::KeyStroke, m_pFormFillEnv.Get(), pFormField, &fa); + action, CPDF_AAction::kKeyStroke, m_pFormFillEnv.Get(), pFormField, &fa); return fa.bRC; } bool CPDFSDK_InteractiveForm::OnValidate(CPDF_FormField* pFormField, const WideString& csValue) { CPDF_AAction aAction = pFormField->GetAdditionalAction(); - if (!aAction.GetDict() || !aAction.ActionExist(CPDF_AAction::Validate)) + if (!aAction.GetDict() || !aAction.ActionExist(CPDF_AAction::kValidate)) return true; - CPDF_Action action = aAction.GetAction(CPDF_AAction::Validate); + CPDF_Action action = aAction.GetAction(CPDF_AAction::kValidate); if (!action.GetDict()) return true; @@ -419,7 +419,7 @@ bool CPDFSDK_InteractiveForm::OnValidate(CPDF_FormField* pFormField, fa.bShift = false; fa.sValue = csValue; m_pFormFillEnv->GetActionHandler()->DoAction_FieldJavaScript( - action, CPDF_AAction::Validate, m_pFormFillEnv.Get(), pFormField, &fa); + action, CPDF_AAction::kValidate, m_pFormFillEnv.Get(), pFormField, &fa); return fa.bRC; } |