diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-08-10 01:07:19 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-08-10 01:07:19 -0700 |
| commit | 335e11825fcb8520f68ac668f8dacd9b48f05804 (patch) | |
| tree | 5ee84a54b99ecbc2ebd3205ca5fe5b6e6ee09891 /fpdfsdk/src/formfiller/FFL_FormFiller.cpp | |
| parent | 68869fd52909b3d5a66dd891b0637fb2718bed35 (diff) | |
| download | pdfium-335e11825fcb8520f68ac668f8dacd9b48f05804.tar.xz | |
Merge to XFA: Cleanup: Mark methods with the override keyword.
- Delete unneeded CFFL_ComboBox::CanCopy() and friends.
- Delete unneeded CFFL_FormFiller::CanCopy() and friends.
- Delete unneeded CFFL_TextField::CanCopy() and friends.
- Delete unneeded FormFiller::DoCopy() and friends.
- Rename CFFL_FormFiller::On{Set,Kill}Focus to avoid conflicts.
BUG=pdfium:185
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/1283493004 .
(cherry picked from commit 3a3849176aa6e2db8baf2f9367b2d96c71815319)
Review URL: https://codereview.chromium.org/1279123006 .
Diffstat (limited to 'fpdfsdk/src/formfiller/FFL_FormFiller.cpp')
| -rw-r--r-- | fpdfsdk/src/formfiller/FFL_FormFiller.cpp | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp index 5e5999043b..42177f5932 100644 --- a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp @@ -242,7 +242,8 @@ FX_BOOL CFFL_FormFiller::OnChar(CPDFSDK_Annot* pAnnot, return FALSE; } -FX_BOOL CFFL_FormFiller::OnSetFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) { +FX_BOOL CFFL_FormFiller::SetFocusForAnnot(CPDFSDK_Annot* pAnnot, + FX_UINT nFlag) { CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot; CPDFXFA_Page* pPage = pWidget->GetPDFXFAPage(); CPDFSDK_Document* pDoc = m_pApp->GetSDKDocument(); @@ -256,7 +257,8 @@ FX_BOOL CFFL_FormFiller::OnSetFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) { return TRUE; } -FX_BOOL CFFL_FormFiller::OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) { +FX_BOOL CFFL_FormFiller::KillFocusForAnnot(CPDFSDK_Annot* pAnnot, + FX_UINT nFlag) { if (!IsValid()) return TRUE; @@ -603,7 +605,7 @@ IFX_SystemHandler* CFFL_FormFiller::GetSystemHandler() const { return m_pApp->GetSysHandler(); } -void CFFL_FormFiller::OnKeyStroke(FX_BOOL bKeyDown) {} +void CFFL_FormFiller::OnKeyStroke(FX_BOOL bKeyDown, FX_DWORD nFlag) {} void CFFL_FormFiller::EscapeFiller(CPDFSDK_PageView* pPageView, FX_BOOL bDestroyPDFWindow) { @@ -616,24 +618,6 @@ void CFFL_FormFiller::EscapeFiller(CPDFSDK_PageView* pPageView, DestroyPDFWindow(pPageView); } -FX_BOOL CFFL_FormFiller::CanCopy(CPDFSDK_Document* pDocument) { - return FALSE; -} - -FX_BOOL CFFL_FormFiller::CanCut(CPDFSDK_Document* pDocument) { - return FALSE; -} - -FX_BOOL CFFL_FormFiller::CanPaste(CPDFSDK_Document* pDocument) { - return FALSE; -} - -void CFFL_FormFiller::DoCopy(CPDFSDK_Document* pDocument) {} - -void CFFL_FormFiller::DoCut(CPDFSDK_Document* pDocument) {} - -void CFFL_FormFiller::DoPaste(CPDFSDK_Document* pDocument) {} - void CFFL_FormFiller::InvalidateRect(double left, double top, double right, |