summaryrefslogtreecommitdiff
path: root/fpdfsdk/formfiller/cffl_checkbox.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-07-06 11:35:04 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-07-06 19:12:07 +0000
commitfecd7506f715e7d6908445d4913015ce81c9b23d (patch)
tree5135b373c74d58409f919d73a523582592a1b7bb /fpdfsdk/formfiller/cffl_checkbox.cpp
parent5fe9808f03dc8164161d5b421f650af1d8547f53 (diff)
downloadpdfium-fecd7506f715e7d6908445d4913015ce81c9b23d.tar.xz
Convert OnButtonUp to not have in-out params
This CL removes the in-out param from OnButtonUp in favour of a single bool return. Change-Id: I2d91466677adcb366ed1c2d0721ce5e2949ed074 Reviewed-on: https://pdfium-review.googlesource.com/7333 Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/formfiller/cffl_checkbox.cpp')
-rw-r--r--fpdfsdk/formfiller/cffl_checkbox.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/fpdfsdk/formfiller/cffl_checkbox.cpp b/fpdfsdk/formfiller/cffl_checkbox.cpp
index a89e76ac0d..4bab95a54e 100644
--- a/fpdfsdk/formfiller/cffl_checkbox.cpp
+++ b/fpdfsdk/formfiller/cffl_checkbox.cpp
@@ -45,17 +45,17 @@ bool CFFL_CheckBox::OnChar(CPDFSDK_Annot* pAnnot,
CPDFSDK_PageView* pPageView = pAnnot->GetPageView();
ASSERT(pPageView);
- bool bReset = false;
- bool bExit = false;
CPDFSDK_Annot::ObservedPtr pObserved(m_pWidget.Get());
- m_pFormFillEnv->GetInteractiveFormFiller()->OnButtonUp(
- &pObserved, pPageView, bReset, bExit, nFlags);
+ if (m_pFormFillEnv->GetInteractiveFormFiller()->OnButtonUp(
+ &pObserved, pPageView, nFlags)) {
+ if (!pObserved)
+ m_pWidget = nullptr;
+ return true;
+ }
if (!pObserved) {
m_pWidget = nullptr;
return true;
}
- if (bReset || bExit)
- return true;
CFFL_FormFiller::OnChar(pAnnot, nChar, nFlags);
CPWL_CheckBox* pWnd = GetCheckBox(pPageView, true);