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_ListBox.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_ListBox.cpp')
| -rw-r--r-- | fpdfsdk/src/formfiller/FFL_ListBox.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fpdfsdk/src/formfiller/FFL_ListBox.cpp b/fpdfsdk/src/formfiller/FFL_ListBox.cpp index 87ae552a66..dffd17538f 100644 --- a/fpdfsdk/src/formfiller/FFL_ListBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_ListBox.cpp @@ -76,11 +76,9 @@ CPWL_Wnd* CFFL_ListBox::NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView CFFL_IFormFiller* pIFormFiller = m_pApp->GetIFormFiller(); pWnd->SetFillerNotify(pIFormFiller); - ASSERT(m_pWidget != NULL); - 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()); + if (pWnd->HasFlag(PLBS_MULTIPLESEL)) { m_OriginSelections.RemoveAll(); |