From 04f50cf6ce219c7526acc6304ef2efd8c151f998 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 22 Jan 2018 21:11:17 +0000 Subject: Remove unused WidgetPreRemove and WidgetPostAdd params This CL removes the unused WidgetAcc param from both methods and updates callsites as needed. The include for cxfa_widgetacc.h was removed from fxfa.h and had to be inserted in locations where needed. Change-Id: I55ae9e935a948dff3b6d906b4567665e60530eba Reviewed-on: https://pdfium-review.googlesource.com/23391 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp | 7 +++---- fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h | 6 ++---- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'fpdfsdk/fpdfxfa') diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp index 4ebe8f92b9..a1bea0d7d5 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp @@ -21,6 +21,7 @@ #include "xfa/fxfa/cxfa_ffdocview.h" #include "xfa/fxfa/cxfa_ffwidget.h" #include "xfa/fxfa/cxfa_ffwidgethandler.h" +#include "xfa/fxfa/cxfa_widgetacc.h" #include "xfa/fxfa/cxfa_widgetacciterator.h" #include "xfa/fxfa/parser/cxfa_submit.h" @@ -288,8 +289,7 @@ void CPDFXFA_DocEnvironment::PageViewEvent(CXFA_FFPageView* pPageView, pFormFillEnv->PageEvent(count, flag); } -void CPDFXFA_DocEnvironment::WidgetPostAdd(CXFA_FFWidget* hWidget, - CXFA_WidgetAcc* pWidgetAcc) { +void CPDFXFA_DocEnvironment::WidgetPostAdd(CXFA_FFWidget* hWidget) { if (m_pContext->GetFormType() != FormType::kXFAFull || !hWidget) return; @@ -306,8 +306,7 @@ void CPDFXFA_DocEnvironment::WidgetPostAdd(CXFA_FFWidget* hWidget, ->AddAnnot(hWidget); } -void CPDFXFA_DocEnvironment::WidgetPreRemove(CXFA_FFWidget* hWidget, - CXFA_WidgetAcc* pWidgetAcc) { +void CPDFXFA_DocEnvironment::WidgetPreRemove(CXFA_FFWidget* hWidget) { if (m_pContext->GetFormType() != FormType::kXFAFull || !hWidget) return; diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h index 9eabf8d655..4e037210b2 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h @@ -38,10 +38,8 @@ class CPDFXFA_DocEnvironment : public IXFA_DocEnvironment { // dwFlags XFA_PAGEVIEWEVENT_Added, XFA_PAGEVIEWEVENT_Removing void PageViewEvent(CXFA_FFPageView* pPageView, uint32_t dwFlags) override; - void WidgetPostAdd(CXFA_FFWidget* hWidget, - CXFA_WidgetAcc* pWidgetAcc) override; - void WidgetPreRemove(CXFA_FFWidget* hWidget, - CXFA_WidgetAcc* pWidgetAcc) override; + void WidgetPostAdd(CXFA_FFWidget* hWidget) override; + void WidgetPreRemove(CXFA_FFWidget* hWidget) override; // Host method int32_t CountPages(CXFA_FFDoc* hDoc) override; -- cgit v1.2.3