xfa/fxfa/app/xfa_ffdocview.cpp - Issue 1882043004: Remove implicit cast from CFX_WideString to (const wchar_t*)

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: xfa/fxfa/app/xfa_ffdocview.cpp

Issue 1882043004: Remove implicit cast from CFX_WideString to (const wchar_t*) (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: win error #2 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: xfa/fxfa/app/xfa_ffdocview.cpp

diff --git a/xfa/fxfa/app/xfa_ffdocview.cpp b/xfa/fxfa/app/xfa_ffdocview.cpp

index 9c627ea3c1b28d9ef3d17b80062cb85ecd50dd16..daa5fd6277c49dc6c80ac213f87e2a300d57206c 100644

--- a/xfa/fxfa/app/xfa_ffdocview.cpp

+++ b/xfa/fxfa/app/xfa_ffdocview.cpp

@@ -157,7 +157,7 @@ void CXFA_FFDocView::ShowNullTestMsg() {

pAppProvider->LoadString(XFA_IDS_ValidateLimit, wsLimit);

if (!wsLimit.IsEmpty()) {

CFX_WideString wsTemp;

- wsTemp.Format((const FX_WCHAR*)wsLimit, iRemain);

+ wsTemp.Format(wsLimit.c_str(), iRemain);

wsMsg += FX_WSTRC(L"\n") + wsTemp;

}

@@ -792,8 +792,8 @@ void CXFA_FFDocView::RunBindItems() {

const bool bValueUseContent =

wsValueRef.IsEmpty() || wsValueRef == FX_WSTRC(L"$");

CFX_WideString wsValue, wsLabel;

- uint32_t uValueHash = FX_HashCode_String_GetW(CFX_WideString(wsValueRef),

- wsValueRef.GetLength());

+ uint32_t uValueHash =

+ FX_HashCode_String_GetW(wsValueRef.c_str(), wsValueRef.GetLength());

for (int32_t i = 0; i < iCount; i++) {

CXFA_Object* refObj = rs.nodes[i];

if (!refObj->IsNode()) {

« no previous file with comments | « xfa/fxfa/app/xfa_ffdoc.cpp ('k') | xfa/fxfa/app/xfa_ffimageedit.cpp » ('j') | no next file with comments »