| 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 5d371619e415080407cc65aa2b00fc31fe5105a7..a5f021aacd1edec99eb0ce68067f3e3604e243c5 100644
|
| --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
|
| +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
|
| @@ -398,7 +398,7 @@ static CXFA_Node* XFA_DataMerge_FindGlobalDataNode(CXFA_Document* pDocument,
|
| CXFA_Node* pDataScope,
|
| XFA_ELEMENT eMatchNodeType) {
|
| uint32_t dwNameHash =
|
| - wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.GetPtr(),
|
| + wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.raw_str(),
|
| wsName.GetLength());
|
| if (dwNameHash != 0) {
|
| CXFA_Node* pBounded = XFA_DataMerge_GetGlobalBinding(pDocument, dwNameHash);
|
| @@ -418,7 +418,7 @@ static CXFA_Node* XFA_DataMerge_FindOnceDataNode(CXFA_Document* pDocument,
|
| CXFA_Node* pDataScope,
|
| XFA_ELEMENT eMatchNodeType) {
|
| uint32_t dwNameHash =
|
| - wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.GetPtr(),
|
| + wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.raw_str(),
|
| wsName.GetLength());
|
| if (dwNameHash != 0) {
|
| for (CXFA_Node *pCurDataScope = pDataScope, *pLastDataScope = NULL;
|
|
|