summaryrefslogtreecommitdiff
path: root/fpdfsdk/src/fpdfxfa
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-11-02 09:54:54 -0800
committerTom Sepez <tsepez@chromium.org>2015-11-02 09:54:54 -0800
commit3343d146f2d9cd2f9eaa3a40fed3a5b94f3f107e (patch)
treeab220ffcea223cacd136054603c63324a1d9d5f4 /fpdfsdk/src/fpdfxfa
parent1b700c3c452429dacde3c163a6edb2706f93d4a7 (diff)
downloadpdfium-3343d146f2d9cd2f9eaa3a40fed3a5b94f3f107e.tar.xz
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 .
Diffstat (limited to 'fpdfsdk/src/fpdfxfa')
-rw-r--r--fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp27
1 files changed, 12 insertions, 15 deletions
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() {