From 68869fd52909b3d5a66dd891b0637fb2718bed35 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 10 Aug 2015 01:01:07 -0700 Subject: Merge to XFA: Cleanup: Remove dead formfiller code. TBR=jam@chromium.org Review URL: https://codereview.chromium.org/1196853002 . (cherry picked from commit f2d3911ce1a07812d75e7671e038d0922a823528) Review URL: https://codereview.chromium.org/1280883003 . --- fpdfsdk/src/formfiller/FFL_ComboBox.cpp | 12 ---- fpdfsdk/src/formfiller/FFL_FormFiller.cpp | 20 ------ fpdfsdk/src/formfiller/FFL_IFormFiller.cpp | 105 ----------------------------- fpdfsdk/src/formfiller/FFL_TextField.cpp | 6 -- 4 files changed, 143 deletions(-) (limited to 'fpdfsdk/src/formfiller') diff --git a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp index 1477e24c44..500a22af0f 100644 --- a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp @@ -329,18 +329,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 5eef5bc370..5e5999043b 100644 --- a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp @@ -212,18 +212,6 @@ FX_BOOL CFFL_FormFiller::OnRButtonUp(CPDFSDK_PageView* pPageView, 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) { @@ -254,14 +242,6 @@ FX_BOOL CFFL_FormFiller::OnChar(CPDFSDK_Annot* pAnnot, 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; CPDFXFA_Page* pPage = pWidget->GetPDFXFAPage(); diff --git a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp index 278169e878..ca01787b44 100644 --- a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp @@ -398,20 +398,6 @@ FX_BOOL CFFL_IFormFiller::OnRButtonUp(CPDFSDK_PageView* pPageView, 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) { @@ -438,24 +424,6 @@ FX_BOOL CFFL_IFormFiller::OnChar(CPDFSDK_Annot* pAnnot, 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; @@ -616,10 +584,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, @@ -695,48 +659,6 @@ void CFFL_IFormFiller::QueryWherePopup(void* pPrivateData, 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->GetPDFXFAPage(), 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, @@ -1065,33 +987,6 @@ FX_BOOL CFFL_IFormFiller::IsValidAnnot(CPDFSDK_PageView* pPageView, 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, diff --git a/fpdfsdk/src/formfiller/FFL_TextField.cpp b/fpdfsdk/src/formfiller/FFL_TextField.cpp index 38d74f065c..a1c7d78d6a 100644 --- a/fpdfsdk/src/formfiller/FFL_TextField.cpp +++ b/fpdfsdk/src/formfiller/FFL_TextField.cpp @@ -314,10 +314,4 @@ 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