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/fxedit/fxet_pageobjs.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/fxedit/fxet_pageobjs.cpp')
| -rw-r--r-- | fpdfsdk/fxedit/fxet_pageobjs.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
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); |