From 0e6438e40a95702edb8327286c8253aa269c9826 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 10 Jan 2017 16:35:58 -0500 Subject: Remove custom allocator from CFDE_TxtEdtBuf. This CL removes the custom allocator from CFDE_TxtEdtBuf and uses std::vector> instead. The Iterator code has been made an inner class of the buffer and rename to CFDE_TxtEdtBuf::Iterator instead of CFDE_TxtEdtBufIter. Change-Id: Ied8e844dea700e0ef37087f0d3fad4882d9eada1 Reviewed-on: https://pdfium-review.googlesource.com/2159 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- xfa/fde/cfde_txtedtparag.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'xfa/fde/cfde_txtedtparag.cpp') diff --git a/xfa/fde/cfde_txtedtparag.cpp b/xfa/fde/cfde_txtedtparag.cpp index 244add4e0a..f9f88bfb5d 100644 --- a/xfa/fde/cfde_txtedtparag.cpp +++ b/xfa/fde/cfde_txtedtparag.cpp @@ -9,7 +9,6 @@ #include #include "xfa/fde/cfde_txtedtbuf.h" -#include "xfa/fde/cfde_txtedtbufiter.h" #include "xfa/fde/cfde_txtedtengine.h" #include "xfa/fde/ifde_txtedtengine.h" #include "xfa/fde/ifx_chariter.h" @@ -41,8 +40,8 @@ void CFDE_TxtEdtParag::LoadParag() { if (pParam->dwMode & FDE_TEXTEDITMODE_Password) { wcAlias = m_pEngine->GetAliasChar(); } - std::unique_ptr pIter( - new CFDE_TxtEdtBufIter(static_cast(pTxtBuf), wcAlias)); + std::unique_ptr pIter(new CFDE_TxtEdtBuf::Iterator( + static_cast(pTxtBuf), wcAlias)); pIter->SetAt(m_nCharStart); int32_t nEndIndex = m_nCharStart + m_nCharCount; CFX_ArrayTemplate LineBaseArr; @@ -110,7 +109,7 @@ void CFDE_TxtEdtParag::CalcLines() { uint32_t dwBreakStatus = FX_TXTBREAK_None; int32_t nEndIndex = m_nCharStart + m_nCharCount; std::unique_ptr pIter( - new CFDE_TxtEdtBufIter(static_cast(pTxtBuf))); + new CFDE_TxtEdtBuf::Iterator(static_cast(pTxtBuf))); pIter->SetAt(m_nCharStart); bool bReload = false; do { -- cgit v1.2.3