diff options
author | Lei Zhang <thestig@chromium.org> | 2015-06-13 00:41:00 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-06-13 00:41:00 -0700 |
commit | 60f507ba36893edccb53aa13d7282144a1dd2499 (patch) | |
tree | 8855790710cffc564547e83ca5f755437a16088f /fpdfsdk/src/formfiller/FFL_TextField.cpp | |
parent | 4999f914be6c390bbc6d709c5b65d8955a827970 (diff) | |
download | pdfium-60f507ba36893edccb53aa13d7282144a1dd2499.tar.xz |
Merge to XFA: Cleanup: Get this rid of "this->" in fpdfsdk/
Also remove commented out code and trailing whitespaces.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1179653005.
(cherry picked from commit eda202769e5c79eba1d2fb5090f6e9cf176e2d4a)
Review URL: https://codereview.chromium.org/1187733002.
Diffstat (limited to 'fpdfsdk/src/formfiller/FFL_TextField.cpp')
-rw-r--r-- | fpdfsdk/src/formfiller/FFL_TextField.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fpdfsdk/src/formfiller/FFL_TextField.cpp b/fpdfsdk/src/formfiller/FFL_TextField.cpp index fb7fec9ea7..9f0a8148cf 100644 --- a/fpdfsdk/src/formfiller/FFL_TextField.cpp +++ b/fpdfsdk/src/formfiller/FFL_TextField.cpp @@ -91,8 +91,7 @@ PWL_CREATEPARAM CFFL_TextField::GetCreateParam() if (!m_pFontMap) { - ASSERT(this->m_pApp != NULL); - m_pFontMap = new CBA_FontMap(m_pWidget, /*ISystemHandle::GetSystemHandler(m_pApp)*/m_pApp->GetSysHandler()); + m_pFontMap = new CBA_FontMap(m_pWidget, m_pApp->GetSysHandler()); m_pFontMap->Initial(); } cp.pFontMap = m_pFontMap; @@ -142,7 +141,7 @@ FX_BOOL CFFL_TextField::OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFl case FWL_VKEY_Return: if (!(m_pWidget->GetFieldFlags() & FIELDFLAG_MULTILINE)) { - CPDFSDK_PageView* pPageView = this->GetCurPageView(); + CPDFSDK_PageView* pPageView = GetCurPageView(); ASSERT(pPageView != NULL); m_bValid = !m_bValid; CPDF_Rect rcAnnot = pAnnot->GetRect(); @@ -169,7 +168,7 @@ FX_BOOL CFFL_TextField::OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFl break; case FWL_VKEY_Escape: { - CPDFSDK_PageView* pPageView = this->GetCurPageView(); + CPDFSDK_PageView* pPageView = GetCurPageView(); ASSERT(pPageView != NULL); EscapeFiller(pPageView,TRUE); return TRUE; @@ -308,10 +307,10 @@ CPWL_Wnd* CFFL_TextField::ResetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bR if (bRestoreValue) { RestoreState(pPageView); - pRet = this->GetPDFWindow(pPageView, FALSE); + pRet = GetPDFWindow(pPageView, FALSE); } else - pRet = this->GetPDFWindow(pPageView, TRUE); + pRet = GetPDFWindow(pPageView, TRUE); m_pWidget->UpdateField(); |