summaryrefslogtreecommitdiff
path: root/fpdfsdk/src/formfiller/FFL_ComboBox.cpp
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-06-13 00:41:00 -0700
committerLei Zhang <thestig@chromium.org>2015-06-13 00:41:00 -0700
commit60f507ba36893edccb53aa13d7282144a1dd2499 (patch)
tree8855790710cffc564547e83ca5f755437a16088f /fpdfsdk/src/formfiller/FFL_ComboBox.cpp
parent4999f914be6c390bbc6d709c5b65d8955a827970 (diff)
downloadpdfium-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_ComboBox.cpp')
-rw-r--r--fpdfsdk/src/formfiller/FFL_ComboBox.cpp22
1 files changed, 3 insertions, 19 deletions
diff --git a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp
index 123c1cd24a..8ae9254470 100644
--- a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp
+++ b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp
@@ -16,7 +16,6 @@
CFFL_ComboBox::CFFL_ComboBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pAnnot) :
CFFL_FormFiller(pApp, pAnnot), m_pFontMap( NULL )
{
- //m_pFontMap = new CBA_FontMap( pAnnot, GetSystemHandler() );
m_State.nIndex = 0;
m_State.nStart = 0;
m_State.nEnd = 0;
@@ -29,13 +28,6 @@ CFFL_ComboBox::~CFFL_ComboBox()
delete m_pFontMap;
m_pFontMap = NULL;
}
-
-// for (int i=0,sz=m_IMBox.GetSize(); i<sz; i++)
-// {
-// delete m_IMBox.GetAt(i);
-// }
-//
-// m_IMBox.RemoveAll();
}
PWL_CREATEPARAM CFFL_ComboBox::GetCreateParam()
@@ -51,16 +43,8 @@ PWL_CREATEPARAM CFFL_ComboBox::GetCreateParam()
cp.dwFlags |= PCBS_ALLOWCUSTOMTEXT;
}
- /*
- if (nFlags & FIELDFLAG_COMMITONSELCHANGE)
- {
- m_bCommitOnSelectChange = TRUE;
- }
- */
-
if (!m_pFontMap)
{
- ASSERT(this->m_pApp != NULL);
m_pFontMap = new CBA_FontMap(m_pWidget, GetSystemHandler());
m_pFontMap->Initial();
}
@@ -311,10 +295,10 @@ CPWL_Wnd* CFFL_ComboBox::ResetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bRe
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();
@@ -331,7 +315,7 @@ void CFFL_ComboBox::OnKeyStroke(FX_BOOL bKeyDown, FX_UINT nFlag)
{
if (m_bValid)
{
- CPDFSDK_PageView* pPageView = this->GetCurPageView();
+ CPDFSDK_PageView* pPageView = GetCurPageView();
ASSERT(pPageView != NULL);
if (CommitData(pPageView, nFlag))