Index: fpdfsdk/src/fsdk_baseform.cpp |
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp |
index fc45cd931b70fafed22cab533caa1f8922dfa31a..e3536e0a1902d44930fecc4b0213e0e807de87a4 100644 |
--- a/fpdfsdk/src/fsdk_baseform.cpp |
+++ b/fpdfsdk/src/fsdk_baseform.cpp |
@@ -99,37 +99,23 @@ CFX_ByteString CPDFSDK_Widget::GetSubType() const { |
} |
CPDF_FormField* CPDFSDK_Widget::GetFormField() const { |
- ASSERT(m_pInterForm != NULL); |
- |
- CPDF_FormControl* pCtrl = GetFormControl(); |
- ASSERT(pCtrl != NULL); |
- |
- return pCtrl->GetField(); |
+ return GetFormControl()->GetField(); |
} |
CPDF_FormControl* CPDFSDK_Widget::GetFormControl() const { |
- ASSERT(m_pInterForm != NULL); |
- |
CPDF_InterForm* pPDFInterForm = m_pInterForm->GetInterForm(); |
- ASSERT(pPDFInterForm != NULL); |
- |
return pPDFInterForm->GetControlByDict(GetAnnotDict()); |
} |
-CPDF_FormControl* CPDFSDK_Widget::GetFormControl(CPDF_InterForm* pInterForm, |
- CPDF_Dictionary* pAnnotDict) { |
- ASSERT(pInterForm != NULL); |
+CPDF_FormControl* CPDFSDK_Widget::GetFormControl( |
+ CPDF_InterForm* pInterForm, |
+ const CPDF_Dictionary* pAnnotDict) { |
ASSERT(pAnnotDict != NULL); |
- |
- CPDF_FormControl* pControl = pInterForm->GetControlByDict(pAnnotDict); |
- |
- return pControl; |
+ return pInterForm->GetControlByDict(pAnnotDict); |
} |
int CPDFSDK_Widget::GetRotate() const { |
CPDF_FormControl* pCtrl = GetFormControl(); |
- ASSERT(pCtrl != NULL); |
- |
return pCtrl->GetRotation() % 360; |
} |