From 5c500acc3380d96db0ab5e2e6c2bc448644992de Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Mon, 27 Mar 2017 12:44:20 -0700
Subject: Return arrays where appropriate in fxfa.

Also, remove some default method arguments along the way.
Change-Id: Ifbd157499881ed6a3777f3903dd7f0193753cf59
Reviewed-on: https://pdfium-review.googlesource.com/3219
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
---
 xfa/fxfa/parser/cxfa_widgetdata.h | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'xfa/fxfa/parser/cxfa_widgetdata.h')

diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h
index 3e74018432..1caecea2b2 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.h
+++ b/xfa/fxfa/parser/cxfa_widgetdata.h
@@ -93,23 +93,22 @@ class CXFA_WidgetData : public CXFA_Data {
   bool IsChoiceListAllowTextEntry();
   int32_t GetChoiceListOpen();
   bool IsListBox();
-  int32_t CountChoiceListItems(bool bSaveValue = false);
+  int32_t CountChoiceListItems(bool bSaveValue);
   bool GetChoiceListItem(CFX_WideString& wsText,
                          int32_t nIndex,
-                         bool bSaveValue = false);
-  void GetChoiceListItems(std::vector<CFX_WideString>& wsTextArray,
-                          bool bSaveValue = false);
+                         bool bSaveValue);
+  std::vector<CFX_WideString> GetChoiceListItems(bool bSaveValue);
   int32_t CountSelectedItems();
   int32_t GetSelectedItem(int32_t nIndex = 0);
-  void GetSelectedItems(CFX_ArrayTemplate<int32_t>& iSelArray);
-  void GetSelectedItemsValue(std::vector<CFX_WideString>& wsSelTextArray);
+  std::vector<int32_t> GetSelectedItems();
+  std::vector<CFX_WideString> GetSelectedItemsValue();
   bool GetItemState(int32_t nIndex);
   void SetItemState(int32_t nIndex,
                     bool bSelected,
                     bool bNotify,
                     bool bScriptModify,
                     bool bSyncData);
-  void SetSelectedItems(CFX_ArrayTemplate<int32_t>& iSelArray,
+  void SetSelectedItems(const std::vector<int32_t>& iSelArray,
                         bool bNotify,
                         bool bScriptModify,
                         bool bSyncData);
-- 
cgit v1.2.3