summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-02-02 16:02:03 -0800
committerTom Sepez <tsepez@chromium.org>2016-02-02 16:02:03 -0800
commited5d7aa789ec5ef7b440d7e56b71804b41a928e3 (patch)
tree028bced4e1203313752240a1a3de7fbf998611c3 /fpdfsdk
parent23bf560507a8e03968e66480281597be9161abf4 (diff)
downloadpdfium-ed5d7aa789ec5ef7b440d7e56b71804b41a928e3.tar.xz
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 .
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/include/fsdk_baseform.h3
-rw-r--r--fpdfsdk/src/fsdk_baseform.cpp12
2 files changed, 5 insertions, 10 deletions
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;
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp
index 72c192a7e9..78bb20e353 100644
--- a/fpdfsdk/src/fsdk_baseform.cpp
+++ b/fpdfsdk/src/fsdk_baseform.cpp
@@ -2671,16 +2671,12 @@ int CPDFSDK_InterForm::AfterSelectionChange(const CPDF_FormField* pField) {
return 0;
}
-int CPDFSDK_InterForm::AfterCheckedStatusChange(
- const CPDF_FormField* pField,
- const CFX_ByteArray& statusArray) {
- CPDF_FormField* pFormField = (CPDF_FormField*)pField;
- int nType = pFormField->GetFieldType();
+void CPDFSDK_InterForm::AfterCheckedStatusChange(CPDF_FormField* pField) {
+ int nType = pField->GetFieldType();
if (nType == FIELDTYPE_CHECKBOX || nType == FIELDTYPE_RADIOBUTTON) {
- OnCalculate(pFormField);
- UpdateField(pFormField);
+ OnCalculate(pField);
+ UpdateField(pField);
}
- return 0;
}
int CPDFSDK_InterForm::BeforeFormReset(const CPDF_InterForm* pForm) {