| Index: fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp | 
| diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp | 
| index 3197f2a5e70131f1c39f2512b6e61e21ed551cca..b965387cc3cb4100990a0ea30eab68b8fc1d1659 100644 | 
| --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp | 
| +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp | 
| @@ -64,26 +64,23 @@ FX_BOOL CPDFXFA_Page::LoadXFAPageView() { | 
| if (!m_pDocument) | 
| return FALSE; | 
| IXFA_Doc* pXFADoc = m_pDocument->GetXFADoc(); | 
| -  if (pXFADoc) { | 
| -    IXFA_DocView* pXFADocView = m_pDocument->GetXFADocView(); | 
| -    if (!pXFADocView) | 
| -      return FALSE; | 
| - | 
| -    IXFA_PageView* pPageView = pXFADocView->GetPageView(m_iPageIndex); | 
| -    if (!pPageView) | 
| -      return FALSE; | 
| +  if (!pXFADoc) | 
| +    return FALSE; | 
|  | 
| -    if (m_pXFAPageView) | 
| -      if (m_pXFAPageView == pPageView) | 
| -        return TRUE; | 
| +  IXFA_DocView* pXFADocView = m_pDocument->GetXFADocView(); | 
| +  if (!pXFADocView) | 
| +    return FALSE; | 
|  | 
| -    m_pXFAPageView = pPageView; | 
| -    int iStatus = m_pXFAPageView->LoadPageView(NULL); | 
| +  IXFA_PageView* pPageView = pXFADocView->GetPageView(m_iPageIndex); | 
| +  if (!pPageView) | 
| +    return FALSE; | 
|  | 
| +  if (m_pXFAPageView == pPageView) | 
| return TRUE; | 
| -  } | 
|  | 
| -  return FALSE; | 
| +  m_pXFAPageView = pPageView; | 
| +  (void)m_pXFAPageView->LoadPageView(nullptr); | 
| +  return TRUE; | 
| } | 
|  | 
| FX_BOOL CPDFXFA_Page::LoadPage() { | 
|  |