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 <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

11 files changed, 53 insertions, 75 deletions

diff --git a/xfa/fxfa/cxfa_ffdocview.cpp b/xfa/fxfa/cxfa_ffdocview.cpp
index d076fdeddb..3895d54569 100644
--- a/xfa/fxfa/cxfa_ffdocview.cpp
+++ b/xfa/fxfa/cxfa_ffdocview.cpp
@@ -163,12 +163,10 @@ void CXFA_FFDocView::ShowNullTestMsg() {
       wsMsg += m_arrNullTestMsg[i] + L"\n";
 
     if (iRemain > 0) {
-      WideString wsTemp;
-      wsTemp.Format(
-          L"Message limit exceeded. Remaining %d "
-          L"validation errors not reported.",
-          iRemain);
-      wsMsg += L"\n" + wsTemp;
+      wsMsg += L"\n" + WideString::Format(
+                           L"Message limit exceeded. Remaining %d "
+                           L"validation errors not reported.",
+                           iRemain);
     }
     pAppProvider->MsgBox(wsMsg, pAppProvider->GetAppTitle(), XFA_MBICON_Status,
                          XFA_MB_OK);
diff --git a/xfa/fxfa/cxfa_ffnotify.cpp b/xfa/fxfa/cxfa_ffnotify.cpp
index 6e3cdd9411..fb63556da9 100644
--- a/xfa/fxfa/cxfa_ffnotify.cpp
+++ b/xfa/fxfa/cxfa_ffnotify.cpp
@@ -286,12 +286,10 @@ void CXFA_FFNotify::OpenDropDownList(CXFA_FFWidget* hWidget) {
 WideString CXFA_FFNotify::GetCurrentDateTime() {
   CFX_DateTime dataTime;
   dataTime.Now();
-
-  WideString wsDateTime;
-  wsDateTime.Format(L"%d%02d%02dT%02d%02d%02d", dataTime.GetYear(),
-                    dataTime.GetMonth(), dataTime.GetDay(), dataTime.GetHour(),
-                    dataTime.GetMinute(), dataTime.GetSecond());
-  return wsDateTime;
+  return WideString::Format(L"%d%02d%02dT%02d%02d%02d", dataTime.GetYear(),
+                            dataTime.GetMonth(), dataTime.GetDay(),
+                            dataTime.GetHour(), dataTime.GetMinute(),
+                            dataTime.GetSecond());
 }
 
 void CXFA_FFNotify::ResetData(CXFA_WidgetData* pWidgetData) {
diff --git a/xfa/fxfa/cxfa_fftextedit.cpp b/xfa/fxfa/cxfa_fftextedit.cpp
index 61f48d7f54..848eab875f 100644
--- a/xfa/fxfa/cxfa_fftextedit.cpp
+++ b/xfa/fxfa/cxfa_fftextedit.cpp
@@ -203,10 +203,9 @@ void CXFA_FFTextEdit::ValidateNumberField(const WideString& wsText) {
   WideString wsSomField;
   pAcc->GetNode()->GetSOMExpression(wsSomField);
 
-  WideString wsMessage;
-  wsMessage.Format(L"%s can not contain %s", wsText.c_str(),
-                   wsSomField.c_str());
-  pAppProvider->MsgBox(wsMessage, pAppProvider->GetAppTitle(), XFA_MBICON_Error,
+  pAppProvider->MsgBox(WideString::Format(L"%s can not contain %s",
+                                          wsText.c_str(), wsSomField.c_str()),
+                       pAppProvider->GetAppTitle(), XFA_MBICON_Error,
                        XFA_MB_OK);
 }
 
diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp
index 532079e4a7..bec116c65e 100644
--- a/xfa/fxfa/cxfa_textlayout.cpp
+++ b/xfa/fxfa/cxfa_textlayout.cpp
@@ -756,7 +756,7 @@ bool CXFA_TextLayout::LoadRichText(
         } else if (wsName == L"li") {
           bCurLi = true;
           if (bIsOl)
-            wsText.Format(L"%d.  ", iLiCount);
+            wsText = WideString::Format(L"%d.  ", iLiCount);
           else
             wsText = 0x00B7 + WideStringView(L"  ", 1);
         } else if (!bContentNode) {
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp
index a579646fd9..b019bf636c 100644
--- a/xfa/fxfa/cxfa_widgetacc.cpp
+++ b/xfa/fxfa/cxfa_widgetacc.cpp
@@ -472,7 +472,8 @@ int32_t CXFA_WidgetAcc::ProcessNullTestValidate(CXFA_ValidateData validateData,
     case XFA_ATTRIBUTEENUM_Error: {
       if (wsNullMsg.IsEmpty()) {
         wsCaptionName = GetValidateCaptionName(bVersionFlag);
-        wsNullMsg.Format(L"%s cannot be blank.", wsCaptionName.c_str());
+        wsNullMsg =
+            WideString::Format(L"%s cannot be blank.", wsCaptionName.c_str());
       }
       pAppProvider->MsgBox(wsNullMsg, wsTitle, XFA_MBICON_Status, XFA_MB_OK);
       return XFA_EVENTERROR_Error;
@@ -483,7 +484,7 @@ int32_t CXFA_WidgetAcc::ProcessNullTestValidate(CXFA_ValidateData validateData,
 
       if (wsNullMsg.IsEmpty()) {
         wsCaptionName = GetValidateCaptionName(bVersionFlag);
-        wsNullMsg.Format(
+        wsNullMsg = WideString::Format(
             L"%s cannot be blank. To ignore validations for %s, click Ignore.",
             wsCaptionName.c_str(), wsCaptionName.c_str());
       }
@@ -518,21 +519,16 @@ WideString CXFA_WidgetAcc::GetValidateCaptionName(bool bVersionFlag) {
 
 WideString CXFA_WidgetAcc::GetValidateMessage(bool bError, bool bVersionFlag) {
   WideString wsCaptionName = GetValidateCaptionName(bVersionFlag);
-  WideString wsMessage;
-  if (bVersionFlag) {
-    wsMessage.Format(L"%s validation failed", wsCaptionName.c_str());
-    return wsMessage;
-  }
+  if (bVersionFlag)
+    return WideString::Format(L"%s validation failed", wsCaptionName.c_str());
   if (bError) {
-    wsMessage.Format(L"The value you entered for %s is invalid.",
-                     wsCaptionName.c_str());
-    return wsMessage;
+    return WideString::Format(L"The value you entered for %s is invalid.",
+                              wsCaptionName.c_str());
   }
-  wsMessage.Format(
+  return WideString::Format(
       L"The value you entered for %s is invalid. To ignore "
       L"validations for %s, click Ignore.",
       wsCaptionName.c_str(), wsCaptionName.c_str());
-  return wsMessage;
 }
 
 int32_t CXFA_WidgetAcc::ProcessValidate(int32_t iFlags) {
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 {