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/fpdf_formfill.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/fpdf_formfill.cpp')
| -rw-r--r-- | fpdfsdk/fpdf_formfill.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fpdfsdk/fpdf_formfill.cpp b/fpdfsdk/fpdf_formfill.cpp index 966ed097e9..54cfa2b37e 100644 --- a/fpdfsdk/fpdf_formfill.cpp +++ b/fpdfsdk/fpdf_formfill.cpp @@ -141,19 +141,19 @@ static_assert(static_cast<int>(FormFieldType::kXFA_TextField) == static_assert(kFormFieldTypeCount == FPDF_FORMFIELD_COUNT, "Number of form field types must match"); -static_assert(static_cast<int>(CPDF_AAction::CloseDocument) == +static_assert(static_cast<int>(CPDF_AAction::kCloseDocument) == FPDFDOC_AACTION_WC, "CloseDocument action must match"); -static_assert(static_cast<int>(CPDF_AAction::SaveDocument) == +static_assert(static_cast<int>(CPDF_AAction::kSaveDocument) == FPDFDOC_AACTION_WS, "SaveDocument action must match"); -static_assert(static_cast<int>(CPDF_AAction::DocumentSaved) == +static_assert(static_cast<int>(CPDF_AAction::kDocumentSaved) == FPDFDOC_AACTION_DS, "DocumentSaved action must match"); -static_assert(static_cast<int>(CPDF_AAction::PrintDocument) == +static_assert(static_cast<int>(CPDF_AAction::kPrintDocument) == FPDFDOC_AACTION_WP, "PrintDocument action must match"); -static_assert(static_cast<int>(CPDF_AAction::DocumentPrinted) == +static_assert(static_cast<int>(CPDF_AAction::kDocumentPrinted) == FPDFDOC_AACTION_DP, "DocumentPrinted action must match"); @@ -724,8 +724,8 @@ FPDF_EXPORT void FPDF_CALLCONV FORM_DoPageAAction(FPDF_PAGE page, CPDF_Dictionary* pPageDict = pPDFPage->GetDict(); CPDF_AAction aa(pPageDict->GetDictFor("AA")); CPDF_AAction::AActionType type = aaType == FPDFPAGE_AACTION_OPEN - ? CPDF_AAction::OpenPage - : CPDF_AAction::ClosePage; + ? CPDF_AAction::kOpenPage + : CPDF_AAction::kClosePage; if (aa.ActionExist(type)) { CPDF_Action action = aa.GetAction(type); pActionHandler->DoAction_Page(action, type, pFormFillEnv); |