From 8c2a8cda1bdb9f57513af5a21a5d0ce32614e52b Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 7 Sep 2016 15:29:11 -0700 Subject: Fix spelling of "Formated" in several variables Review-Url: https://codereview.chromium.org/2318423002 --- xfa/fxfa/parser/cxfa_widgetdata.cpp | 10 +++++----- xfa/fxfa/parser/cxfa_widgetdata.h | 2 +- xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | 26 ++++++++++++------------- 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'xfa/fxfa/parser') diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index 07f0ebb04d..561a5df92d 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -1739,8 +1739,8 @@ FX_BOOL CXFA_WidgetData::GetNormalizeDataValue( } FX_BOOL CXFA_WidgetData::GetFormatDataValue(const CFX_WideString& wsValue, - CFX_WideString& wsFormatedValue) { - wsFormatedValue = wsValue; + CFX_WideString& wsFormattedValue) { + wsFormattedValue = wsValue; if (wsValue.IsEmpty()) return TRUE; @@ -1796,7 +1796,7 @@ FX_BOOL CXFA_WidgetData::GetFormatDataValue(const CFX_WideString& wsValue, CFX_WideString wsDate, wsTime; if (SplitDateTime(wsValue, wsDate, wsTime)) { CXFA_LocaleValue date(XFA_VT_DATE, wsDate, pLocalMgr); - if (date.FormatPatterns(wsFormatedValue, wsPicture, pLocale, + if (date.FormatPatterns(wsFormattedValue, wsPicture, pLocale, XFA_VALUEPICTURE_DataBind)) { return TRUE; } @@ -1807,7 +1807,7 @@ FX_BOOL CXFA_WidgetData::GetFormatDataValue(const CFX_WideString& wsValue, CFX_WideString wsDate, wsTime; if (SplitDateTime(wsValue, wsDate, wsTime)) { CXFA_LocaleValue time(XFA_VT_TIME, wsTime, pLocalMgr); - if (time.FormatPatterns(wsFormatedValue, wsPicture, pLocale, + if (time.FormatPatterns(wsFormattedValue, wsPicture, pLocale, XFA_VALUEPICTURE_DataBind)) { return TRUE; } @@ -1817,7 +1817,7 @@ FX_BOOL CXFA_WidgetData::GetFormatDataValue(const CFX_WideString& wsValue, default: break; } - widgetValue.FormatPatterns(wsFormatedValue, wsPicture, pLocale, + widgetValue.FormatPatterns(wsFormattedValue, wsPicture, pLocale, XFA_VALUEPICTURE_DataBind); } return FALSE; diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h index 222b5bed4a..51e8672e39 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.h +++ b/xfa/fxfa/parser/cxfa_widgetdata.h @@ -134,7 +134,7 @@ class CXFA_WidgetData : public CXFA_Data { FX_BOOL GetNormalizeDataValue(const CFX_WideString& wsValue, CFX_WideString& wsNormalizeValue); FX_BOOL GetFormatDataValue(const CFX_WideString& wsValue, - CFX_WideString& wsFormatedValue); + CFX_WideString& wsFormattedValue); void NormalizeNumStr(const CFX_WideString& wsValue, CFX_WideString& wsOutput); CFX_WideString GetBarcodeType(); FX_BOOL GetBarcodeAttribute_CharEncoding(int32_t& val); diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp index 11a44b917d..ea2f31671f 100644 --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp @@ -125,7 +125,7 @@ void CreateDataBinding(CXFA_Node* pFormNode, CXFA_Value defValue(pFormNode->GetProperty(0, XFA_Element::Value)); if (!bDataToForm) { CFX_WideString wsValue; - CFX_WideString wsFormatedValue; + CFX_WideString wsFormattedValue; switch (eUIType) { case XFA_Element::ImageEdit: { CXFA_Image image = defValue.GetImage(); @@ -139,8 +139,8 @@ void CreateDataBinding(CXFA_Node* pFormNode, CFDE_XMLElement* pXMLDataElement = static_cast(pDataNode->GetXMLMappingNode()); ASSERT(pXMLDataElement); - pWidgetData->GetFormatDataValue(wsValue, wsFormatedValue); - pDataNode->SetAttributeValue(wsValue, wsFormatedValue); + pWidgetData->GetFormatDataValue(wsValue, wsFormattedValue); + pDataNode->SetAttributeValue(wsValue, wsFormattedValue); pDataNode->SetCData(XFA_ATTRIBUTE_ContentType, wsContentType); if (!wsHref.IsEmpty()) pXMLDataElement->SetString(L"href", wsHref); @@ -169,8 +169,8 @@ void CreateDataBinding(CXFA_Node* pFormNode, L"dataGroup"); } } else if (!wsValue.IsEmpty()) { - pWidgetData->GetFormatDataValue(wsValue, wsFormatedValue); - pDataNode->SetAttributeValue(wsValue, wsFormatedValue); + pWidgetData->GetFormatDataValue(wsValue, wsFormattedValue); + pDataNode->SetAttributeValue(wsValue, wsFormattedValue); } break; case XFA_Element::CheckButton: @@ -178,8 +178,8 @@ void CreateDataBinding(CXFA_Node* pFormNode, if (wsValue.IsEmpty()) break; - pWidgetData->GetFormatDataValue(wsValue, wsFormatedValue); - pDataNode->SetAttributeValue(wsValue, wsFormatedValue); + pWidgetData->GetFormatDataValue(wsValue, wsFormattedValue); + pDataNode->SetAttributeValue(wsValue, wsFormattedValue); break; case XFA_Element::ExclGroup: { CXFA_Node* pChecked = nullptr; @@ -208,8 +208,8 @@ void CreateDataBinding(CXFA_Node* pFormNode, CFX_WideString wsContent; if (pText->TryContent(wsContent) && (wsContent == wsValue)) { pChecked = pChild; - wsFormatedValue = wsValue; - pDataNode->SetAttributeValue(wsValue, wsFormatedValue); + wsFormattedValue = wsValue; + pDataNode->SetAttributeValue(wsValue, wsFormattedValue); pFormNode->SetCData(XFA_ATTRIBUTE_Value, wsContent); break; } @@ -247,8 +247,8 @@ void CreateDataBinding(CXFA_Node* pFormNode, CFX_WideString wsOutput; pWidgetData->NormalizeNumStr(wsValue, wsOutput); wsValue = wsOutput; - pWidgetData->GetFormatDataValue(wsValue, wsFormatedValue); - pDataNode->SetAttributeValue(wsValue, wsFormatedValue); + pWidgetData->GetFormatDataValue(wsValue, wsFormattedValue); + pDataNode->SetAttributeValue(wsValue, wsFormattedValue); CXFA_Node* pValue = pFormNode->GetProperty(0, XFA_Element::Value); FormValueNode_SetChildContent(pValue, wsValue, XFA_Element::Float); break; @@ -258,8 +258,8 @@ void CreateDataBinding(CXFA_Node* pFormNode, if (wsValue.IsEmpty()) break; - pWidgetData->GetFormatDataValue(wsValue, wsFormatedValue); - pDataNode->SetAttributeValue(wsValue, wsFormatedValue); + pWidgetData->GetFormatDataValue(wsValue, wsFormattedValue); + pDataNode->SetAttributeValue(wsValue, wsFormattedValue); break; } return; -- cgit v1.2.3