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/include/formfiller/FFL_ComboBox.h | 4 - fpdfsdk/include/formfiller/FFL_FormFiller.h | 7 -- fpdfsdk/include/formfiller/FFL_IFormFiller.h | 29 -------- fpdfsdk/include/formfiller/FFL_TextField.h | 4 - fpdfsdk/include/pdfwindow/PWL_Wnd.h | 1 - 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 -- fpdfsdk/src/pdfwindow/PWL_Wnd.cpp | 1 - 10 files changed, 189 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h index 1a3c20c94c..3d1855ceac 100644 --- a/fpdfsdk/include/formfiller/FFL_ComboBox.h +++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h @@ -66,10 +66,6 @@ class CFFL_ComboBox : public CFFL_FormFiller, virtual FX_BOOL CanCut(CPDFSDK_Document* pDocument); virtual FX_BOOL CanPaste(CPDFSDK_Document* pDocument); - virtual void DoCopy(CPDFSDK_Document* pDocument); - virtual void DoCut(CPDFSDK_Document* pDocument); - virtual void DoPaste(CPDFSDK_Document* pDocument); - private: CFX_WideString GetSelectExportText(); diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h index fab989c14a..5ed5265b6f 100644 --- a/fpdfsdk/include/formfiller/FFL_FormFiller.h +++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h @@ -72,19 +72,12 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point); - virtual FX_BOOL OnRButtonDblClk(CPDFSDK_PageView* pPageView, - CPDFSDK_Annot* pAnnot, - FX_UINT nFlags, - const CPDF_Point& point); virtual FX_BOOL OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, FX_UINT nFlags); virtual FX_BOOL OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags); - virtual void OnDeSelected(CPDFSDK_Annot* pAnnot); - virtual void OnSelected(CPDFSDK_Annot* pAnnot); - virtual FX_BOOL OnSetFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag); virtual FX_BOOL OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag); diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h index ece8e4a4a6..560cef1fa8 100644 --- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h +++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h @@ -70,19 +70,12 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point); - virtual FX_BOOL OnRButtonDblClk(CPDFSDK_PageView* pPageView, - CPDFSDK_Annot* pAnnot, - FX_UINT nFlags, - const CPDF_Point& point); virtual FX_BOOL OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, FX_UINT nFlags); virtual FX_BOOL OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags); - virtual void OnDeSelected(CPDFSDK_Annot* pAnnot); - virtual void OnSelected(CPDFSDK_Annot* pAnnot); - virtual FX_BOOL OnSetFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag); virtual FX_BOOL OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag); @@ -107,15 +100,6 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { FX_BOOL& bExit, FX_DWORD nFlag); - virtual void OnSetWindowRect(void* pPrivateData, const CPDF_Rect& rcWindow); - virtual void 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); virtual void OnPopupPreOpen(void* pPrivateData, FX_BOOL& bExit, FX_DWORD nFlag); @@ -123,19 +107,6 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify { FX_BOOL& bExit, FX_DWORD nFlag); - virtual void BeforeUndo(CPDFSDK_Document* pDocument); - virtual void BeforeRedo(CPDFSDK_Document* pDocument); - virtual void AfterUndo(CPDFSDK_Document* pDocument); - virtual void AfterRedo(CPDFSDK_Document* pDocument); - - virtual FX_BOOL CanCopy(CPDFSDK_Document* pDocument); - virtual FX_BOOL CanCut(CPDFSDK_Document* pDocument); - virtual FX_BOOL CanPaste(CPDFSDK_Document* pDocument); - - virtual void DoCopy(CPDFSDK_Document* pDocument); - virtual void DoCut(CPDFSDK_Document* pDocument); - virtual void DoPaste(CPDFSDK_Document* pDocument); - CFFL_FormFiller* GetFormFiller(CPDFSDK_Annot* pAnnot, FX_BOOL bRegister); void RemoveFormFiller(CPDFSDK_Annot* pAnnot); diff --git a/fpdfsdk/include/formfiller/FFL_TextField.h b/fpdfsdk/include/formfiller/FFL_TextField.h index 20f478b4e2..21ccd6fdce 100644 --- a/fpdfsdk/include/formfiller/FFL_TextField.h +++ b/fpdfsdk/include/formfiller/FFL_TextField.h @@ -66,10 +66,6 @@ class CFFL_TextField : public CFFL_FormFiller, virtual FX_BOOL CanCut(CPDFSDK_Document* pDocument); virtual FX_BOOL CanPaste(CPDFSDK_Document* pDocument); - virtual void DoCopy(CPDFSDK_Document* pDocument); - virtual void DoCut(CPDFSDK_Document* pDocument); - virtual void DoPaste(CPDFSDK_Document* pDocument); - private: CBA_FontMap* m_pFontMap; FFL_TextFieldState m_State; diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h index 29c49fbcf7..0845bb17d1 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h +++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h @@ -304,7 +304,6 @@ class CPWL_Wnd : public CPWL_TimerHandler { virtual FX_BOOL OnMButtonDblClk(const CPDF_Point& point, FX_DWORD nFlag); virtual FX_BOOL OnMButtonDown(const CPDF_Point& point, FX_DWORD nFlag); virtual FX_BOOL OnMButtonUp(const CPDF_Point& point, FX_DWORD nFlag); - virtual FX_BOOL OnRButtonDblClk(const CPDF_Point& point, FX_DWORD nFlag); virtual FX_BOOL OnRButtonDown(const CPDF_Point& point, FX_DWORD nFlag); virtual FX_BOOL OnRButtonUp(const CPDF_Point& point, FX_DWORD nFlag); virtual FX_BOOL OnMouseMove(const CPDF_Point& point, FX_DWORD nFlag); 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) {} diff --git a/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp b/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp index ce8bc57ae2..81bbbbfe8e 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp @@ -467,7 +467,6 @@ PWL_IMPLEMENT_MOUSE_METHOD(OnLButtonUp) PWL_IMPLEMENT_MOUSE_METHOD(OnMButtonDblClk) PWL_IMPLEMENT_MOUSE_METHOD(OnMButtonDown) PWL_IMPLEMENT_MOUSE_METHOD(OnMButtonUp) -PWL_IMPLEMENT_MOUSE_METHOD(OnRButtonDblClk) PWL_IMPLEMENT_MOUSE_METHOD(OnRButtonDown) PWL_IMPLEMENT_MOUSE_METHOD(OnRButtonUp) PWL_IMPLEMENT_MOUSE_METHOD(OnMouseMove) -- cgit v1.2.3