From 3f1c832dda209cf6682bb75316c07d71332fe6c3 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 16 Nov 2017 21:45:18 +0000 Subject: Make WideString::{Format|FormatV} static This CL moves the Format and FormatV methods from WideString to be static. Bug: pdfium:934 Change-Id: I9941d6a2a5bbf0a82087cd0ea5d0f8fc42eecd3e Reviewed-on: https://pdfium-review.googlesource.com/18630 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_dataexporter.cpp | 3 ++- xfa/fxfa/parser/cxfa_filldata.cpp | 6 +++--- xfa/fxfa/parser/cxfa_localevalue.cpp | 27 +++++++++++---------------- xfa/fxfa/parser/cxfa_measurement.cpp | 28 +++++++++------------------- xfa/fxfa/parser/cxfa_nodehelper.cpp | 9 +++++---- xfa/fxfa/parser/cxfa_strokedata.cpp | 6 +++--- 6 files changed, 33 insertions(+), 46 deletions(-) (limited to 'xfa/fxfa/parser') diff --git a/xfa/fxfa/parser/cxfa_dataexporter.cpp b/xfa/fxfa/parser/cxfa_dataexporter.cpp index c86a7f7d51..e8a37719fe 100644 --- a/xfa/fxfa/parser/cxfa_dataexporter.cpp +++ b/xfa/fxfa/parser/cxfa_dataexporter.cpp @@ -162,7 +162,8 @@ void RecognizeXFAVersionNumber(CXFA_Node* pTemplateRoot, if (eVersion == XFA_VERSION_UNKNOWN) eVersion = XFA_VERSION_DEFAULT; - wsVersionNumber.Format(L"%i.%i", eVersion / 100, eVersion % 100); + wsVersionNumber = + WideString::Format(L"%i.%i", eVersion / 100, eVersion % 100); } void RegenerateFormFile_Changed(CXFA_Node* pNode, diff --git a/xfa/fxfa/parser/cxfa_filldata.cpp b/xfa/fxfa/parser/cxfa_filldata.cpp index da249548f9..9f57b8de7d 100644 --- a/xfa/fxfa/parser/cxfa_filldata.cpp +++ b/xfa/fxfa/parser/cxfa_filldata.cpp @@ -19,14 +19,14 @@ int32_t CXFA_FillData::GetPresence() { void CXFA_FillData::SetColor(FX_ARGB color) { CXFA_Node* pNode = m_pNode->JSNode()->GetProperty(0, XFA_Element::Color, true); - WideString wsColor; int a; int r; int g; int b; std::tie(a, r, g, b) = ArgbDecode(color); - wsColor.Format(L"%d,%d,%d", r, g, b); - pNode->JSNode()->SetCData(XFA_Attribute::Value, wsColor, false, false); + pNode->JSNode()->SetCData(XFA_Attribute::Value, + WideString::Format(L"%d,%d,%d", r, g, b), false, + false); } FX_ARGB CXFA_FillData::GetColor(bool bText) { diff --git a/xfa/fxfa/parser/cxfa_localevalue.cpp b/xfa/fxfa/parser/cxfa_localevalue.cpp index 109254fe2c..09e3577887 100644 --- a/xfa/fxfa/parser/cxfa_localevalue.cpp +++ b/xfa/fxfa/parser/cxfa_localevalue.cpp @@ -292,32 +292,27 @@ CFX_DateTime CXFA_LocaleValue::GetTime() const { bool CXFA_LocaleValue::SetDate(const CFX_DateTime& d) { m_dwType = XFA_VT_DATE; - m_wsValue.Format(L"%04d-%02d-%02d", d.GetYear(), d.GetMonth(), d.GetDay()); + m_wsValue = WideString::Format(L"%04d-%02d-%02d", d.GetYear(), d.GetMonth(), + d.GetDay()); return true; } bool CXFA_LocaleValue::SetTime(const CFX_DateTime& t) { m_dwType = XFA_VT_TIME; - m_wsValue.Format(L"%02d:%02d:%02d", t.GetHour(), t.GetMinute(), - t.GetSecond()); - if (t.GetMillisecond() > 0) { - WideString wsTemp; - wsTemp.Format(L"%:03d", t.GetMillisecond()); - m_wsValue += wsTemp; - } + m_wsValue = WideString::Format(L"%02d:%02d:%02d", t.GetHour(), t.GetMinute(), + t.GetSecond()); + if (t.GetMillisecond() > 0) + m_wsValue += WideString::Format(L"%:03d", t.GetMillisecond()); return true; } bool CXFA_LocaleValue::SetDateTime(const CFX_DateTime& dt) { m_dwType = XFA_VT_DATETIME; - m_wsValue.Format(L"%04d-%02d-%02dT%02d:%02d:%02d", dt.GetYear(), - dt.GetMonth(), dt.GetDay(), dt.GetHour(), dt.GetMinute(), - dt.GetSecond()); - if (dt.GetMillisecond() > 0) { - WideString wsTemp; - wsTemp.Format(L"%:03d", dt.GetMillisecond()); - m_wsValue += wsTemp; - } + m_wsValue = WideString::Format(L"%04d-%02d-%02dT%02d:%02d:%02d", dt.GetYear(), + dt.GetMonth(), dt.GetDay(), dt.GetHour(), + dt.GetMinute(), dt.GetSecond()); + if (dt.GetMillisecond() > 0) + m_wsValue += WideString::Format(L"%:03d", dt.GetMillisecond()); return true; } diff --git a/xfa/fxfa/parser/cxfa_measurement.cpp b/xfa/fxfa/parser/cxfa_measurement.cpp index 91e39af969..288ed0cd31 100644 --- a/xfa/fxfa/parser/cxfa_measurement.cpp +++ b/xfa/fxfa/parser/cxfa_measurement.cpp @@ -46,37 +46,27 @@ void CXFA_Measurement::SetString(const WideStringView& wsMeasure) { } WideString CXFA_Measurement::ToString() const { - WideString wsMeasure; switch (GetUnit()) { case XFA_Unit::Mm: - wsMeasure.Format(L"%.8gmm", GetValue()); - break; + return WideString::Format(L"%.8gmm", GetValue()); case XFA_Unit::Pt: - wsMeasure.Format(L"%.8gpt", GetValue()); - break; + return WideString::Format(L"%.8gpt", GetValue()); case XFA_Unit::In: - wsMeasure.Format(L"%.8gin", GetValue()); - break; + return WideString::Format(L"%.8gin", GetValue()); case XFA_Unit::Cm: - wsMeasure.Format(L"%.8gcm", GetValue()); - break; + return WideString::Format(L"%.8gcm", GetValue()); case XFA_Unit::Mp: - wsMeasure.Format(L"%.8gmp", GetValue()); - break; + return WideString::Format(L"%.8gmp", GetValue()); case XFA_Unit::Pc: - wsMeasure.Format(L"%.8gpc", GetValue()); - break; + return WideString::Format(L"%.8gpc", GetValue()); case XFA_Unit::Em: - wsMeasure.Format(L"%.8gem", GetValue()); - break; + return WideString::Format(L"%.8gem", GetValue()); case XFA_Unit::Percent: - wsMeasure.Format(L"%.8g%%", GetValue()); - break; + return WideString::Format(L"%.8g%%", GetValue()); default: - wsMeasure.Format(L"%.8g", GetValue()); break; } - return wsMeasure; + return WideString::Format(L"%.8g", GetValue()); } float CXFA_Measurement::ToUnit(XFA_Unit eUnit) const { diff --git a/xfa/fxfa/parser/cxfa_nodehelper.cpp b/xfa/fxfa/parser/cxfa_nodehelper.cpp index bc1d5c2031..e8e88d2fc1 100644 --- a/xfa/fxfa/parser/cxfa_nodehelper.cpp +++ b/xfa/fxfa/parser/cxfa_nodehelper.cpp @@ -256,14 +256,15 @@ void CXFA_NodeHelper::GetNameExpression(CXFA_Node* refNode, if (refNode->IsUnnamed() || (bIsProperty && refNode->GetElementType() != XFA_Element::PageSet)) { ws = refNode->GetClassName(); - wsName.Format(L"#%s[%d]", ws.c_str(), - GetIndex(refNode, eLogicType, bIsProperty, true)); + wsName = + WideString::Format(L"#%s[%d]", ws.c_str(), + GetIndex(refNode, eLogicType, bIsProperty, true)); return; } ws = refNode->JSNode()->GetCData(XFA_Attribute::Name); ws.Replace(L".", L"\\."); - wsName.Format(L"%s[%d]", ws.c_str(), - GetIndex(refNode, eLogicType, bIsProperty, false)); + wsName = WideString::Format( + L"%s[%d]", ws.c_str(), GetIndex(refNode, eLogicType, bIsProperty, false)); } bool CXFA_NodeHelper::NodeIsTransparent(CXFA_Node* refNode) { diff --git a/xfa/fxfa/parser/cxfa_strokedata.cpp b/xfa/fxfa/parser/cxfa_strokedata.cpp index 43354a38a4..edbac24237 100644 --- a/xfa/fxfa/parser/cxfa_strokedata.cpp +++ b/xfa/fxfa/parser/cxfa_strokedata.cpp @@ -60,14 +60,14 @@ void CXFA_StrokeData::SetColor(FX_ARGB argb) { CXFA_Node* pNode = m_pNode->JSNode()->GetProperty(0, XFA_Element::Color, true); - WideString wsColor; int a; int r; int g; int b; std::tie(a, r, g, b) = ArgbDecode(argb); - wsColor.Format(L"%d,%d,%d", r, g, b); - pNode->JSNode()->SetCData(XFA_Attribute::Value, wsColor, false, false); + pNode->JSNode()->SetCData(XFA_Attribute::Value, + WideString::Format(L"%d,%d,%d", r, g, b), false, + false); } int32_t CXFA_StrokeData::GetJoinType() const { -- cgit v1.2.3