From 6745f96fab41e2b46f57a3717b034a4064c0de02 Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 4 Jan 2017 10:09:45 -0800 Subject: Remove CFX_ArrayTemplate, use unique_ptr in fpdfsdk/pdfwindow Review-Url: https://codereview.chromium.org/2594153003 --- fpdfsdk/pdfwindow/PWL_Edit.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/pdfwindow/PWL_Edit.cpp') diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp index 153e9ab4b7..bb8ec9115d 100644 --- a/fpdfsdk/pdfwindow/PWL_Edit.cpp +++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp @@ -875,10 +875,9 @@ CPVT_WordRange CPWL_Edit::GetSameWordsRange(const CPVT_WordPlace& place, return range; } -void CPWL_Edit::GeneratePageObjects( - CPDF_PageObjectHolder* pObjectHolder, - const CFX_FloatPoint& ptOffset, - CFX_ArrayTemplate& ObjArray) { +void CPWL_Edit::GeneratePageObjects(CPDF_PageObjectHolder* pObjectHolder, + const CFX_FloatPoint& ptOffset, + std::vector* ObjArray) { CFX_Edit::GeneratePageObjects( pObjectHolder, m_pEdit.get(), ptOffset, nullptr, CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()), @@ -887,9 +886,9 @@ void CPWL_Edit::GeneratePageObjects( void CPWL_Edit::GeneratePageObjects(CPDF_PageObjectHolder* pObjectHolder, const CFX_FloatPoint& ptOffset) { - CFX_ArrayTemplate ObjArray; + std::vector ObjArray; CFX_Edit::GeneratePageObjects( pObjectHolder, m_pEdit.get(), ptOffset, nullptr, CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()), - ObjArray); + &ObjArray); } -- cgit v1.2.3