From f2d3911ce1a07812d75e7671e038d0922a823528 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 22 Jun 2015 15:09:03 -0700 Subject: Cleanup: Remove dead formfiller code. R=jam@chromium.org Review URL: https://codereview.chromium.org/1196853002. --- fpdfsdk/src/formfiller/FFL_ComboBox.cpp | 15 ---- fpdfsdk/src/formfiller/FFL_FormFiller.cpp | 28 ------- fpdfsdk/src/formfiller/FFL_IFormFiller.cpp | 130 ----------------------------- fpdfsdk/src/formfiller/FFL_TextField.cpp | 14 ---- 4 files changed, 187 deletions(-) (limited to 'fpdfsdk/src/formfiller') diff --git a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp index ed38144429..5618e8a62b 100644 --- a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp @@ -376,21 +376,6 @@ FX_BOOL CFFL_ComboBox::CanPaste(CPDFSDK_Document* pDocument) return FALSE; } -void CFFL_ComboBox::DoCopy(CPDFSDK_Document* pDocument) -{ - ASSERT(pDocument != NULL); -} - -void CFFL_ComboBox::DoCut(CPDFSDK_Document* pDocument) -{ - ASSERT(pDocument != NULL); -} - -void CFFL_ComboBox::DoPaste(CPDFSDK_Document* pDocument) -{ - ASSERT(pDocument != NULL); -} - void CFFL_ComboBox::OnAddUndo(CPWL_Edit* pEdit) { ASSERT(pEdit != NULL); diff --git a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp index 6b211f3b8f..1b152d7b4b 100644 --- a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp @@ -225,17 +225,6 @@ FX_BOOL CFFL_FormFiller::OnRButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* return FALSE; } -FX_BOOL CFFL_FormFiller::OnRButtonDblClk(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point) -{ - if (CPWL_Wnd * pWnd = GetPDFWindow(pPageView, FALSE)) - { - pWnd->OnRButtonDblClk(WndtoPWL(pPageView, point),nFlags); - return TRUE; - } - - return FALSE; -} - FX_BOOL CFFL_FormFiller::OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, FX_UINT nFlags) { if (IsValid()) @@ -268,16 +257,6 @@ FX_BOOL CFFL_FormFiller::OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nF return FALSE; } -void CFFL_FormFiller::OnDeSelected(CPDFSDK_Annot* pAnnot) -{ - ASSERT(FALSE); -} - -void CFFL_FormFiller::OnSelected(CPDFSDK_Annot* pAnnot) -{ - ASSERT(FALSE); -} - FX_BOOL CFFL_FormFiller::OnSetFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) { CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot; @@ -287,19 +266,12 @@ FX_BOOL CFFL_FormFiller::OnSetFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag) CPDFSDK_PageView* pPageView = pDoc->GetPageView(pPage); ASSERT(pPageView != NULL); - - CPWL_Wnd * pWnd = NULL; if ( (pWnd = GetPDFWindow(pPageView, TRUE))) { pWnd->SetFocus(); } - m_bValid = TRUE; - - - - m_bValid = TRUE; FX_RECT rcRect = GetViewBBox(pPageView,pAnnot); InvalidateRect(rcRect.left, rcRect.top, rcRect.right, rcRect.bottom); diff --git a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp index 62090a5c08..078dd13c00 100644 --- a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp @@ -443,19 +443,6 @@ FX_BOOL CFFL_IFormFiller::OnRButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot return FALSE; } -FX_BOOL CFFL_IFormFiller::OnRButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point) -{ - ASSERT(pAnnot != NULL); - ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget"); - - if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) - { - return pFormFiller->OnRButtonDblClk(pPageView, pAnnot, nFlags, point); - } - - return FALSE; -} - FX_BOOL CFFL_IFormFiller::OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, FX_UINT nFlags) { ASSERT(pAnnot != NULL); @@ -484,28 +471,6 @@ FX_BOOL CFFL_IFormFiller::OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT n return FALSE; } -void CFFL_IFormFiller::OnDeSelected(CPDFSDK_Annot* pAnnot) -{ - ASSERT(pAnnot != NULL); - ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget"); - - if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) - { - pFormFiller->OnDeSelected(pAnnot); - } -} - -void CFFL_IFormFiller::OnSelected(CPDFSDK_Annot* pAnnot) -{ - ASSERT(pAnnot != NULL); - ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget"); - - if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) - { - pFormFiller->OnSelected(pAnnot); - } -} - FX_BOOL CFFL_IFormFiller::OnSetFocus(CPDFSDK_Annot* pAnnot,FX_UINT nFlag) { if(!pAnnot) return FALSE; @@ -699,11 +664,6 @@ void CFFL_IFormFiller::UnRegisterFormFiller(CPDFSDK_Annot* pAnnot) m_Maps.erase(it); } -void CFFL_IFormFiller::SetFocusAnnotTab(CPDFSDK_Annot* pWidget, FX_BOOL bSameField, FX_BOOL bNext) -{ - -} - void CFFL_IFormFiller::QueryWherePopup(void* pPrivateData, FX_FLOAT fPopupMin,FX_FLOAT fPopupMax, int32_t & nRet, FX_FLOAT & fPopupRet) { ASSERT(pPrivateData != NULL); @@ -795,44 +755,6 @@ void CFFL_IFormFiller::QueryWherePopup(void* pPrivateData, FX_FLOAT fPopupMin,FX fPopupRet = fFactHeight; } -void CFFL_IFormFiller::OnSetWindowRect(void* pPrivateData, const CPDF_Rect & rcWindow) -{ - ASSERT(pPrivateData != NULL); - - CFFL_PrivateData* pData = (CFFL_PrivateData*)pPrivateData; - - if (CFFL_FormFiller* pFormFiller = GetFormFiller(pData->pWidget, TRUE)) - { - - CPDF_Rect rcOld = pFormFiller->PWLtoFFL(pFormFiller->GetWindowRect(pData->pPageView)); - CPDF_Rect rcNew = pFormFiller->PWLtoFFL(rcWindow); - pFormFiller->SetWindowRect(pData->pPageView, rcWindow); - - CPDF_Rect unRect = rcOld; - unRect.Union(rcNew); - //FX_RECT rcRect = unRect.GetOutterRect(); - unRect.left = (FX_FLOAT)(unRect.left - 0.5); - unRect.right = (FX_FLOAT)(unRect.right + 0.5); - unRect.top = (FX_FLOAT)(unRect.top + 0.5); - unRect.bottom = (FX_FLOAT)(unRect.bottom -0.5); - m_pApp->FFI_Invalidate(pData->pWidget->GetPDFPage(), unRect.left, unRect.top, unRect.right, unRect.bottom); - } -} - -void CFFL_IFormFiller::OnKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, int32_t nKeyCode, CFX_WideString& strChange, - const CFX_WideString& strChangeEx, FX_BOOL bKeyDown, - FX_BOOL & bRC, FX_BOOL & bExit) -{ - ASSERT(pPrivateData != NULL); - CFFL_PrivateData* pData = (CFFL_PrivateData*)pPrivateData; - ASSERT(pData->pWidget != NULL); - - CFFL_FormFiller* pFormFiller = GetFormFiller(pData->pWidget, FALSE); - ASSERT(pFormFiller != NULL); - - pFormFiller->OnKeyStroke(bKeyDown); -} - void CFFL_IFormFiller::OnKeyStrokeCommit(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bRC, FX_BOOL& bExit, FX_DWORD nFlag) { if (!m_bNotifying) @@ -844,10 +766,6 @@ void CFFL_IFormFiller::OnKeyStrokeCommit(CPDFSDK_Widget* pWidget, CPDFSDK_PageVi pWidget->ClearAppModified(); ASSERT(pPageView != NULL); -// CReader_DocView* pDocView = pPageView->GetDocView(); -// ASSERT(pDocView != NULL); - - PDFSDK_FieldAction fa; fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag); @@ -977,54 +895,6 @@ FX_BOOL CFFL_IFormFiller::IsValidAnnot(CPDFSDK_PageView* pPageView, CPDFSDK_Anno return FALSE; } -void CFFL_IFormFiller::BeforeUndo(CPDFSDK_Document* pDocument) -{ - -} - -void CFFL_IFormFiller::BeforeRedo(CPDFSDK_Document* pDocument) -{ - BeforeUndo(pDocument); -} - -void CFFL_IFormFiller::AfterUndo(CPDFSDK_Document* pDocument) -{ -} - -void CFFL_IFormFiller::AfterRedo(CPDFSDK_Document* pDocument) -{ -} - -FX_BOOL CFFL_IFormFiller::CanCopy(CPDFSDK_Document* pDocument) -{ - - return FALSE; -} - -FX_BOOL CFFL_IFormFiller::CanCut(CPDFSDK_Document* pDocument) -{ - - return FALSE; -} - -FX_BOOL CFFL_IFormFiller::CanPaste(CPDFSDK_Document* pDocument) -{ - - return FALSE; -} - -void CFFL_IFormFiller::DoCopy(CPDFSDK_Document* pDocument) -{ -} - -void CFFL_IFormFiller::DoCut(CPDFSDK_Document* pDocument) -{ -} - -void CFFL_IFormFiller::DoPaste(CPDFSDK_Document* pDocument) -{ - -} void CFFL_IFormFiller::OnBeforeKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, int32_t nKeyCode, CFX_WideString & strChange, const CFX_WideString& strChangeEx, int nSelStart, int nSelEnd, diff --git a/fpdfsdk/src/formfiller/FFL_TextField.cpp b/fpdfsdk/src/formfiller/FFL_TextField.cpp index ff3bcafbd1..ed155fbf3b 100644 --- a/fpdfsdk/src/formfiller/FFL_TextField.cpp +++ b/fpdfsdk/src/formfiller/FFL_TextField.cpp @@ -361,20 +361,6 @@ FX_BOOL CFFL_TextField::CanPaste(CPDFSDK_Document* pDocument) return FALSE; } -void CFFL_TextField::DoCopy(CPDFSDK_Document* pDocument) -{ - -} - -void CFFL_TextField::DoCut(CPDFSDK_Document* pDocument) -{ -} - -void CFFL_TextField::DoPaste(CPDFSDK_Document* pDocument) -{ - -} - void CFFL_TextField::OnAddUndo(CPWL_Edit* pEdit) { } -- cgit v1.2.3