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 a271b10286170ca4be89596a14b4cbb80ab576e2..f0c2d7645ac2aad067b17c873e94cf8718f98a2b 100644 |
--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp |
+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp |
@@ -132,7 +132,7 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode, |
CFDE_XMLElement* pXMLDataElement = |
static_cast<CFDE_XMLElement*>(pDataNode->GetXMLMappingNode()); |
FXSYS_assert(pXMLDataElement); |
- pWidgetData->GetFormatDataValue(wsValue.AsStringC(), wsFormatedValue); |
+ pWidgetData->GetFormatDataValue(wsValue, wsFormatedValue); |
pDataNode->SetAttributeValue(wsValue, wsFormatedValue); |
pDataNode->SetCData(XFA_ATTRIBUTE_ContentType, wsContentType); |
if (!wsHref.IsEmpty()) { |
@@ -161,7 +161,7 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode, |
->SetString(FX_WSTRC(L"xfa:dataNode"), FX_WSTRC(L"dataGroup")); |
} |
} else if (!wsValue.IsEmpty()) { |
- pWidgetData->GetFormatDataValue(wsValue.AsStringC(), wsFormatedValue); |
+ pWidgetData->GetFormatDataValue(wsValue, wsFormatedValue); |
pDataNode->SetAttributeValue(wsValue, wsFormatedValue); |
} |
break; |
@@ -170,7 +170,7 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode, |
if (wsValue.IsEmpty()) { |
break; |
} |
- pWidgetData->GetFormatDataValue(wsValue.AsStringC(), wsFormatedValue); |
+ pWidgetData->GetFormatDataValue(wsValue, wsFormatedValue); |
pDataNode->SetAttributeValue(wsValue, wsFormatedValue); |
break; |
case XFA_ELEMENT_ExclGroup: { |
@@ -240,7 +240,7 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode, |
CFX_WideString wsOutput; |
pWidgetData->NormalizeNumStr(wsValue, wsOutput); |
wsValue = wsOutput; |
- pWidgetData->GetFormatDataValue(wsValue.AsStringC(), wsFormatedValue); |
+ pWidgetData->GetFormatDataValue(wsValue, wsFormatedValue); |
pDataNode->SetAttributeValue(wsValue, wsFormatedValue); |
CXFA_Node* pValue = pFormNode->GetProperty(0, XFA_ELEMENT_Value); |
XFA_DataMerge_FormValueNode_SetChildContent(pValue, wsValue, |
@@ -251,7 +251,7 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode, |
if (wsValue.IsEmpty()) { |
break; |
} |
- pWidgetData->GetFormatDataValue(wsValue.AsStringC(), wsFormatedValue); |
+ pWidgetData->GetFormatDataValue(wsValue, wsFormatedValue); |
pDataNode->SetAttributeValue(wsValue, wsFormatedValue); |
break; |
} |
@@ -259,8 +259,7 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode, |
CFX_WideString wsXMLValue; |
pDataNode->TryContent(wsXMLValue); |
CFX_WideString wsNormailizeValue; |
- pWidgetData->GetNormalizeDataValue(wsXMLValue.AsStringC(), |
- wsNormailizeValue); |
+ pWidgetData->GetNormalizeDataValue(wsXMLValue, wsNormailizeValue); |
pDataNode->SetAttributeValue(wsNormailizeValue, wsXMLValue); |
switch (eUIType) { |
case XFA_ELEMENT_ImageEdit: { |