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/include/formfiller/FFL_IFormFiller.h | |
| 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/include/formfiller/FFL_IFormFiller.h')
| -rw-r--r-- | fpdfsdk/include/formfiller/FFL_IFormFiller.h | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h index 560cef1fa8..1c1fd07c35 100644 --- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h +++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h @@ -16,8 +16,8 @@ class CFFL_PrivateData; class CFFL_IFormFiller : public IPWL_Filler_Notify { public: - CFFL_IFormFiller(CPDFDoc_Environment* pApp); - virtual ~CFFL_IFormFiller(); + explicit CFFL_IFormFiller(CPDFDoc_Environment* pApp); + ~CFFL_IFormFiller() override; virtual FX_BOOL Annot_HitTest(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, @@ -25,10 +25,10 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { virtual FX_RECT GetViewBBox(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot); virtual void OnDraw(CPDFSDK_PageView* pPageView, - /*HDC hDC,*/ CPDFSDK_Annot* pAnnot, + CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device, - /*const CRect& rcWindow,*/ FX_DWORD dwFlags); + FX_DWORD dwFlags); virtual void OnCreate(CPDFSDK_Annot* pAnnot); virtual void OnLoad(CPDFSDK_Annot* pAnnot); @@ -79,27 +79,6 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { virtual FX_BOOL OnSetFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag); virtual FX_BOOL OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag); - virtual void QueryWherePopup(void* pPrivateData, - FX_FLOAT fPopupMin, - FX_FLOAT fPopupMax, - int32_t& nRet, - FX_FLOAT& fPopupRet); - virtual void OnBeforeKeyStroke(FX_BOOL bEditOrList, - void* pPrivateData, - int32_t nKeyCode, - CFX_WideString& strChange, - const CFX_WideString& strChangeEx, - int nSelStart, - int nSelEnd, - FX_BOOL bKeyDown, - FX_BOOL& bRC, - FX_BOOL& bExit, - FX_DWORD nFlag); - virtual void OnAfterKeyStroke(FX_BOOL bEditOrList, - void* pPrivateData, - FX_BOOL& bExit, - FX_DWORD nFlag); - virtual void OnPopupPreOpen(void* pPrivateData, FX_BOOL& bExit, FX_DWORD nFlag); @@ -164,6 +143,28 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { private: using CFFL_Widget2Filler = std::map<CPDFSDK_Annot*, CFFL_FormFiller*>; + // IPWL_Filler_Notify: + void QueryWherePopup(void* pPrivateData, + FX_FLOAT fPopupMin, + FX_FLOAT fPopupMax, + int32_t& nRet, + FX_FLOAT& fPopupRet) override; + void OnBeforeKeyStroke(FX_BOOL bEditOrList, + void* pPrivateData, + int32_t nKeyCode, + CFX_WideString& strChange, + const CFX_WideString& strChangeEx, + int nSelStart, + int nSelEnd, + FX_BOOL bKeyDown, + FX_BOOL& bRC, + FX_BOOL& bExit, + FX_DWORD nFlag) override; + void OnAfterKeyStroke(FX_BOOL bEditOrList, + void* pPrivateData, + FX_BOOL& bExit, + FX_DWORD nFlag) override; + void UnRegisterFormFiller(CPDFSDK_Annot* pAnnot); void SetFocusAnnotTab(CPDFSDK_Annot* pWidget, FX_BOOL bSameField, |