diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-27 11:22:20 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-27 11:22:20 -0700 |
| commit | 15a62973b9b89c3e229cc0ab501c45967f91b325 (patch) | |
| tree | d95505963de5d8640fb85067639b6fdaf159d1b6 /fpdfsdk/src/formfiller/FFL_ComboBox.cpp | |
| parent | ef25d9995e494bd596ffea8fb8c09c2e48daa9a0 (diff) | |
| download | pdfium-15a62973b9b89c3e229cc0ab501c45967f91b325.tar.xz | |
Kill operator LPCWSTR from CFX_WideString().
This involves adding some explicit c_str() calls. Doing so flagged
PDF_EncodeText() and FindOptionValue() as having suboptimal signatures, in
that we are often throwing away a perfectly fine length and recomputing it.
R=brucedawson@chromium.org
Review URL: https://codereview.chromium.org/1101933003
Diffstat (limited to 'fpdfsdk/src/formfiller/FFL_ComboBox.cpp')
| -rw-r--r-- | fpdfsdk/src/formfiller/FFL_ComboBox.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp index 9e58c952aa..012ed4a730 100644 --- a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp @@ -77,28 +77,23 @@ CPWL_Wnd* CFFL_ComboBox::NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageVie pWnd->AttachFFLData(this); pWnd->Create(cp); - ASSERT(m_pApp != NULL); CFFL_IFormFiller* pFormFiller = m_pApp->GetIFormFiller(); pWnd->SetFillerNotify(pFormFiller); - ASSERT(m_pWidget != NULL); FX_INT32 nCurSel = m_pWidget->GetSelectedIndex(0); - CFX_WideString swText; - if (nCurSel < 0) swText = m_pWidget->GetValue(); else swText = m_pWidget->GetOptionLabel(nCurSel); - + for (FX_INT32 i=0,sz=m_pWidget->CountOptions(); i<sz; i++) { - pWnd->AddString(m_pWidget->GetOptionLabel(i)); + pWnd->AddString(m_pWidget->GetOptionLabel(i).c_str()); } - + pWnd->SetSelect(nCurSel); - pWnd->SetText(swText); - + pWnd->SetText(swText.c_str()); return pWnd; } @@ -245,7 +240,7 @@ void CFFL_ComboBox::SetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AAc if (CPWL_Edit* pEdit = (CPWL_Edit*)*pComboBox) { pEdit->SetSel(fa.nSelStart, fa.nSelEnd); - pEdit->ReplaceSel(fa.sChange); + pEdit->ReplaceSel(fa.sChange.c_str()); } } break; @@ -297,7 +292,7 @@ void CFFL_ComboBox::RestoreState(CPDFSDK_PageView* pPageView) { if (CPWL_Edit* pEdit = (CPWL_Edit*)*pComboBox) { - pEdit->SetText(m_State.sValue); + pEdit->SetText(m_State.sValue.c_str()); pEdit->SetSel(m_State.nStart, m_State.nEnd); } } |