diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-19 14:32:16 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-19 14:32:16 -0700 |
| commit | a5b47041066011eb590a020bb38035442fce48af (patch) | |
| tree | 5ded0a9c0c73ccd83681e3bd3007c7a6461c9a9a /fpdfsdk/include | |
| parent | b0748bb1b207559deaec7a5f49c00c492a5f6082 (diff) | |
| download | pdfium-a5b47041066011eb590a020bb38035442fce48af.tar.xz | |
Merge to XFA: Remove dead code that was reactivated when fixing overrides.
BUG=pdfium:205
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1409743004 .
(cherry picked from commit 9ddafc82bddb984ae46ee0df801ba20b446d5158)
Review URL: https://codereview.chromium.org/1411423002 .
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/formfiller/FFL_ComboBox.h | 1 | ||||
| -rw-r--r-- | fpdfsdk/include/formfiller/FFL_FormFiller.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/include/formfiller/FFL_IFormFiller.h | 8 | ||||
| -rw-r--r-- | fpdfsdk/include/formfiller/FFL_ListBox.h | 1 | ||||
| -rw-r--r-- | fpdfsdk/include/pdfwindow/PWL_Edit.h | 8 |
5 files changed, 2 insertions, 18 deletions
diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h index 7355045c28..c943511c97 100644 --- a/fpdfsdk/include/formfiller/FFL_ComboBox.h +++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h @@ -47,7 +47,6 @@ class CFFL_ComboBox : public CFFL_FormFiller, void RestoreState(CPDFSDK_PageView* pPageView) override; CPWL_Wnd* ResetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bRestoreValue) override; - void OnKeyStroke(FX_BOOL bKeyDown, FX_DWORD nFlag) override; // IPWL_FocusHandler: void OnSetFocus(CPWL_Wnd* pWnd) override; diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h index 352b695639..5cfa2b6878 100644 --- a/fpdfsdk/include/formfiller/FFL_FormFiller.h +++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h @@ -103,8 +103,6 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { virtual CPWL_Wnd* ResetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bRestoreValue); - virtual void OnKeyStroke(FX_BOOL bKeyDown, FX_DWORD nFlag); - CPDF_Matrix GetCurMatrix(); CPDF_Rect FFLtoPWL(const CPDF_Rect& rect); diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h index 1c1fd07c35..723aa2bcb4 100644 --- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h +++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h @@ -149,9 +149,7 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { FX_FLOAT fPopupMax, int32_t& nRet, FX_FLOAT& fPopupRet) override; - void OnBeforeKeyStroke(FX_BOOL bEditOrList, - void* pPrivateData, - int32_t nKeyCode, + void OnBeforeKeyStroke(void* pPrivateData, CFX_WideString& strChange, const CFX_WideString& strChangeEx, int nSelStart, @@ -160,10 +158,6 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { 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, diff --git a/fpdfsdk/include/formfiller/FFL_ListBox.h b/fpdfsdk/include/formfiller/FFL_ListBox.h index 01ad2218d0..227f062e46 100644 --- a/fpdfsdk/include/formfiller/FFL_ListBox.h +++ b/fpdfsdk/include/formfiller/FFL_ListBox.h @@ -35,7 +35,6 @@ class CFFL_ListBox : public CFFL_FormFiller { void RestoreState(CPDFSDK_PageView* pPageView) override; CPWL_Wnd* ResetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bRestoreValue) override; - void OnKeyStroke(FX_BOOL bKeyDown, FX_DWORD nFlag) override; private: CBA_FontMap* m_pFontMap; diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h index 25da59197a..2b59421aa4 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Edit.h +++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h @@ -24,9 +24,7 @@ class IPWL_Filler_Notify { FX_FLOAT fPopupMax, int32_t& nRet, FX_FLOAT& fPopupRet) = 0; // nRet: (0:bottom 1:top) - virtual void OnBeforeKeyStroke(FX_BOOL bEditOrList, - void* pPrivateData, - int32_t nKeyCode, + virtual void OnBeforeKeyStroke(void* pPrivateData, CFX_WideString& strChange, const CFX_WideString& strChangeEx, int nSelStart, @@ -35,10 +33,6 @@ class IPWL_Filler_Notify { FX_BOOL& bRC, FX_BOOL& bExit, FX_DWORD nFlag) = 0; - virtual void OnAfterKeyStroke(FX_BOOL bEditOrList, - void* pPrivateData, - FX_BOOL& bExit, - FX_DWORD nFlag) = 0; virtual void OnPopupPreOpen(void* pPrivateData, FX_BOOL& bExit, |