From 28f97ff783c16f3391384ce97b765ce4eb310ac7 Mon Sep 17 00:00:00 2001 From: tsepez Date: Mon, 4 Apr 2016 16:41:35 -0700 Subject: 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 --- fpdfsdk/pdfwindow/PWL_Label.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/pdfwindow/PWL_Label.cpp') diff --git a/fpdfsdk/pdfwindow/PWL_Label.cpp b/fpdfsdk/pdfwindow/PWL_Label.cpp index cfbeb4362c..8c5b0676d7 100644 --- a/fpdfsdk/pdfwindow/PWL_Label.cpp +++ b/fpdfsdk/pdfwindow/PWL_Label.cpp @@ -118,7 +118,8 @@ CFX_FloatRect CPWL_Label::GetContentRect() const { void CPWL_Label::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { CPWL_Wnd::GetThisAppearanceStream(sAppStream); - sAppStream << GetTextAppearanceStream(CFX_FloatPoint(0.0f, 0.0f)); + sAppStream << GetTextAppearanceStream(CFX_FloatPoint(0.0f, 0.0f)) + .AsByteStringC(); } CFX_ByteString CPWL_Label::GetTextAppearanceStream( @@ -127,8 +128,9 @@ CFX_ByteString CPWL_Label::GetTextAppearanceStream( CFX_ByteString sEdit = CPWL_Utils::GetEditAppStream(m_pEdit, ptOffset); if (sEdit.GetLength() > 0) { - sRet << "BT\n" << CPWL_Utils::GetColorAppStream(GetTextColor()) << sEdit - << "ET\n"; + sRet << "BT\n" + << CPWL_Utils::GetColorAppStream(GetTextColor()).AsByteStringC() + << sEdit.AsByteStringC() << "ET\n"; } return sRet.GetByteString(); -- cgit v1.2.3