| 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 f812d03032b9902b3bfcbcfe1b4ac1f89ad0012b..ea924165d11b00fba33848bd6e8397700fc0acfb 100644
|
| --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
|
| +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
|
| @@ -132,8 +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.AsWideStringC(),
|
| - wsFormatedValue);
|
| + pWidgetData->GetFormatDataValue(wsValue.AsStringC(), wsFormatedValue);
|
| pDataNode->SetAttributeValue(wsValue, wsFormatedValue);
|
| pDataNode->SetCData(XFA_ATTRIBUTE_ContentType, wsContentType);
|
| if (!wsHref.IsEmpty()) {
|
| @@ -162,8 +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.AsWideStringC(),
|
| - wsFormatedValue);
|
| + pWidgetData->GetFormatDataValue(wsValue.AsStringC(), wsFormatedValue);
|
| pDataNode->SetAttributeValue(wsValue, wsFormatedValue);
|
| }
|
| break;
|
| @@ -172,8 +170,7 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode,
|
| if (wsValue.IsEmpty()) {
|
| break;
|
| }
|
| - pWidgetData->GetFormatDataValue(wsValue.AsWideStringC(),
|
| - wsFormatedValue);
|
| + pWidgetData->GetFormatDataValue(wsValue.AsStringC(), wsFormatedValue);
|
| pDataNode->SetAttributeValue(wsValue, wsFormatedValue);
|
| break;
|
| case XFA_ELEMENT_ExclGroup: {
|
| @@ -243,8 +240,7 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode,
|
| CFX_WideString wsOutput;
|
| pWidgetData->NormalizeNumStr(wsValue, wsOutput);
|
| wsValue = wsOutput;
|
| - pWidgetData->GetFormatDataValue(wsValue.AsWideStringC(),
|
| - wsFormatedValue);
|
| + pWidgetData->GetFormatDataValue(wsValue.AsStringC(), wsFormatedValue);
|
| pDataNode->SetAttributeValue(wsValue, wsFormatedValue);
|
| CXFA_Node* pValue = pFormNode->GetProperty(0, XFA_ELEMENT_Value);
|
| XFA_DataMerge_FormValueNode_SetChildContent(pValue, wsValue,
|
| @@ -255,8 +251,7 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode,
|
| if (wsValue.IsEmpty()) {
|
| break;
|
| }
|
| - pWidgetData->GetFormatDataValue(wsValue.AsWideStringC(),
|
| - wsFormatedValue);
|
| + pWidgetData->GetFormatDataValue(wsValue.AsStringC(), wsFormatedValue);
|
| pDataNode->SetAttributeValue(wsValue, wsFormatedValue);
|
| break;
|
| }
|
| @@ -264,7 +259,7 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode,
|
| CFX_WideString wsXMLValue;
|
| pDataNode->TryContent(wsXMLValue);
|
| CFX_WideString wsNormailizeValue;
|
| - pWidgetData->GetNormalizeDataValue(wsXMLValue.AsWideStringC(),
|
| + pWidgetData->GetNormalizeDataValue(wsXMLValue.AsStringC(),
|
| wsNormailizeValue);
|
| pDataNode->SetAttributeValue(wsNormailizeValue, wsXMLValue);
|
| switch (eUIType) {
|
| @@ -319,7 +314,7 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode,
|
| defValue.GetNode(), wsNormailizeValue, XFA_ELEMENT_Text);
|
| break;
|
| case XFA_ELEMENT_ExclGroup: {
|
| - pWidgetData->SetSelectedMemberByValue(wsNormailizeValue.AsWideStringC(),
|
| + pWidgetData->SetSelectedMemberByValue(wsNormailizeValue.AsStringC(),
|
| bNotify, FALSE, FALSE);
|
| } break;
|
| case XFA_ELEMENT_DateTimeEdit:
|
|
|