From a5b47041066011eb590a020bb38035442fce48af Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 19 Oct 2015 14:32:16 -0700 Subject: 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 . --- fpdfsdk/src/formfiller/FFL_ComboBox.cpp | 18 ------------------ fpdfsdk/src/formfiller/FFL_FormFiller.cpp | 2 -- fpdfsdk/src/formfiller/FFL_IFormFiller.cpp | 17 +---------------- fpdfsdk/src/formfiller/FFL_ListBox.cpp | 18 ------------------ 4 files changed, 1 insertion(+), 54 deletions(-) (limited to 'fpdfsdk/src/formfiller') diff --git a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp index ea8d295dff..b4619cb32d 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; - } - } - } -} - FX_BOOL CFFL_ComboBox::IsFieldFull(CPDFSDK_PageView* pPageView) { if (CPWL_ComboBox* pComboBox = (CPWL_ComboBox*)GetPDFWindow(pPageView, FALSE)) { diff --git a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp index 30a297dd68..b6224294df 100644 --- a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp @@ -602,8 +602,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 c1450f6c84..6ef8785636 100644 --- a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp @@ -986,9 +986,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, @@ -1078,16 +1076,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; - } - } - } -} -- cgit v1.2.3