diff options
author | Lei Zhang <thestig@chromium.org> | 2015-10-19 14:14:48 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-10-19 14:14:48 -0700 |
commit | 9ddafc82bddb984ae46ee0df801ba20b446d5158 (patch) | |
tree | f33eb91c89cb3534dc72b76843b54609abafaf36 /fpdfsdk/src/formfiller | |
parent | 6d34d056a7188b7ae9800fe3ceb68645e0442879 (diff) | |
download | pdfium-chromium/2542.tar.xz |
Remove dead code that was reactivated when fixing overrides.chromium/2545chromium/2544chromium/2543chromium/2542chromium/2541
BUG=pdfium:205
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1409743004 .
Diffstat (limited to 'fpdfsdk/src/formfiller')
-rw-r--r-- | fpdfsdk/src/formfiller/FFL_ComboBox.cpp | 18 | ||||
-rw-r--r-- | fpdfsdk/src/formfiller/FFL_FormFiller.cpp | 2 | ||||
-rw-r--r-- | fpdfsdk/src/formfiller/FFL_IFormFiller.cpp | 17 | ||||
-rw-r--r-- | fpdfsdk/src/formfiller/FFL_ListBox.cpp | 18 |
4 files changed, 1 insertions, 54 deletions
diff --git a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp index 29352216ab..3925e14347 100644 --- a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp @@ -256,24 +256,6 @@ CPWL_Wnd* CFFL_ComboBox::ResetPDFWindow(CPDFSDK_PageView* pPageView, return pRet; } -void CFFL_ComboBox::OnKeyStroke(FX_BOOL bKeyDown, FX_UINT nFlag) { - ASSERT(m_pWidget != NULL); - - int nFlags = m_pWidget->GetFieldFlags(); - - if (nFlags & FIELDFLAG_COMMITONSELCHANGE) { - if (m_bValid) { - CPDFSDK_PageView* pPageView = GetCurPageView(); - ASSERT(pPageView != NULL); - - if (CommitData(pPageView, nFlag)) { - DestroyPDFWindow(pPageView); - m_bValid = FALSE; - } - } - } -} - void CFFL_ComboBox::OnSetFocus(CPWL_Wnd* pWnd) { ASSERT(m_pApp != NULL); diff --git a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp index 1bd2944636..40d5ede335 100644 --- a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp @@ -598,8 +598,6 @@ IFX_SystemHandler* CFFL_FormFiller::GetSystemHandler() const { return m_pApp->GetSysHandler(); } -void CFFL_FormFiller::OnKeyStroke(FX_BOOL bKeyDown, FX_DWORD nFlag) {} - void CFFL_FormFiller::EscapeFiller(CPDFSDK_PageView* pPageView, FX_BOOL bDestroyPDFWindow) { m_bValid = FALSE; diff --git a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp index ce0a67f4fe..2126c2a903 100644 --- a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp @@ -800,9 +800,7 @@ FX_BOOL CFFL_IFormFiller::IsValidAnnot(CPDFSDK_PageView* pPageView, return FALSE; } -void CFFL_IFormFiller::OnBeforeKeyStroke(FX_BOOL bEditOrList, - void* pPrivateData, - int32_t nKeyCode, +void CFFL_IFormFiller::OnBeforeKeyStroke(void* pPrivateData, CFX_WideString& strChange, const CFX_WideString& strChangeEx, int nSelStart, @@ -881,16 +879,3 @@ void CFFL_IFormFiller::OnBeforeKeyStroke(FX_BOOL bEditOrList, } } } - -void CFFL_IFormFiller::OnAfterKeyStroke(FX_BOOL bEditOrList, - void* pPrivateData, - FX_BOOL& bExit, - FX_DWORD nFlag) { - CFFL_PrivateData* pData = (CFFL_PrivateData*)pPrivateData; - ASSERT(pData->pWidget); - - CFFL_FormFiller* pFormFiller = GetFormFiller(pData->pWidget, FALSE); - - if (!bEditOrList) - pFormFiller->OnKeyStroke(bExit, nFlag); -} diff --git a/fpdfsdk/src/formfiller/FFL_ListBox.cpp b/fpdfsdk/src/formfiller/FFL_ListBox.cpp index 0f478fe7e0..343683016f 100644 --- a/fpdfsdk/src/formfiller/FFL_ListBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_ListBox.cpp @@ -228,21 +228,3 @@ CPWL_Wnd* CFFL_ListBox::ResetPDFWindow(CPDFSDK_PageView* pPageView, return pRet; } - -void CFFL_ListBox::OnKeyStroke(FX_BOOL bKeyDown, FX_DWORD nFlag) { - ASSERT(m_pWidget != NULL); - - int nFlags = m_pWidget->GetFieldFlags(); - - if (nFlags & FIELDFLAG_COMMITONSELCHANGE) { - if (m_bValid) { - CPDFSDK_PageView* pPageView = GetCurPageView(); - ASSERT(pPageView != NULL); - - if (CommitData(pPageView, nFlag)) { - DestroyPDFWindow(pPageView); - m_bValid = FALSE; - } - } - } -} |