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 . --- fpdfsdk/include/fsdk_baseform.h | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'fpdfsdk/include/fsdk_baseform.h') diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index 6722382a25..28caa7b7b8 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -282,12 +282,9 @@ class CPDFSDK_InterForm : public CPDF_FormNotify { void XfaSetValidationsEnabled(FX_BOOL bEnabled); #endif // PDF_ENABLE_XFA - void OnKeyStrokeCommit(CPDF_FormField* pFormField, - CFX_WideString& csValue, - FX_BOOL& bRC); - void OnValidate(CPDF_FormField* pFormField, - CFX_WideString& csValue, - FX_BOOL& bRC); + FX_BOOL OnKeyStrokeCommit(CPDF_FormField* pFormField, + const CFX_WideString& csValue); + FX_BOOL OnValidate(CPDF_FormField* pFormField, const CFX_WideString& csValue); void OnCalculate(CPDF_FormField* pFormField = NULL); CFX_WideString OnFormat(CPDF_FormField* pFormField, FX_BOOL& bFormated); @@ -320,18 +317,18 @@ class CPDFSDK_InterForm : public CPDF_FormNotify { #endif // PDF_ENABLE_XFA private: - // CPDF_FormNotify - int BeforeValueChange(const CPDF_FormField* pField, - CFX_WideString& csValue) override; - int AfterValueChange(const CPDF_FormField* pField) override; - int BeforeSelectionChange(const CPDF_FormField* pField, - CFX_WideString& csValue) override; - int AfterSelectionChange(const CPDF_FormField* pField) override; + // CPDF_FormNotify: + int BeforeValueChange(CPDF_FormField* pField, + const CFX_WideString& csValue) override; + void AfterValueChange(CPDF_FormField* pField) override; + int BeforeSelectionChange(CPDF_FormField* pField, + const CFX_WideString& csValue) override; + void AfterSelectionChange(CPDF_FormField* pField) override; void AfterCheckedStatusChange(CPDF_FormField* pField) override; - int BeforeFormReset(const CPDF_InterForm* pForm) override; - int AfterFormReset(const CPDF_InterForm* pForm) override; - int BeforeFormImportData(const CPDF_InterForm* pForm) override; - int AfterFormImportData(const CPDF_InterForm* pForm) override; + int BeforeFormReset(CPDF_InterForm* pForm) override; + void AfterFormReset(CPDF_InterForm* pForm) override; + int BeforeFormImportData(CPDF_InterForm* pForm) override; + void AfterFormImportData(CPDF_InterForm* pForm) override; FX_BOOL FDFToURLEncodedData(CFX_WideString csFDFFile, CFX_WideString csTxtFile); -- cgit v1.2.3