From 7a1220dc1c0051f2a6bf50f3f38419ae51ecb9a1 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 17 Mar 2017 14:17:25 -0700 Subject: Replace CLines class with std::vector. m_LineArray only grows via push_back of non-null pointer, so remove some null checks. Another little idiosyncrasy is CLines::Clear() doesn't clear the items in CLines, only the things that were once in CLines but aren't anymore. So don't call it. Change-Id: Icc434be94b1b0522533c7533b8f6b2736bb864c4 Reviewed-on: https://pdfium-review.googlesource.com/3099 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fpdfdoc/csection.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'core/fpdfdoc/csection.h') diff --git a/core/fpdfdoc/csection.h b/core/fpdfdoc/csection.h index b82409dc6f..6907b3dc45 100644 --- a/core/fpdfdoc/csection.h +++ b/core/fpdfdoc/csection.h @@ -7,7 +7,10 @@ #ifndef CORE_FPDFDOC_CSECTION_H_ #define CORE_FPDFDOC_CSECTION_H_ -#include "core/fpdfdoc/clines.h" +#include +#include + +#include "core/fpdfdoc/cline.h" #include "core/fpdfdoc/cpvt_sectioninfo.h" #include "core/fpdfdoc/ctypeset.h" #include "core/fxcrt/fx_coordinates.h" @@ -46,7 +49,7 @@ class CSection final { CPVT_WordPlace SecPlace; CPVT_SectionInfo m_SecInfo; - CLines m_LineArray; + std::vector> m_LineArray; CPVT_ArrayTemplate m_WordArray; private: -- cgit v1.2.3