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/fxedit/fxet_pageobjs.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'fpdfsdk/fxedit/fxet_pageobjs.cpp') diff --git a/fpdfsdk/fxedit/fxet_pageobjs.cpp b/fpdfsdk/fxedit/fxet_pageobjs.cpp index 3f32d9d3e1..1133cab796 100644 --- a/fpdfsdk/fxedit/fxet_pageobjs.cpp +++ b/fpdfsdk/fxedit/fxet_pageobjs.cpp @@ -246,7 +246,8 @@ void IFX_Edit::DrawEdit(CFX_RenderDevice* pDevice, } sTextBuf << GetPDFWordString(pFontMap, word.nFontIndex, word.Word, - SubWord); + SubWord) + .AsByteStringC(); } else { DrawTextString( pDevice, CFX_FloatPoint(word.ptWord.x + ptOffset.x, @@ -359,7 +360,8 @@ void IFX_Edit::DrawRichEdit(CFX_RenderDevice* pDevice, } sTextBuf << GetPDFWordString(pFontMap, word.WordProps.nFontIndex, - word.Word, 0); + word.Word, 0) + .AsByteStringC(); if (word.WordProps.nWordStyle & PVTWORD_STYLE_UNDERLINE) { CFX_PathData pathUnderline; @@ -502,7 +504,8 @@ void IFX_Edit::GeneratePageObjects( nOldFontIndex = word.nFontIndex; } - sTextBuf << GetPDFWordString(pFontMap, word.nFontIndex, word.Word, 0); + sTextBuf << GetPDFWordString(pFontMap, word.nFontIndex, word.Word, 0) + .AsByteStringC(); oldplace = place; } } @@ -574,7 +577,8 @@ void IFX_Edit::GenerateRichPageObjects( } sTextBuf << GetPDFWordString(pFontMap, word.WordProps.nFontIndex, - word.Word, 0); + word.Word, 0) + .AsByteStringC(); if (word.WordProps.nWordStyle & PVTWORD_STYLE_UNDERLINE) { CFX_FloatRect rcUnderline = GetUnderLineRect(word); -- cgit v1.2.3