fpdfsdk/javascript/Document.cpp - Issue 1861183002: Make CFX_WideString::FromUTF8() take a CFX_ByteStringC argument.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: fpdfsdk/javascript/Document.cpp

Issue 1861183002: Make CFX_WideString::FromUTF8() take a CFX_ByteStringC argument. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Rebase, combine delcs with initialization. Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: fpdfsdk/javascript/Document.cpp

diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp

index 762ba71cf23e4f1012198747e51b5350d128ddb6..75cd2ec251c2da42dac14af3ef2eda15fd9c10dd 100644

--- a/fpdfsdk/javascript/Document.cpp

+++ b/fpdfsdk/javascript/Document.cpp

@@ -784,8 +784,7 @@ FX_BOOL Document::info(IJS_Context* cc,

for (const auto& it : *pDictionary) {

const CFX_ByteString& bsKey = it.first;

CPDF_Object* pValueObj = it.second;

- CFX_WideString wsKey = CFX_WideString::FromUTF8(bsKey, bsKey.GetLength());

+ CFX_WideString wsKey = CFX_WideString::FromUTF8(bsKey.AsByteStringC());

if (pValueObj->IsString() || pValueObj->IsName()) {

FXJS_PutObjectString(isolate, pObj, wsKey.c_str(),

pValueObj->GetUnicodeText().c_str());

« no previous file with comments | « core/fxcrt/include/fx_string.h ('k') | fpdfsdk/javascript/JS_Define.h » ('j') | no next file with comments »