diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-11-02 09:54:54 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-11-02 09:54:54 -0800 |
commit | 3343d146f2d9cd2f9eaa3a40fed3a5b94f3f107e (patch) | |
tree | ab220ffcea223cacd136054603c63324a1d9d5f4 /fpdfsdk/src/fsdk_baseform.cpp | |
parent | 1b700c3c452429dacde3c163a6edb2706f93d4a7 (diff) | |
download | pdfium-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/fsdk_baseform.cpp')
-rw-r--r-- | fpdfsdk/src/fsdk_baseform.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index e486310ba2..202f77f571 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -2112,9 +2112,8 @@ FX_BOOL CPDFSDK_Widget::HitTest(FX_FLOAT pageX, FX_FLOAT pageY) { CPDFSDK_XFAWidget::CPDFSDK_XFAWidget(IXFA_Widget* pAnnot, CPDFSDK_PageView* pPageView, CPDFSDK_InterForm* pInterForm) - : CPDFSDK_Annot(pPageView), - m_hXFAWidget(pAnnot), - m_pInterForm(pInterForm) {} + : CPDFSDK_Annot(pPageView), m_pInterForm(pInterForm), m_hXFAWidget(pAnnot) { +} FX_BOOL CPDFSDK_XFAWidget::IsXFAField() { return TRUE; @@ -2124,21 +2123,12 @@ CFX_ByteString CPDFSDK_XFAWidget::GetType() const { return FSDK_XFAWIDGET_TYPENAME; } -CFX_FloatRect CPDFSDK_XFAWidget::GetRect() { +CFX_FloatRect CPDFSDK_XFAWidget::GetRect() const { CPDFSDK_PageView* pPageView = GetPageView(); - ASSERT(pPageView != NULL); - CPDFSDK_Document* pDocument = pPageView->GetSDKDocument(); - ASSERT(pDocument != NULL); - CPDFXFA_Document* pDoc = pDocument->GetDocument(); - ASSERT(pDoc != NULL); - IXFA_DocView* pDocView = pDoc->GetXFADocView(); - ASSERT(pDocView != NULL); - IXFA_WidgetHandler* pWidgetHandler = pDocView->GetWidgetHandler(); - ASSERT(pWidgetHandler != NULL); CFX_RectF rcBBox; pWidgetHandler->GetRect(GetXFAWidget(), rcBBox); |