From 4f34c64914be17966f2d91591921dec635582061 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 2 Jun 2017 00:45:14 -0700 Subject: Clean up CFFL formfiller classes. - Consolidate assertions for m_pFormFillEnv. - Remove check for m_pFormFillEnv being NULL. - Pass in a CPDFSDK_Widget* instead of an Annot* and then casting. - Remove unused LoadPopupMenuString() method. Change-Id: Ic22e75c9e41eb54002be812945a3ee80debeca8b Reviewed-on: https://pdfium-review.googlesource.com/6232 Reviewed-by: Tom Sepez Commit-Queue: Lei Zhang --- fpdfsdk/formfiller/cffl_formfiller.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'fpdfsdk/formfiller/cffl_formfiller.h') diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h index 7704b5fe29..445e86fb3c 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.h +++ b/fpdfsdk/formfiller/cffl_formfiller.h @@ -22,7 +22,7 @@ class CPDFSDK_Widget; class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { public: CFFL_FormFiller(CPDFSDK_FormFillEnvironment* pFormFillEnv, - CPDFSDK_Annot* pAnnot); + CPDFSDK_Widget* pWidget); ~CFFL_FormFiller() override; virtual FX_RECT GetViewBBox(CPDFSDK_PageView* pPageView, @@ -83,7 +83,6 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { // IPWL_Provider CFX_Matrix GetWindowMatrix(void* pAttachedData) override; - CFX_WideString LoadPopupMenuString(int nIndex) override; virtual void GetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type, @@ -139,7 +138,7 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { void SetChangeMark(); virtual void InvalidateRect(const FX_RECT& rect); - CPDFSDK_Annot* GetSDKAnnot() { return m_pAnnot.Get(); } + CPDFSDK_Annot* GetSDKAnnot() { return m_pWidget.Get(); } protected: using CFFL_PageView2PDFWindow = std::map; @@ -154,7 +153,6 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { CFX_UnownedPtr const m_pFormFillEnv; CFX_UnownedPtr m_pWidget; - CFX_UnownedPtr m_pAnnot; bool m_bValid; CFFL_PageView2PDFWindow m_Maps; CFX_PointF m_ptOldPos; @@ -163,7 +161,7 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { class CFFL_Button : public CFFL_FormFiller { public: CFFL_Button(CPDFSDK_FormFillEnvironment* pFormFillEnv, - CPDFSDK_Annot* pWidget); + CPDFSDK_Widget* pWidget); ~CFFL_Button() override; // CFFL_FormFiller -- cgit v1.2.3