xfa/fxfa/parser/xfa_document_datamerger_imp.cpp - Issue 1857073002: Make down-conversion explicit from CFX_Widetring to CFX_WideStringC.

Unified Diff: xfa/fxfa/parser/xfa_document_datamerger_imp.cpp

Issue 1857073002: Make down-conversion explicit from CFX_Widetring to CFX_WideStringC. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: String argument type 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 a5f021aacd1edec99eb0ce68067f3e3604e243c5..a28b4994abc5161a5dfd588023e02b3cec9af981 100644

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

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

@@ -131,7 +131,8 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode,

CFDE_XMLElement* pXMLDataElement =

static_cast<CFDE_XMLElement*>(pDataNode->GetXMLMappingNode());

FXSYS_assert(pXMLDataElement);

- pWidgetData->GetFormatDataValue(wsValue, wsFormatedValue);

+ pWidgetData->GetFormatDataValue(wsValue.AsWideStringC(),

+ wsFormatedValue);

pDataNode->SetAttributeValue(wsValue, wsFormatedValue);

pDataNode->SetCData(XFA_ATTRIBUTE_ContentType, wsContentType);

if (!wsHref.IsEmpty()) {

@@ -160,7 +161,8 @@ 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, wsFormatedValue);

+ pWidgetData->GetFormatDataValue(wsValue.AsWideStringC(),

+ wsFormatedValue);

pDataNode->SetAttributeValue(wsValue, wsFormatedValue);

}

break;

@@ -169,7 +171,8 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode,

if (wsValue.IsEmpty()) {

break;

}

- pWidgetData->GetFormatDataValue(wsValue, wsFormatedValue);

+ pWidgetData->GetFormatDataValue(wsValue.AsWideStringC(),

+ wsFormatedValue);

pDataNode->SetAttributeValue(wsValue, wsFormatedValue);

break;

case XFA_ELEMENT_ExclGroup: {

@@ -239,7 +242,8 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode,

CFX_WideString wsOutput;

pWidgetData->NormalizeNumStr(wsValue, wsOutput);

wsValue = wsOutput;

- pWidgetData->GetFormatDataValue(wsValue, wsFormatedValue);

+ pWidgetData->GetFormatDataValue(wsValue.AsWideStringC(),

+ wsFormatedValue);

pDataNode->SetAttributeValue(wsValue, wsFormatedValue);

CXFA_Node* pValue = pFormNode->GetProperty(0, XFA_ELEMENT_Value);

XFA_DataMerge_FormValueNode_SetChildContent(pValue, wsValue,

@@ -250,7 +254,8 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode,

if (wsValue.IsEmpty()) {

break;

}

- pWidgetData->GetFormatDataValue(wsValue, wsFormatedValue);

+ pWidgetData->GetFormatDataValue(wsValue.AsWideStringC(),

+ wsFormatedValue);

pDataNode->SetAttributeValue(wsValue, wsFormatedValue);

break;

}

@@ -258,7 +263,8 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode,

CFX_WideString wsXMLValue;

pDataNode->TryContent(wsXMLValue);

CFX_WideString wsNormailizeValue;

- pWidgetData->GetNormalizeDataValue(wsXMLValue, wsNormailizeValue);

+ pWidgetData->GetNormalizeDataValue(wsXMLValue.AsWideStringC(),

+ wsNormailizeValue);

pDataNode->SetAttributeValue(wsNormailizeValue, wsXMLValue);

switch (eUIType) {

case XFA_ELEMENT_ImageEdit: {

@@ -312,8 +318,8 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode,

defValue.GetNode(), wsNormailizeValue, XFA_ELEMENT_Text);

break;

case XFA_ELEMENT_ExclGroup: {

- pWidgetData->SetSelectedMemberByValue(wsNormailizeValue, bNotify, FALSE,

- FALSE);

+ pWidgetData->SetSelectedMemberByValue(wsNormailizeValue.AsWideStringC(),

+ bNotify, FALSE, FALSE);

} break;

case XFA_ELEMENT_DateTimeEdit:

XFA_DataMerge_FormValueNode_SetChildContent(

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