diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-01-25 16:35:42 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-01-25 16:35:42 -0800 |
| commit | 05e67415684adc36af228ca2f1e0efc30a40d242 (patch) | |
| tree | f1b18021923a3e79aecf5fac7144df3552b06db0 /fpdfsdk/src | |
| parent | 52bb44383a705b600e0d028bff5ade17856f5a60 (diff) | |
| download | pdfium-05e67415684adc36af228ca2f1e0efc30a40d242.tar.xz | |
XFA: Fix a bunch of pointless returns.chromium/2637chromium/2636chromium/2635chromium/2634chromium/2633chromium/2632
And a few other nits.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1635853002 .
Diffstat (limited to 'fpdfsdk/src')
| -rw-r--r-- | fpdfsdk/src/fsdk_annothandler.cpp | 8 | ||||
| -rw-r--r-- | fpdfsdk/src/fsdk_baseannot.cpp | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp index 08d33a2e37..2f204fe27d 100644 --- a/fpdfsdk/src/fsdk_annothandler.cpp +++ b/fpdfsdk/src/fsdk_annothandler.cpp @@ -240,10 +240,8 @@ void CPDFSDK_AnnotHandlerMgr::Annot_OnMouseEnter(CPDFSDK_PageView* pPageView, FX_DWORD nFlag) { ASSERT(pAnnot); - if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) { + if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) pAnnotHandler->OnMouseEnter(pPageView, pAnnot, nFlag); - } - return; } void CPDFSDK_AnnotHandlerMgr::Annot_OnMouseExit(CPDFSDK_PageView* pPageView, @@ -251,10 +249,8 @@ void CPDFSDK_AnnotHandlerMgr::Annot_OnMouseExit(CPDFSDK_PageView* pPageView, FX_DWORD nFlag) { ASSERT(pAnnot); - if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) { + if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) pAnnotHandler->OnMouseExit(pPageView, pAnnot, nFlag); - } - return; } FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnChar(CPDFSDK_Annot* pAnnot, diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp index 30e702241e..0d65e06b38 100644 --- a/fpdfsdk/src/fsdk_baseannot.cpp +++ b/fpdfsdk/src/fsdk_baseannot.cpp @@ -978,15 +978,11 @@ UnderlyingPageType* CPDFSDK_Annot::GetUnderlyingPage() { } CPDF_Page* CPDFSDK_Annot::GetPDFPage() { - if (m_pPageView) - return m_pPageView->GetPDFPage(); - return NULL; + return m_pPageView ? m_pPageView->GetPDFPage() : nullptr; } #ifdef PDF_ENABLE_XFA CPDFXFA_Page* CPDFSDK_Annot::GetPDFXFAPage() { - if (m_pPageView) - return m_pPageView->GetPDFXFAPage(); - return NULL; + return m_pPageView ? m_pPageView->GetPDFXFAPage() : nullptr; } #endif // PDF_ENABLE_XFA |