From 46c8b1e3202ab5ae3663141dc25bec3b4360322e Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 25 Mar 2016 13:42:34 -0700 Subject: Replace CFX_DWordArray with CFX_ArrayTemplate. First step to getting rid of FX_DWORD. R=ochang@chromium.org Review URL: https://codereview.chromium.org/1832113003 . --- fpdfsdk/javascript/Field.cpp | 6 +++--- fpdfsdk/javascript/Field.h | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/javascript') diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp index 198c833db5..814d2e86fa 100644 --- a/fpdfsdk/javascript/Field.cpp +++ b/fpdfsdk/javascript/Field.cpp @@ -947,7 +947,7 @@ FX_BOOL Field::currentValueIndices(IJS_Context* cc, if (!m_bCanSet) return FALSE; - CFX_DWordArray array; + CFX_ArrayTemplate array; if (vp.GetType() == CJS_Value::VT_number) { int iSelecting = 0; @@ -1002,7 +1002,7 @@ FX_BOOL Field::currentValueIndices(IJS_Context* cc, void Field::SetCurrentValueIndices(CPDFSDK_Document* pDocument, const CFX_WideString& swFieldName, int nControlIndex, - const CFX_DWordArray& array) { + const CFX_ArrayTemplate& array) { ASSERT(pDocument); std::vector FieldArray = @@ -3428,7 +3428,7 @@ void Field::AddDelay_Color(enum FIELD_PROP prop, const CPWL_Color& color) { } void Field::AddDelay_WordArray(enum FIELD_PROP prop, - const CFX_DWordArray& array) { + const CFX_ArrayTemplate& array) { CJS_DelayData* pNewData = new CJS_DelayData; pNewData->sFieldName = m_FieldName; pNewData->nControlIndex = m_nFormControlIndex; diff --git a/fpdfsdk/javascript/Field.h b/fpdfsdk/javascript/Field.h index 5e80f72d58..c3045632df 100644 --- a/fpdfsdk/javascript/Field.h +++ b/fpdfsdk/javascript/Field.h @@ -84,7 +84,7 @@ struct CJS_DelayData { CFX_WideString widestring; CFX_FloatRect rect; CPWL_Color color; - CFX_DWordArray wordarray; + CFX_ArrayTemplate wordarray; CJS_WideStringArray widestringarray; }; @@ -344,7 +344,7 @@ class Field : public CJS_EmbedObj { static void SetCurrentValueIndices(CPDFSDK_Document* pDocument, const CFX_WideString& swFieldName, int nControlIndex, - const CFX_DWordArray& array); + const CFX_ArrayTemplate& array); static void SetDefaultStyle(CPDFSDK_Document* pDocument, const CFX_WideString& swFieldName, int nControlIndex); @@ -476,7 +476,8 @@ class Field : public CJS_EmbedObj { void AddDelay_WideString(enum FIELD_PROP prop, const CFX_WideString& string); void AddDelay_Rect(enum FIELD_PROP prop, const CFX_FloatRect& rect); void AddDelay_Color(enum FIELD_PROP prop, const CPWL_Color& color); - void AddDelay_WordArray(enum FIELD_PROP prop, const CFX_DWordArray& array); + void AddDelay_WordArray(enum FIELD_PROP prop, + const CFX_ArrayTemplate& array); void AddDelay_WideStringArray(enum FIELD_PROP prop, const CJS_WideStringArray& array); -- cgit v1.2.3