1 files changed, 22 insertions, 21 deletions
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h
index c38ea3502a..f53d926655 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.h
+++ b/xfa/fxfa/parser/cxfa_widgetdata.h
@@ -46,28 +46,30 @@ class CXFA_WidgetData : public CXFA_Data {
   CXFA_Node* GetUIChild();
   XFA_Element GetUIType();
   CFX_WideString GetRawValue();
-  int32_t GetAccess(bool bTemplate = false);
+  int32_t GetAccess();
   int32_t GetRotate();
-  CXFA_Border GetBorder(bool bModified = false);
-  CXFA_Caption GetCaption(bool bModified = false);
-  CXFA_Font GetFont(bool bModified = false);
-  CXFA_Margin GetMargin(bool bModified = false);
-  CXFA_Para GetPara(bool bModified = false);
+
+  CXFA_Assist GetAssist();
+  CXFA_Border GetBorder(bool bModified);
+  CXFA_Caption GetCaption();
+  CXFA_Font GetFont(bool bModified);
+  CXFA_Margin GetMargin();
+  CXFA_Para GetPara();
   std::vector<CXFA_Node*> GetEventList();
   std::vector<CXFA_Node*> GetEventByActivity(int32_t iActivity,
-                                             bool bIsFormReady = false);
-  CXFA_Value GetDefaultValue(bool bModified = false);
-  CXFA_Value GetFormValue(bool bModified = false);
-  CXFA_Calculate GetCalculate(bool bModified = false);
-  CXFA_Validate GetValidate(bool bModified = false);
-  CXFA_Bind GetBind(bool bModified = false);
-  CXFA_Assist GetAssist(bool bModified = false);
+                                             bool bIsFormReady);
+  CXFA_Value GetDefaultValue();
+  CXFA_Value GetFormValue();
+  CXFA_Calculate GetCalculate();
+  CXFA_Validate GetValidate(bool bModified);
+
   bool GetWidth(float& fWidth);
   bool GetHeight(float& fHeight);
   bool GetMinWidth(float& fMinWidth);
   bool GetMinHeight(float& fMinHeight);
   bool GetMaxWidth(float& fMaxWidth);
   bool GetMaxHeight(float& fMaxHeight);
+
   CXFA_Border GetUIBorder();
   CFX_RectF GetUIMargin();
   int32_t GetButtonHighlight();
@@ -99,7 +101,7 @@ class CXFA_WidgetData : public CXFA_Data {
                          bool bSaveValue);
   std::vector<CFX_WideString> GetChoiceListItems(bool bSaveValue);
   int32_t CountSelectedItems();
-  int32_t GetSelectedItem(int32_t nIndex = 0);
+  int32_t GetSelectedItem(int32_t nIndex);
   std::vector<int32_t> GetSelectedItems();
   std::vector<CFX_WideString> GetSelectedItemsValue();
   bool GetItemState(int32_t nIndex);
@@ -115,14 +117,10 @@ class CXFA_WidgetData : public CXFA_Data {
   void ClearAllSelections();
   void InsertItem(const CFX_WideString& wsLabel,
                   const CFX_WideString& wsValue,
-                  int32_t nIndex = -1,
-                  bool bNotify = false);
+                  bool bNotify);
   void GetItemLabel(const CFX_WideStringC& wsValue, CFX_WideString& wsLabel);
   void GetItemValue(const CFX_WideStringC& wsLabel, CFX_WideString& wsValue);
-  bool DeleteItem(int32_t nIndex,
-                  bool bNotify = false,
-                  bool bScriptModify = false,
-                  bool bSyncData = true);
+  bool DeleteItem(int32_t nIndex, bool bNotify, bool bScriptModify);
   int32_t GetHorizontalScrollPolicy();
   int32_t GetNumberOfCells();
   bool SetValue(const CFX_WideString& wsValue, XFA_VALUEPICTURE eValueType);
@@ -134,6 +132,7 @@ class CXFA_WidgetData : public CXFA_Data {
   bool GetFormatDataValue(const CFX_WideString& wsValue,
                           CFX_WideString& wsFormattedValue);
   void NormalizeNumStr(const CFX_WideString& wsValue, CFX_WideString& wsOutput);
+
   CFX_WideString GetBarcodeType();
   bool GetBarcodeAttribute_CharEncoding(int32_t* val);
   bool GetBarcodeAttribute_Checksum(bool* val);
@@ -148,6 +147,7 @@ class CXFA_WidgetData : public CXFA_Data {
   bool GetBarcodeAttribute_Truncate(bool* val);
   bool GetBarcodeAttribute_WideNarrowRatio(float* val);
   void GetPasswordChar(CFX_WideString& wsPassWord);
+
   bool IsMultiLine();
   int32_t GetVerticalScrollPolicy();
   int32_t GetMaxChars(XFA_Element& eType);
@@ -162,10 +162,11 @@ class CXFA_WidgetData : public CXFA_Data {
   bool m_bPreNull;
 
  private:
+  CXFA_Bind GetBind();
   void SyncValue(const CFX_WideString& wsValue, bool bNotify);
   void InsertListTextItem(CXFA_Node* pItems,
                           const CFX_WideString& wsText,
-                          int32_t nIndex = -1);
+                          int32_t nIndex);
   void FormatNumStr(const CFX_WideString& wsValue,
                     IFX_Locale* pLocale,
                     CFX_WideString& wsOutput);