Index: fpdfsdk/src/fsdk_baseform.cpp |
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp |
index 54b607a382c06fc6a0e264dc1428bdafa46e7693..3bdccd3497f3e8d5308452f845059d63d8def2db 100644 |
--- a/fpdfsdk/src/fsdk_baseform.cpp |
+++ b/fpdfsdk/src/fsdk_baseform.cpp |
@@ -2126,9 +2126,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; |
@@ -2138,21 +2137,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); |