diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-04 16:41:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-04 16:41:35 -0700 |
| commit | 28f97ff783c16f3391384ce97b765ce4eb310ac7 (patch) | |
| tree | 69c4c8bc9dd39d5336c96f28b633d197dd207c81 /fpdfsdk/pdfwindow/PWL_ListBox.cpp | |
| parent | ed9c4386713084f37548b46ab36f618021f716f5 (diff) | |
| download | pdfium-28f97ff783c16f3391384ce97b765ce4eb310ac7.tar.xz | |
Make down-conversion explicit from CFX_ByteString to CFX_ByteStringC.
Having this happen implicitly can be dangerous because the lifetime
has to be considered; we should have caught the "red bots" in
https://codereview.chromium.org/1847333004/#ps60001 at compile time.
Review URL: https://codereview.chromium.org/1853233002
Diffstat (limited to 'fpdfsdk/pdfwindow/PWL_ListBox.cpp')
| -rw-r--r-- | fpdfsdk/pdfwindow/PWL_ListBox.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/pdfwindow/PWL_ListBox.cpp index d39d8419a6..ccccc77dcd 100644 --- a/fpdfsdk/pdfwindow/PWL_ListBox.cpp +++ b/fpdfsdk/pdfwindow/PWL_ListBox.cpp @@ -118,21 +118,25 @@ void CPWL_ListBox::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { CFX_FloatPoint ptOffset(rcItem.left, (rcItem.top + rcItem.bottom) * 0.5f); if (m_pList->IsItemSelected(i)) { - sListItems << CPWL_Utils::GetRectFillAppStream( - rcItem, PWL_DEFAULT_SELBACKCOLOR); + sListItems << CPWL_Utils::GetRectFillAppStream(rcItem, + PWL_DEFAULT_SELBACKCOLOR) + .AsByteStringC(); CFX_ByteString sItem = CPWL_Utils::GetEditAppStream(m_pList->GetItemEdit(i), ptOffset); if (sItem.GetLength() > 0) { sListItems << "BT\n" << CPWL_Utils::GetColorAppStream(PWL_DEFAULT_SELTEXTCOLOR) - << sItem << "ET\n"; + .AsByteStringC() + << sItem.AsByteStringC() << "ET\n"; } } else { CFX_ByteString sItem = CPWL_Utils::GetEditAppStream(m_pList->GetItemEdit(i), ptOffset); if (sItem.GetLength() > 0) { - sListItems << "BT\n" << CPWL_Utils::GetColorAppStream(GetTextColor()) - << sItem << "ET\n"; + sListItems << "BT\n" + << CPWL_Utils::GetColorAppStream(GetTextColor()) + .AsByteStringC() + << sItem.AsByteStringC() << "ET\n"; } } } |