Index: xfa/fxfa/parser/xfa_script_resolveprocessor.cpp |
diff --git a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp |
index ecf384b51cc40a7b7ec15e65e40e82758b1d6b55..fcd24bf949ca0d72a46b17fff0d1150531eca67c 100644 |
--- a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp |
+++ b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp |
@@ -122,8 +122,8 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Dollar( |
if (rnd.m_nLevel > 0) { |
return -1; |
} |
- uint32_t dwNameHash = |
- FX_HashCode_String_GetW(wsName.c_str() + 1, iNameLen - 1); |
+ uint32_t dwNameHash = FX_HashCode_GetW( |
+ CFX_WideStringC(wsName.c_str() + 1, iNameLen - 1), false); |
if (dwNameHash == XFA_HASHCODE_Xfa) { |
nodes.Add(rnd.m_pSC->GetDocument()->GetRoot()); |
} else { |
@@ -151,8 +151,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Excalmatory( |
rndFind.m_pSC = rnd.m_pSC; |
rndFind.m_CurNode = datasets; |
rndFind.m_wsName = rnd.m_wsName.Right(rnd.m_wsName.GetLength() - 1); |
- rndFind.m_uHashName = FX_HashCode_String_GetW(rndFind.m_wsName.c_str(), |
- rndFind.m_wsName.GetLength()); |
+ rndFind.m_uHashName = FX_HashCode_GetW(rndFind.m_wsName.AsStringC(), false); |
rndFind.m_nLevel = rnd.m_nLevel + 1; |
rndFind.m_dwStyles = XFA_RESOLVENODE_Children; |
rndFind.m_wsCondition = rnd.m_wsCondition; |
@@ -178,8 +177,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_NumberSign( |
rndFind.m_dwStyles |= XFA_RESOLVENODE_TagName; |
rndFind.m_dwStyles &= ~XFA_RESOLVENODE_Attributes; |
rndFind.m_wsName = wsName; |
- rndFind.m_uHashName = FX_HashCode_String_GetW(rndFind.m_wsName.c_str(), |
- rndFind.m_wsName.GetLength()); |
+ rndFind.m_uHashName = FX_HashCode_GetW(rndFind.m_wsName.AsStringC(), false); |
rndFind.m_wsCondition = wsCondition; |
rndFind.m_CurNode = curNode; |
XFA_ResolveNodes_Normal(rndFind); |
@@ -617,7 +615,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_GetFilter( |
wsCondition.ReleaseBuffer(nConditionCount); |
wsCondition.TrimLeft(); |
wsCondition.TrimRight(); |
- rnd.m_uHashName = FX_HashCode_String_GetW(wsName.c_str(), wsName.GetLength()); |
+ rnd.m_uHashName = FX_HashCode_GetW(wsName.AsStringC(), false); |
return nStart; |
} |
void CXFA_ResolveProcessor::XFA_ResolveNode_ConditionArray( |