1 files changed, 18 insertions, 19 deletions

diff --git a/xfa/fgas/crt/cfgas_formatstring.h b/xfa/fgas/crt/cfgas_formatstring.h
index a8cb917697..87252f472e 100644
--- a/xfa/fgas/crt/cfgas_formatstring.h
+++ b/xfa/fgas/crt/cfgas_formatstring.h
@@ -23,14 +23,14 @@ class CFGAS_FormatString {
   ~CFGAS_FormatString();
 
   void SplitFormatString(const CFX_WideString& wsFormatString,
-                         std::vector<CFX_WideString>& wsPatterns);
+                         std::vector<CFX_WideString>* wsPatterns);
   FX_LOCALECATEGORY GetCategory(const CFX_WideString& wsPattern);
   bool ParseText(const CFX_WideString& wsSrcText,
                  const CFX_WideString& wsPattern,
-                 CFX_WideString& wsValue);
+                 CFX_WideString* wsValue);
   bool ParseNum(const CFX_WideString& wsSrcNum,
                 const CFX_WideString& wsPattern,
-                CFX_WideString& wsValue);
+                CFX_WideString* wsValue);
   bool ParseDateTime(const CFX_WideString& wsSrcDateTime,
                      const CFX_WideString& wsPattern,
                      FX_DATETIMETYPE eDateTimeType,
@@ -41,32 +41,31 @@ class CFGAS_FormatString {
                  const CFX_WideString& wsPattern);
   bool FormatText(const CFX_WideString& wsSrcText,
                   const CFX_WideString& wsPattern,
-                  CFX_WideString& wsOutput);
+                  CFX_WideString* wsOutput);
   bool FormatNum(const CFX_WideString& wsSrcNum,
                  const CFX_WideString& wsPattern,
-                 CFX_WideString& wsOutput);
+                 CFX_WideString* wsOutput);
   bool FormatDateTime(const CFX_WideString& wsSrcDateTime,
                       const CFX_WideString& wsPattern,
-                      CFX_WideString& wsOutput,
-                      FX_DATETIMETYPE eDateTimeType);
-  bool FormatZero(const CFX_WideString& wsPattern, CFX_WideString& wsOutput);
-  bool FormatNull(const CFX_WideString& wsPattern, CFX_WideString& wsOutput);
+                      FX_DATETIMETYPE eDateTimeType,
+                      CFX_WideString* wsOutput);
+  bool FormatZero(const CFX_WideString& wsPattern, CFX_WideString* wsOutput);
+  bool FormatNull(const CFX_WideString& wsPattern, CFX_WideString* wsOutput);
 
  private:
-  void GetTextFormat(const CFX_WideString& wsPattern,
-                     const CFX_WideStringC& wsCategory,
-                     CFX_WideString& wsPurgePattern);
+  CFX_WideString GetTextFormat(const CFX_WideString& wsPattern,
+                               const CFX_WideStringC& wsCategory);
   IFX_Locale* GetNumericFormat(const CFX_WideString& wsPattern,
-                               int32_t& iDotIndex,
-                               uint32_t& dwStyle,
-                               CFX_WideString& wsPurgePattern);
+                               int32_t* iDotIndex,
+                               uint32_t* dwStyle,
+                               CFX_WideString* wsPurgePattern);
   bool FormatStrNum(const CFX_WideStringC& wsInputNum,
                     const CFX_WideString& wsPattern,
-                    CFX_WideString& wsOutput);
+                    CFX_WideString* wsOutput);
   FX_DATETIMETYPE GetDateTimeFormat(const CFX_WideString& wsPattern,
-                                    IFX_Locale*& pLocale,
-                                    CFX_WideString& wsDatePattern,
-                                    CFX_WideString& wsTimePattern);
+                                    IFX_Locale** pLocale,
+                                    CFX_WideString* wsDatePattern,
+                                    CFX_WideString* wsTimePattern);
 
   CXFA_LocaleMgr* m_pLocaleMgr;
 };