Cleaning out params in CPDFXFA_Context

This CL cleans up some of the out params in CPDFXFA_Context. In the process
several of the strings returned by ::LoadString() are inlined in their
call sites and the defines removed.

BUG=pdfium:549

Change-Id: I41a7ceeba3962299eecd0cb714ddb03d28dbb0ea
Reviewed-on: https://pdfium-review.googlesource.com/2134
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

1 files changed, 10 insertions, 36 deletions

diff --git a/xfa/fxfa/fxfa.h b/xfa/fxfa/fxfa.h
index ec5282cf8a..26569476b5 100644
--- a/xfa/fxfa/fxfa.h
+++ b/xfa/fxfa/fxfa.h
@@ -38,12 +38,7 @@ class IXFA_WidgetIterator;
 #define XFA_IDCancel 2
 #define XFA_IDNo 3
 #define XFA_IDYes 4
-#define XFA_IDS_ValidateFailed 1
-#define XFA_IDS_CalcOverride 2
-#define XFA_IDS_ModifyField 3
-#define XFA_IDS_NotModifyField 4
-#define XFA_IDS_AppName 5
-#define XFA_IDS_Unable_TO_SET 8
+
 #define XFA_IDS_INVAlID_PROP_SET 13
 #define XFA_IDS_NOT_DEFAUL_VALUE 14
 #define XFA_IDS_UNABLE_SET_LANGUAGE 15
@@ -61,32 +56,6 @@ class IXFA_WidgetIterator;
 #define XFA_IDS_NOT_HAVE_PROPERTY 70
 #define XFA_IDS_VIOLATE_BOUNDARY 72
 #define XFA_IDS_SERVER_DENY 73
-#define XFA_IDS_StringWeekDay_Sun 74
-#define XFA_IDS_StringWeekDay_Mon 75
-#define XFA_IDS_StringWeekDay_Tue 76
-#define XFA_IDS_StringWeekDay_Wed 77
-#define XFA_IDS_StringWeekDay_Thu 78
-#define XFA_IDS_StringWeekDay_Fri 79
-#define XFA_IDS_StringWeekDay_Sat 80
-#define XFA_IDS_StringMonth_Jan 81
-#define XFA_IDS_StringMonth_Feb 82
-#define XFA_IDS_StringMonth_March 83
-#define XFA_IDS_StringMonth_April 84
-#define XFA_IDS_StringMonth_May 85
-#define XFA_IDS_StringMonth_June 86
-#define XFA_IDS_StringMonth_July 87
-#define XFA_IDS_StringMonth_Aug 88
-#define XFA_IDS_StringMonth_Sept 89
-#define XFA_IDS_StringMonth_Oct 90
-#define XFA_IDS_StringMonth_Nov 91
-#define XFA_IDS_StringMonth_Dec 92
-#define XFA_IDS_String_Today 93
-#define XFA_IDS_ValidateLimit 94
-#define XFA_IDS_ValidateNullWarning 95
-#define XFA_IDS_ValidateNullError 96
-#define XFA_IDS_ValidateWarning 97
-#define XFA_IDS_ValidateError 98
-#define XFA_IDS_ValidateNumberError 99
 
 #define XFA_DOCVIEW_View 0x00000000
 #define XFA_DOCVIEW_MasterPage 0x00000001
@@ -180,17 +149,22 @@ class IXFA_AppProvider {
   /**
    * Returns the language of the running host application. Such as zh_CN
    */
-  virtual void GetLanguage(CFX_WideString& wsLanguage) = 0;
+  virtual CFX_WideString GetLanguage() = 0;
 
   /**
    * Returns the platform of the machine running the script. Such as WIN
    */
-  virtual void GetPlatform(CFX_WideString& wsPlatform) = 0;
+  virtual CFX_WideString GetPlatform() = 0;
 
   /**
    * Get application name, such as Phantom.
    */
-  virtual void GetAppName(CFX_WideString& wsName) = 0;
+  virtual CFX_WideString GetAppName() = 0;
+
+  /**
+   * Get application message box title.
+   */
+  virtual CFX_WideString GetAppTitle() const = 0;
 
   /**
    * Causes the system to play a sound.
@@ -268,7 +242,7 @@ class IXFA_AppProvider {
                              const CFX_WideString& wsData,
                              const CFX_WideString& wsEncode) = 0;
 
-  virtual void LoadString(int32_t iStringID, CFX_WideString& wsString) = 0;
+  virtual CFX_WideString LoadString(int32_t iStringID) = 0;
   virtual IFWL_AdapterTimerMgr* GetTimerMgr() = 0;
 };