Return values instead of out paramschromium/3056

This CL updates the IFX_Locale code and subclasses to return
CFX_WideStrings instead of taking out params.

Change-Id: Id03499c68161e809607e73b9d8ec778e24631845
Reviewed-on: https://pdfium-review.googlesource.com/3252
Reviewed-by: Nicolás Peña <npm@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

1 files changed, 10 insertions, 12 deletions

diff --git a/xfa/fxfa/parser/cxfa_localevalue.cpp b/xfa/fxfa/parser/cxfa_localevalue.cpp
index 189d7d9605..a5238d2c3f 100644
--- a/xfa/fxfa/parser/cxfa_localevalue.cpp
+++ b/xfa/fxfa/parser/cxfa_localevalue.cpp
@@ -940,28 +940,26 @@ bool CXFA_LocaleValue::ValidateNumericTemp(CFX_WideString& wsNumeric,
     }
     n++;
   }
-  if (n == nCount) {
+  if (n == nCount)
     return true;
-  }
-  if (nf == nCountFmt) {
+  if (nf == nCountFmt)
     return false;
-  }
+
   while (nf < nCountFmt && (cf = pFmt[nf]) != L'.') {
     ASSERT(cf == L'z' || cf == L'*');
     ++nf;
   }
   CFX_WideString wsDecimalSymbol;
-  if (pLocale) {
-    pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_Decimal, wsDecimalSymbol);
-  } else {
+  if (pLocale)
+    wsDecimalSymbol = pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_Decimal);
+  else
     wsDecimalSymbol = CFX_WideString(L'.');
-  }
-  if (pFmt[nf] != L'.') {
+
+  if (pFmt[nf] != L'.')
     return false;
-  }
-  if (wsDecimalSymbol != CFX_WideStringC(c) && c != L'.') {
+  if (wsDecimalSymbol != CFX_WideStringC(c) && c != L'.')
     return false;
-  }
+
   ++nf;
   ++n;
   bLimit = true;