diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-07-06 11:13:02 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-07-06 19:11:27 +0000 |
| commit | 5fe9808f03dc8164161d5b421f650af1d8547f53 (patch) | |
| tree | 1a4d696df083350aef03bcf87b6f6ed94168e899 /fpdfsdk/formfiller/cffl_interactiveformfiller.cpp | |
| parent | 64667cd369e13529be606077429fe4524dba0b24 (diff) | |
| download | pdfium-5fe9808f03dc8164161d5b421f650af1d8547f53.tar.xz | |
Remove in-out from OnPopup{Pre|Post}Open
This CL removes the bExit param from OnPopup{Pre|Post}Open in favour of
using a return value.
Change-Id: Icc99b137455343482fc1f60947c3b1f4246aeda1
Reviewed-on: https://pdfium-review.googlesource.com/7332
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.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp index 4d5ceb8d16..f5931d5a59 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp @@ -759,28 +759,24 @@ bool CFFL_InteractiveFormFiller::OnFull(CPDFSDK_Annot::ObservedPtr* pAnnot, return true; } -void CFFL_InteractiveFormFiller::OnPopupPreOpen(void* pPrivateData, - bool& bExit, +bool CFFL_InteractiveFormFiller::OnPopupPreOpen(void* pPrivateData, uint32_t nFlag) { CFFL_PrivateData* pData = reinterpret_cast<CFFL_PrivateData*>(pPrivateData); ASSERT(pData); ASSERT(pData->pWidget); CPDFSDK_Annot::ObservedPtr pObserved(pData->pWidget); - if (OnPreOpen(&pObserved, pData->pPageView, nFlag) || !pObserved) - bExit = true; + return OnPreOpen(&pObserved, pData->pPageView, nFlag) || !pObserved; } -void CFFL_InteractiveFormFiller::OnPopupPostOpen(void* pPrivateData, - bool& bExit, +bool CFFL_InteractiveFormFiller::OnPopupPostOpen(void* pPrivateData, uint32_t nFlag) { CFFL_PrivateData* pData = reinterpret_cast<CFFL_PrivateData*>(pPrivateData); ASSERT(pData); ASSERT(pData->pWidget); CPDFSDK_Annot::ObservedPtr pObserved(pData->pWidget); - if (OnPostOpen(&pObserved, pData->pPageView, nFlag) || !pObserved) - bExit = true; + return OnPostOpen(&pObserved, pData->pPageView, nFlag) || !pObserved; } bool CFFL_InteractiveFormFiller::OnPreOpen(CPDFSDK_Annot::ObservedPtr* pAnnot, |