diff options
Diffstat (limited to 'fpdfsdk/formfiller')
-rw-r--r-- | fpdfsdk/formfiller/cffl_combobox.cpp | 12 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_interactiveformfiller.cpp | 48 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_listbox.cpp | 6 | ||||
-rw-r--r-- | fpdfsdk/formfiller/cffl_textfield.cpp | 12 |
4 files changed, 39 insertions, 39 deletions
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp index 8de88a66f3..830e64713a 100644 --- a/fpdfsdk/formfiller/cffl_combobox.cpp +++ b/fpdfsdk/formfiller/cffl_combobox.cpp @@ -124,7 +124,7 @@ void CFFL_ComboBox::GetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type, CPDFSDK_FieldAction& fa) { switch (type) { - case CPDF_AAction::KeyStroke: + case CPDF_AAction::kKeyStroke: if (CPWL_ComboBox* pComboBox = static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false))) { if (CPWL_Edit* pEdit = pComboBox->GetEdit()) { @@ -144,7 +144,7 @@ void CFFL_ComboBox::GetActionData(CPDFSDK_PageView* pPageView, } } break; - case CPDF_AAction::Validate: + case CPDF_AAction::kValidate: if (CPWL_ComboBox* pComboBox = static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false))) { if (CPWL_Edit* pEdit = pComboBox->GetEdit()) { @@ -152,8 +152,8 @@ void CFFL_ComboBox::GetActionData(CPDFSDK_PageView* pPageView, } } break; - case CPDF_AAction::LoseFocus: - case CPDF_AAction::GetFocus: + case CPDF_AAction::kLoseFocus: + case CPDF_AAction::kGetFocus: fa.sValue = m_pWidget->GetValue(); break; default: @@ -165,7 +165,7 @@ void CFFL_ComboBox::SetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type, const CPDFSDK_FieldAction& fa) { switch (type) { - case CPDF_AAction::KeyStroke: + case CPDF_AAction::kKeyStroke: if (CPWL_ComboBox* pComboBox = static_cast<CPWL_ComboBox*>(GetPDFWindow(pPageView, false))) { if (CPWL_Edit* pEdit = pComboBox->GetEdit()) { @@ -183,7 +183,7 @@ bool CFFL_ComboBox::IsActionDataChanged(CPDF_AAction::AActionType type, const CPDFSDK_FieldAction& faOld, const CPDFSDK_FieldAction& faNew) { switch (type) { - case CPDF_AAction::KeyStroke: + case CPDF_AAction::kKeyStroke: return (!faOld.bFieldFull && faOld.nSelEnd != faNew.nSelEnd) || faOld.nSelStart != faNew.nSelStart || faOld.sChange != faNew.sChange; diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp index 3d5590af6d..c712610dcc 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp @@ -118,7 +118,7 @@ void CFFL_InteractiveFormFiller::OnMouseEnter( ASSERT((*pAnnot)->GetPDFAnnot()->GetSubtype() == CPDF_Annot::Subtype::WIDGET); if (!m_bNotifying) { CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); - if (pWidget->GetAAction(CPDF_AAction::CursorEnter).GetDict()) { + if (pWidget->GetAAction(CPDF_AAction::kCursorEnter).GetDict()) { m_bNotifying = true; uint32_t nValueAge = pWidget->GetValueAge(); @@ -128,7 +128,7 @@ void CFFL_InteractiveFormFiller::OnMouseEnter( CPDFSDK_FieldAction fa; fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag); fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag); - pWidget->OnAAction(CPDF_AAction::CursorEnter, &fa, pPageView); + pWidget->OnAAction(CPDF_AAction::kCursorEnter, &fa, pPageView); m_bNotifying = false; if (!pAnnot->HasObservable()) return; @@ -151,7 +151,7 @@ void CFFL_InteractiveFormFiller::OnMouseExit(CPDFSDK_PageView* pPageView, ASSERT((*pAnnot)->GetPDFAnnot()->GetSubtype() == CPDF_Annot::Subtype::WIDGET); if (!m_bNotifying) { CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); - if (pWidget->GetAAction(CPDF_AAction::CursorExit).GetDict()) { + if (pWidget->GetAAction(CPDF_AAction::kCursorExit).GetDict()) { m_bNotifying = true; uint32_t nValueAge = pWidget->GetValueAge(); @@ -161,7 +161,7 @@ void CFFL_InteractiveFormFiller::OnMouseExit(CPDFSDK_PageView* pPageView, CPDFSDK_FieldAction fa; fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag); fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag); - pWidget->OnAAction(CPDF_AAction::CursorExit, &fa, pPageView); + pWidget->OnAAction(CPDF_AAction::kCursorExit, &fa, pPageView); m_bNotifying = false; if (!pAnnot->HasObservable()) return; @@ -187,7 +187,7 @@ bool CFFL_InteractiveFormFiller::OnLButtonDown( if (!m_bNotifying) { CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); if (Annot_HitTest(pPageView, pAnnot->Get(), point) && - pWidget->GetAAction(CPDF_AAction::ButtonDown).GetDict()) { + pWidget->GetAAction(CPDF_AAction::kButtonDown).GetDict()) { m_bNotifying = true; uint32_t nValueAge = pWidget->GetValueAge(); @@ -197,7 +197,7 @@ bool CFFL_InteractiveFormFiller::OnLButtonDown( CPDFSDK_FieldAction fa; fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlags); fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlags); - pWidget->OnAAction(CPDF_AAction::ButtonDown, &fa, pPageView); + pWidget->OnAAction(CPDF_AAction::kButtonDown, &fa, pPageView); m_bNotifying = false; if (!pAnnot->HasObservable()) return true; @@ -263,7 +263,7 @@ bool CFFL_InteractiveFormFiller::OnButtonUp(CPDFSDK_Annot::ObservedPtr* pAnnot, return false; CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); - if (!pWidget->GetAAction(CPDF_AAction::ButtonUp).GetDict()) + if (!pWidget->GetAAction(CPDF_AAction::kButtonUp).GetDict()) return false; m_bNotifying = true; @@ -275,7 +275,7 @@ bool CFFL_InteractiveFormFiller::OnButtonUp(CPDFSDK_Annot::ObservedPtr* pAnnot, CPDFSDK_FieldAction fa; fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag); fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag); - pWidget->OnAAction(CPDF_AAction::ButtonUp, &fa, pPageView); + pWidget->OnAAction(CPDF_AAction::kButtonUp, &fa, pPageView); m_bNotifying = false; if (!pAnnot->HasObservable() || !IsValidAnnot(pPageView, pWidget)) return true; @@ -371,7 +371,7 @@ bool CFFL_InteractiveFormFiller::OnSetFocus(CPDFSDK_Annot::ObservedPtr* pAnnot, ASSERT((*pAnnot)->GetPDFAnnot()->GetSubtype() == CPDF_Annot::Subtype::WIDGET); if (!m_bNotifying) { CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); - if (pWidget->GetAAction(CPDF_AAction::GetFocus).GetDict()) { + if (pWidget->GetAAction(CPDF_AAction::kGetFocus).GetDict()) { m_bNotifying = true; uint32_t nValueAge = pWidget->GetValueAge(); @@ -387,8 +387,8 @@ bool CFFL_InteractiveFormFiller::OnSetFocus(CPDFSDK_Annot::ObservedPtr* pAnnot, CPDFSDK_FieldAction fa; fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag); fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag); - pFormFiller->GetActionData(pPageView, CPDF_AAction::GetFocus, fa); - pWidget->OnAAction(CPDF_AAction::GetFocus, &fa, pPageView); + pFormFiller->GetActionData(pPageView, CPDF_AAction::kGetFocus, fa); + pWidget->OnAAction(CPDF_AAction::kGetFocus, &fa, pPageView); m_bNotifying = false; if (!pAnnot->HasObservable()) return false; @@ -426,7 +426,7 @@ bool CFFL_InteractiveFormFiller::OnKillFocus(CPDFSDK_Annot::ObservedPtr* pAnnot, return true; CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); - if (!pWidget->GetAAction(CPDF_AAction::LoseFocus).GetDict()) + if (!pWidget->GetAAction(CPDF_AAction::kLoseFocus).GetDict()) return true; m_bNotifying = true; @@ -438,8 +438,8 @@ bool CFFL_InteractiveFormFiller::OnKillFocus(CPDFSDK_Annot::ObservedPtr* pAnnot, CPDFSDK_FieldAction fa; fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag); fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag); - pFormFiller->GetActionData(pPageView, CPDF_AAction::LoseFocus, fa); - pWidget->OnAAction(CPDF_AAction::LoseFocus, &fa, pPageView); + pFormFiller->GetActionData(pPageView, CPDF_AAction::kLoseFocus, fa); + pWidget->OnAAction(CPDF_AAction::kLoseFocus, &fa, pPageView); m_bNotifying = false; return pAnnot->HasObservable(); } @@ -638,7 +638,7 @@ bool CFFL_InteractiveFormFiller::OnKeyStrokeCommit( return true; CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); - if (!pWidget->GetAAction(CPDF_AAction::KeyStroke).GetDict()) + if (!pWidget->GetAAction(CPDF_AAction::kKeyStroke).GetDict()) return true; ASSERT(pPageView); @@ -653,9 +653,9 @@ bool CFFL_InteractiveFormFiller::OnKeyStrokeCommit( fa.bRC = true; CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, false); - pFormFiller->GetActionData(pPageView, CPDF_AAction::KeyStroke, fa); + pFormFiller->GetActionData(pPageView, CPDF_AAction::kKeyStroke, fa); pFormFiller->SaveState(pPageView); - pWidget->OnAAction(CPDF_AAction::KeyStroke, &fa, pPageView); + pWidget->OnAAction(CPDF_AAction::kKeyStroke, &fa, pPageView); if (!pAnnot->HasObservable()) return true; @@ -670,7 +670,7 @@ bool CFFL_InteractiveFormFiller::OnValidate(CPDFSDK_Annot::ObservedPtr* pAnnot, return true; CPDFSDK_Widget* pWidget = ToCPDFSDKWidget(pAnnot->Get()); - if (!pWidget->GetAAction(CPDF_AAction::Validate).GetDict()) + if (!pWidget->GetAAction(CPDF_AAction::kValidate).GetDict()) return true; ASSERT(pPageView); @@ -684,9 +684,9 @@ bool CFFL_InteractiveFormFiller::OnValidate(CPDFSDK_Annot::ObservedPtr* pAnnot, fa.bRC = true; CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, false); - pFormFiller->GetActionData(pPageView, CPDF_AAction::Validate, fa); + pFormFiller->GetActionData(pPageView, CPDF_AAction::kValidate, fa); pFormFiller->SaveState(pPageView); - pWidget->OnAAction(CPDF_AAction::Validate, &fa, pPageView); + pWidget->OnAAction(CPDF_AAction::kValidate, &fa, pPageView); if (!pAnnot->HasObservable()) return true; @@ -907,7 +907,7 @@ std::pair<bool, bool> CFFL_InteractiveFormFiller::OnBeforeKeyStroke( #endif // PDF_ENABLE_XFA if (m_bNotifying || - !privateData.pWidget->GetAAction(CPDF_AAction::KeyStroke).GetDict()) { + !privateData.pWidget->GetAAction(CPDF_AAction::kKeyStroke).GetDict()) { return {true, false}; } @@ -929,13 +929,13 @@ std::pair<bool, bool> CFFL_InteractiveFormFiller::OnBeforeKeyStroke( fa.bRC = true; fa.nSelStart = nSelStart; fa.nSelEnd = nSelEnd; - pFormFiller->GetActionData(privateData.pPageView, CPDF_AAction::KeyStroke, + pFormFiller->GetActionData(privateData.pPageView, CPDF_AAction::kKeyStroke, fa); pFormFiller->SaveState(privateData.pPageView); CPDFSDK_Annot::ObservedPtr pObserved(privateData.pWidget); bool action_status = privateData.pWidget->OnAAction( - CPDF_AAction::KeyStroke, &fa, privateData.pPageView); + CPDF_AAction::kKeyStroke, &fa, privateData.pPageView); if (!pObserved || !IsValidAnnot(privateData.pPageView, privateData.pWidget)) return {true, true}; @@ -953,7 +953,7 @@ std::pair<bool, bool> CFFL_InteractiveFormFiller::OnBeforeKeyStroke( bExit = true; } if (fa.bRC) { - pFormFiller->SetActionData(privateData.pPageView, CPDF_AAction::KeyStroke, + pFormFiller->SetActionData(privateData.pPageView, CPDF_AAction::kKeyStroke, fa); } else { pFormFiller->RestoreState(privateData.pPageView); diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp index 472501df2c..3ca95a89d4 100644 --- a/fpdfsdk/formfiller/cffl_listbox.cpp +++ b/fpdfsdk/formfiller/cffl_listbox.cpp @@ -140,7 +140,7 @@ void CFFL_ListBox::GetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type, CPDFSDK_FieldAction& fa) { switch (type) { - case CPDF_AAction::Validate: + case CPDF_AAction::kValidate: if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) { fa.sValue = L""; } else { @@ -153,8 +153,8 @@ void CFFL_ListBox::GetActionData(CPDFSDK_PageView* pPageView, } } break; - case CPDF_AAction::LoseFocus: - case CPDF_AAction::GetFocus: + case CPDF_AAction::kLoseFocus: + case CPDF_AAction::kGetFocus: if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) { fa.sValue = L""; } else { diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp index 6f9ec03f44..65f28fef11 100644 --- a/fpdfsdk/formfiller/cffl_textfield.cpp +++ b/fpdfsdk/formfiller/cffl_textfield.cpp @@ -158,7 +158,7 @@ void CFFL_TextField::GetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type, CPDFSDK_FieldAction& fa) { switch (type) { - case CPDF_AAction::KeyStroke: + case CPDF_AAction::kKeyStroke: if (CPWL_Edit* pWnd = GetEdit(pPageView, false)) { fa.bFieldFull = pWnd->IsTextFull(); @@ -170,13 +170,13 @@ void CFFL_TextField::GetActionData(CPDFSDK_PageView* pPageView, } } break; - case CPDF_AAction::Validate: + case CPDF_AAction::kValidate: if (CPWL_Edit* pWnd = GetEdit(pPageView, false)) { fa.sValue = pWnd->GetText(); } break; - case CPDF_AAction::LoseFocus: - case CPDF_AAction::GetFocus: + case CPDF_AAction::kLoseFocus: + case CPDF_AAction::kGetFocus: fa.sValue = m_pWidget->GetValue(); break; default: @@ -188,7 +188,7 @@ void CFFL_TextField::SetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type, const CPDFSDK_FieldAction& fa) { switch (type) { - case CPDF_AAction::KeyStroke: + case CPDF_AAction::kKeyStroke: if (CPWL_Edit* pEdit = GetEdit(pPageView, false)) { pEdit->SetFocus(); pEdit->SetSelection(fa.nSelStart, fa.nSelEnd); @@ -204,7 +204,7 @@ bool CFFL_TextField::IsActionDataChanged(CPDF_AAction::AActionType type, const CPDFSDK_FieldAction& faOld, const CPDFSDK_FieldAction& faNew) { switch (type) { - case CPDF_AAction::KeyStroke: + case CPDF_AAction::kKeyStroke: return (!faOld.bFieldFull && faOld.nSelEnd != faNew.nSelEnd) || faOld.nSelStart != faNew.nSelStart || faOld.sChange != faNew.sChange; |