diff options
author | dan sinclair <dsinclair@chromium.org> | 2016-11-24 10:45:29 -0500 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2016-11-24 16:34:32 +0000 |
commit | 0354ccf37f05f25b1bf64fd60bb3b48efab4d7d0 (patch) | |
tree | 378745e450e4f02128ab6766d6ca71bd0b27f4ab /xfa/fwl/core/cfwl_listbox.cpp | |
parent | 41ba08e5552c2eccad0c34024dc680feb3f2b251 (diff) | |
download | pdfium-chromium/2935.tar.xz |
Change TxtEdtEngine to return CFX_WideStringchromium/2935chromium/2934chromium/2933chromium/2932
This Cl updates the TxtEdtEngine and TxtEdtBuf to return CFX_WideStrings on
a Get instead of taking an out param. The change is propagated out through
the various Get methods that call into the edit engine.
Change-Id: Iccf10a8ee06678ae3b59f3afd6e65308dacd16bd
Reviewed-on: https://pdfium-review.googlesource.com/2070
Commit-Queue: ooo 11-24 -- 12-05 (dsinclair) <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'xfa/fwl/core/cfwl_listbox.cpp')
-rw-r--r-- | xfa/fwl/core/cfwl_listbox.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/xfa/fwl/core/cfwl_listbox.cpp b/xfa/fwl/core/cfwl_listbox.cpp index 1208ab34dc..dff981f283 100644 --- a/xfa/fwl/core/cfwl_listbox.cpp +++ b/xfa/fwl/core/cfwl_listbox.cpp @@ -202,11 +202,10 @@ void CFWL_ListBox::SetSelItem(CFWL_ListItem* pItem, bool bSelect) { SetSelection(pItem, pItem, bSelect); } -void CFWL_ListBox::GetDataProviderItemText(CFWL_ListItem* pItem, - CFX_WideString& wsText) { +CFX_WideString CFWL_ListBox::GetDataProviderItemText(CFWL_ListItem* pItem) { if (!pItem) - return; - GetItemText(this, pItem, wsText); + return L""; + return GetItemText(this, pItem); } CFWL_ListItem* CFWL_ListBox::GetListItem(CFWL_ListItem* pItem, @@ -544,8 +543,7 @@ void CFWL_ListBox::DrawItem(CFX_Graphics* pGraphics, pTheme->DrawBackground(¶m); } - CFX_WideString wsText; - GetItemText(this, pItem, wsText); + CFX_WideString wsText = GetItemText(this, pItem); if (wsText.GetLength() <= 0) return; @@ -719,8 +717,7 @@ FX_FLOAT CFWL_ListBox::GetMaxTextWidth() { if (!pItem) continue; - CFX_WideString wsText; - GetItemText(this, pItem, wsText); + CFX_WideString wsText = GetItemText(this, pItem); CFX_SizeF sz = CalcTextSize(wsText, m_pProperties->m_pThemeProvider); fRet = std::max(fRet, sz.x); } @@ -1006,11 +1003,9 @@ bool CFWL_ListBox::OnScroll(CFWL_ScrollBar* pScrollBar, return true; } -void CFWL_ListBox::GetItemText(CFWL_Widget* pWidget, - CFWL_ListItem* pItem, - CFX_WideString& wsText) { - if (pItem) - wsText = static_cast<CFWL_ListItem*>(pItem)->m_wsText; +CFX_WideString CFWL_ListBox::GetItemText(CFWL_Widget* pWidget, + CFWL_ListItem* pItem) { + return pItem ? static_cast<CFWL_ListItem*>(pItem)->m_wsText : L""; } int32_t CFWL_ListBox::CountItems(const CFWL_Widget* pWidget) const { |