From ed5d7aa789ec5ef7b440d7e56b71804b41a928e3 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 2 Feb 2016 16:02:03 -0800 Subject: Merge to XFA: Kill CFX_ByteArray in master. One trivial edit in fx_basic.h Includes both fixes for build breakage. Review URL: https://codereview.chromium.org/1653253002 . (cherry picked from commit 9b0a59d659d8083802385649ba74370d65c41e36) TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1655423002 . --- fpdfsdk/include/fsdk_baseform.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'fpdfsdk/include') diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index 0d72639b9b..6722382a25 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -327,8 +327,7 @@ class CPDFSDK_InterForm : public CPDF_FormNotify { int BeforeSelectionChange(const CPDF_FormField* pField, CFX_WideString& csValue) override; int AfterSelectionChange(const CPDF_FormField* pField) override; - int AfterCheckedStatusChange(const CPDF_FormField* pField, - const CFX_ByteArray& statusArray) 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; -- cgit v1.2.3