From 82aa396188ec26f22fe730f4e35b5a54ebffb5dc Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 20 Jan 2017 12:59:50 -0800 Subject: Replace CFX_ByteArray with CFX_ArrayTemplate Also replace CFX_Int32Array typedef with CFX_ArrayTemplate. Removing the typedefs makes subsequent conversion to std::vector<> easier on a case-by-case basis. Review-Url: https://codereview.chromium.org/2649563003 --- xfa/fxfa/parser/cxfa_widgetdata.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_widgetdata.cpp') diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index 80c50b781e..31c5cf48e6 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -874,7 +874,7 @@ int32_t CXFA_WidgetData::GetSelectedItem(int32_t nIndex) { return -1; } -void CXFA_WidgetData::GetSelectedItems(CFX_Int32Array& iSelArray) { +void CXFA_WidgetData::GetSelectedItems(CFX_ArrayTemplate& iSelArray) { std::vector wsValueArray; GetSelectedItemsValue(wsValueArray); int32_t iValues = pdfium::CollectionSize(wsValueArray); @@ -973,7 +973,7 @@ void CXFA_WidgetData::SetItemState(int32_t nIndex, bSyncData); } } else if (iSel >= 0) { - CFX_Int32Array iSelArray; + CFX_ArrayTemplate iSelArray; GetSelectedItems(iSelArray); for (int32_t i = 0; i < iSelArray.GetSize(); i++) { if (iSelArray[i] == nIndex) { @@ -999,7 +999,7 @@ void CXFA_WidgetData::SetItemState(int32_t nIndex, } } -void CXFA_WidgetData::SetSelectedItems(CFX_Int32Array& iSelArray, +void CXFA_WidgetData::SetSelectedItems(CFX_ArrayTemplate& iSelArray, bool bNotify, bool bScriptModify, bool bSyncData) { -- cgit v1.2.3