xfa/fxfa/parser/xfa_document_datamerger_imp.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/parser/xfa_document_datamerger_imp.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/parser/xfa_document_datamerger_imp.cpp

diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp

index ea924165d11b00fba33848bd6e8397700fc0acfb..a75a8ea72cbe74c9e32bdc643da8f1b7863037ff 100644

--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp

+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp

@@ -563,8 +563,8 @@ static CXFA_Node* XFA_NodeMerge_CloneOrMergeInstanceManager(

CXFA_NodeArray& subforms) {

CFX_WideStringC wsSubformName = pTemplateNode->GetCData(XFA_ATTRIBUTE_Name);

CFX_WideString wsInstMgrNodeName = FX_WSTRC(L"_") + wsSubformName;

- uint32_t dwInstNameHash =

- FX_HashCode_String_GetW(wsInstMgrNodeName, wsInstMgrNodeName.GetLength());

+ uint32_t dwInstNameHash = FX_HashCode_String_GetW(

+ wsInstMgrNodeName.c_str(), wsInstMgrNodeName.GetLength());

CXFA_Node* pExistingNode = XFA_DataMerge_FindFormDOMInstance(

pDocument, XFA_ELEMENT_InstanceManager, dwInstNameHash, pFormParent);

if (pExistingNode) {

« no previous file with comments | « xfa/fxfa/parser/xfa_basic_imp.cpp ('k') | xfa/fxfa/parser/xfa_document_imp.cpp » ('j') | no next file with comments »