From 26177f27d4cf7191aa40da021424e820e8635e52 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 12 Oct 2018 18:32:31 +0000 Subject: Slightly simplify CPDF_FormField's notify methods. Change-Id: I5eaa286d8cd0920cfb73f3ca0dacc1800affc6b6 Reviewed-on: https://pdfium-review.googlesource.com/c/43936 Commit-Queue: Lei Zhang Reviewed-by: Tom Sepez --- core/fpdfdoc/cpdf_formfield.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/core/fpdfdoc/cpdf_formfield.cpp b/core/fpdfdoc/cpdf_formfield.cpp index a96e49b0cb..a076b150a8 100644 --- a/core/fpdfdoc/cpdf_formfield.cpp +++ b/core/fpdfdoc/cpdf_formfield.cpp @@ -883,27 +883,25 @@ void CPDF_FormField::LoadDA() { } bool CPDF_FormField::NotifyBeforeSelectionChange(const WideString& value) { - if (!m_pForm->GetFormNotify()) - return true; - return m_pForm->GetFormNotify()->BeforeSelectionChange(this, value); + auto* pNotify = m_pForm->GetFormNotify(); + return !pNotify || pNotify->BeforeSelectionChange(this, value); } void CPDF_FormField::NotifyAfterSelectionChange() { - if (!m_pForm->GetFormNotify()) - return; - m_pForm->GetFormNotify()->AfterSelectionChange(this); + auto* pNotify = m_pForm->GetFormNotify(); + if (pNotify) + pNotify->AfterSelectionChange(this); } bool CPDF_FormField::NotifyBeforeValueChange(const WideString& value) { - if (!m_pForm->GetFormNotify()) - return true; - return m_pForm->GetFormNotify()->BeforeValueChange(this, value); + auto* pNotify = m_pForm->GetFormNotify(); + return !pNotify || pNotify->BeforeValueChange(this, value); } void CPDF_FormField::NotifyAfterValueChange() { - if (!m_pForm->GetFormNotify()) - return; - m_pForm->GetFormNotify()->AfterValueChange(this); + auto* pNotify = m_pForm->GetFormNotify(); + if (pNotify) + pNotify->AfterValueChange(this); } bool CPDF_FormField::NotifyListOrComboBoxBeforeChange(const WideString& value) { -- cgit v1.2.3