summaryrefslogtreecommitdiff
path: root/fpdfsdk/formfiller/cffl_interactiveformfiller.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_interactiveformfiller.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_interactiveformfiller.cpp')
-rw-r--r--fpdfsdk/formfiller/cffl_interactiveformfiller.cpp24
1 files changed, 8 insertions, 16 deletions
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
index f5931d5a59..d318111ee6 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
@@ -244,11 +244,7 @@ bool CFFL_InteractiveFormFiller::OnLButtonUp(CPDFSDK_PageView* pPageView,
pFormFiller->OnLButtonUp(pPageView, pAnnot->Get(), nFlags, point);
if (m_pFormFillEnv->GetFocusAnnot() != pAnnot->Get())
return bRet;
-
- bool bExit = false;
- bool bReset = false;
- OnButtonUp(pAnnot, pPageView, bReset, bExit, nFlags);
- if (!pAnnot || bExit)
+ if (OnButtonUp(pAnnot, pPageView, nFlags) || !pAnnot)
return true;
#ifdef PDF_ENABLE_XFA
if (OnClick(pAnnot, pPageView, nFlags) || !pAnnot)
@@ -257,17 +253,15 @@ bool CFFL_InteractiveFormFiller::OnLButtonUp(CPDFSDK_PageView* pPageView,
return bRet;
}
-void CFFL_InteractiveFormFiller::OnButtonUp(CPDFSDK_Annot::ObservedPtr* pAnnot,
+bool CFFL_InteractiveFormFiller::OnButtonUp(CPDFSDK_Annot::ObservedPtr* pAnnot,
CPDFSDK_PageView* pPageView,
- bool& bReset,
- bool& bExit,
uint32_t nFlag) {
if (m_bNotifying)
- return;
+ return false;
CPDFSDK_Widget* pWidget = static_cast<CPDFSDK_Widget*>(pAnnot->Get());
if (!pWidget->GetAAction(CPDF_AAction::ButtonUp).GetDict())
- return;
+ return false;
m_bNotifying = true;
@@ -280,17 +274,15 @@ void CFFL_InteractiveFormFiller::OnButtonUp(CPDFSDK_Annot::ObservedPtr* pAnnot,
fa.bShift = m_pFormFillEnv->IsSHIFTKeyDown(nFlag);
pWidget->OnAAction(CPDF_AAction::ButtonUp, fa, pPageView);
m_bNotifying = false;
- if (!(*pAnnot) || !IsValidAnnot(pPageView, pWidget)) {
- bExit = true;
- return;
- }
+ if (!(*pAnnot) || !IsValidAnnot(pPageView, pWidget))
+ return true;
if (nAge == pWidget->GetAppearanceAge())
- return;
+ return false;
CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, false);
if (pFormFiller)
pFormFiller->ResetPDFWindow(pPageView, nValueAge == pWidget->GetValueAge());
- bReset = true;
+ return true;
}
bool CFFL_InteractiveFormFiller::OnLButtonDblClk(