From dfbf8e7ba55695c4e6cb30eadbe9c6a2955815ba Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 14 Oct 2015 14:17:26 -0700 Subject: Next round of XFA changes to match master. This contains a missed merge of the Document:delay fixes. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1398703009 . --- fpdfsdk/src/formfiller/FFL_FormFiller.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'fpdfsdk/src/formfiller') diff --git a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp index 642e5e8964..30a297dd68 100644 --- a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp @@ -464,9 +464,7 @@ CPDF_Rect CFFL_FormFiller::GetPDFWindowRect() const { CPDFSDK_PageView* CFFL_FormFiller::GetCurPageView() { CPDFXFA_Page* pPage = m_pAnnot->GetPDFXFAPage(); CPDFSDK_Document* pSDKDoc = m_pApp->GetSDKDocument(); - if (!pSDKDoc) - return NULL; - return pSDKDoc->GetPageView(pPage); + return pSDKDoc ? pSDKDoc->GetPageView(pPage) : nullptr; } CPDF_Rect CFFL_FormFiller::GetFocusBox(CPDFSDK_PageView* pPageView) { -- cgit v1.2.3