From 3343d146f2d9cd2f9eaa3a40fed3a5b94f3f107e Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 2 Nov 2015 09:54:54 -0800 Subject: Fix XFA compilation noise, part 1. Mainly: volatile/override/method shadowing. unused variables. intialization list init order. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1422113003 . --- fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'fpdfsdk/src/fpdfxfa') diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp index 3197f2a5e7..b965387cc3 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() { -- cgit v1.2.3