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_interactiveformfiller.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'fpdfsdk/formfiller/cffl_interactiveformfiller.cpp') diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp index 491186e39c..2c75225283 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp @@ -478,7 +478,8 @@ CFFL_FormFiller* CFFL_InteractiveFormFiller::GetFormFiller( if (!bRegister) return nullptr; - CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot; + // TODO(thestig): How do we know |pAnnot| is a CPDFSDK_Widget? + CPDFSDK_Widget* pWidget = static_cast(pAnnot); int nFieldType = pWidget->GetFieldType(); CFFL_FormFiller* pFormFiller; switch (nFieldType) { -- cgit v1.2.3