From d6262c1d5a83baa59d7927c646f8d62febd594b0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 3 Feb 2016 14:47:06 -0800 Subject: Merge to XFA: Fix prototypes for CPDF_FormNotify. Original Review URL: https://codereview.chromium.org/1660633003 . (cherry picked from commit e8ea737bf9ef95b406c74fc3b1120f3fa6c4e227) Conflicts: fpdfsdk/include/fsdk_baseform.h fpdfsdk/src/fsdk_baseform.cpp TBR=thestig@chromium.org BUG= Review URL: https://codereview.chromium.org/1668483004 . --- core/include/fpdfdoc/fpdf_doc.h | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'core/include') diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index a99d10ed58..7ade012bf0 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -1005,23 +1005,21 @@ class CPDF_FormNotify { public: virtual ~CPDF_FormNotify() {} - virtual int BeforeValueChange(const CPDF_FormField* pField, - CFX_WideString& csValue) { + virtual int BeforeValueChange(CPDF_FormField* pField, + const CFX_WideString& csValue) { return 0; } - virtual int AfterValueChange(const CPDF_FormField* pField) { return 0; } - - virtual int BeforeSelectionChange(const CPDF_FormField* pField, - CFX_WideString& csValue) { + virtual void AfterValueChange(CPDF_FormField* pField) {} + virtual int BeforeSelectionChange(CPDF_FormField* pField, + const CFX_WideString& csValue) { return 0; } - virtual int AfterSelectionChange(const CPDF_FormField* pField) { return 0; } - + virtual void AfterSelectionChange(CPDF_FormField* pField) {} virtual void AfterCheckedStatusChange(CPDF_FormField* pField) {} - virtual int BeforeFormReset(const CPDF_InterForm* pForm) { return 0; } - virtual int AfterFormReset(const CPDF_InterForm* pForm) { return 0; } - virtual int BeforeFormImportData(const CPDF_InterForm* pForm) { return 0; } - virtual int AfterFormImportData(const CPDF_InterForm* pForm) { return 0; } + virtual int BeforeFormReset(CPDF_InterForm* pForm) { return 0; } + virtual void AfterFormReset(CPDF_InterForm* pForm) {} + virtual int BeforeFormImportData(CPDF_InterForm* pForm) { return 0; } + virtual void AfterFormImportData(CPDF_InterForm* pForm) {} }; FX_BOOL FPDF_GenerateAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict); -- cgit v1.2.3