From dd734def34bc31be370b168267ccba9705c7fc1b Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 11 Nov 2015 10:16:52 -0800 Subject: Merge to XFA: Cleanup CPDF_ApSettings and CJS_Parameters. TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1432863004 . (cherry picked from commit 56e3da27d8bed8a6c03274b7b946e3f6d6ac11f4) Review URL: https://codereview.chromium.org/1436843003 . --- fpdfsdk/src/javascript/Document.cpp | 11 +++++------ fpdfsdk/src/javascript/JS_Value.h | 8 +------- 2 files changed, 6 insertions(+), 13 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp index 43d2504150..a88c97c274 100644 --- a/fpdfsdk/src/javascript/Document.cpp +++ b/fpdfsdk/src/javascript/Document.cpp @@ -567,8 +567,7 @@ FX_BOOL Document::resetForm(IJS_Context* cc, CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc); CJS_Array aName(pRuntime); - // TODO(thestig) Convert CJS_Parameters to a std::vector and use .empty(). - if (params.size() <= 0) { + if (params.empty()) { pPDFForm->ResetForm(TRUE); m_pDocument->SetChangeMark(); return TRUE; @@ -1522,9 +1521,9 @@ FX_BOOL Document::getPageNthWord(IJS_Context* cc, if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS)) return FALSE; - int nPageNo = params.GetSize() > 0 ? params[0].ToInt() : 0; - int nWordNo = params.GetSize() > 1 ? params[1].ToInt() : 0; - bool bStrip = params.GetSize() > 2 ? params[2].ToBool() : true; + int nPageNo = params.size() > 0 ? params[0].ToInt() : 0; + int nWordNo = params.size() > 1 ? params[1].ToInt() : 0; + bool bStrip = params.size() > 2 ? params[2].ToBool() : true; CPDF_Document* pDocument = m_pDocument->GetDocument()->GetPDFDoc(); if (!pDocument) @@ -1596,7 +1595,7 @@ FX_BOOL Document::getPageNumWords(IJS_Context* cc, if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS)) return FALSE; - int nPageNo = params.GetSize() > 0 ? params[0].ToInt() : 0; + int nPageNo = params.size() > 0 ? params[0].ToInt() : 0; CPDF_Document* pDocument = m_pDocument->GetDocument()->GetPDFDoc(); ASSERT(pDocument != NULL); diff --git a/fpdfsdk/src/javascript/JS_Value.h b/fpdfsdk/src/javascript/JS_Value.h index b8c5563f70..68e643e055 100644 --- a/fpdfsdk/src/javascript/JS_Value.h +++ b/fpdfsdk/src/javascript/JS_Value.h @@ -88,13 +88,7 @@ class CJS_Value { CJS_Runtime* m_pJSRuntime; }; -class CJS_Parameters : public CFX_ArrayTemplate { - public: - void push_back(const CJS_Value& newElement) { - CFX_ArrayTemplate::Add(newElement); - } - int size() const { return CFX_ArrayTemplate::GetSize(); } -}; +using CJS_Parameters = std::vector; class CJS_PropValue : public CJS_Value { public: -- cgit v1.2.3