diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-03-20 16:06:15 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-21 17:48:55 +0000 |
| commit | 32b94557c605f02fa969bc84b3c9b6f5277c258e (patch) | |
| tree | b65104b4702085f3b37f1a89b07a0456600d0750 /core/fpdfdoc/cpdf_variabletext.h | |
| parent | 9c045de6cf02f7dbd0634af566396ba9352b2830 (diff) | |
| download | pdfium-32b94557c605f02fa969bc84b3c9b6f5277c258e.tar.xz | |
Replace CPVT_ArrayTemplate in cpdf_variabletext.cpp and remove it.chromium/3048
Change-Id: I4354a841d6e2d4f30ccb298d13dffa49b9f3a3b3
Reviewed-on: https://pdfium-review.googlesource.com/3131
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfdoc/cpdf_variabletext.h')
| -rw-r--r-- | core/fpdfdoc/cpdf_variabletext.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/fpdfdoc/cpdf_variabletext.h b/core/fpdfdoc/cpdf_variabletext.h index 59fe12402a..2e6caf63d6 100644 --- a/core/fpdfdoc/cpdf_variabletext.h +++ b/core/fpdfdoc/cpdf_variabletext.h @@ -8,8 +8,8 @@ #define CORE_FPDFDOC_CPDF_VARIABLETEXT_H_ #include <memory> +#include <vector> -#include "core/fpdfdoc/cpvt_arraytemplate.h" #include "core/fpdfdoc/cpvt_floatrect.h" #include "core/fpdfdoc/cpvt_line.h" #include "core/fpdfdoc/cpvt_lineinfo.h" @@ -101,7 +101,7 @@ class CPDF_VariableText { void SetAutoFontSize(bool bAuto) { m_bAutoFontSize = bAuto; } void Initialize(); - bool IsValid() const { return m_bInitial; } + bool IsValid() const { return m_bInitialized; } void RearrangeAll(); void RearrangePart(const CPVT_WordRange& PlaceRange); @@ -219,9 +219,7 @@ class CPDF_VariableText { bool IsBigger(float fFontSize) const; CPVT_FloatRect RearrangeSections(const CPVT_WordRange& PlaceRange); - void ResetSectionArray(); - - CPVT_ArrayTemplate<CSection*> m_SectionArray; + std::vector<std::unique_ptr<CSection>> m_SectionArray; int32_t m_nLimitChar; int32_t m_nCharArray; bool m_bMultiLine; @@ -233,7 +231,7 @@ class CPDF_VariableText { int32_t m_nHorzScale; uint16_t m_wSubWord; float m_fFontSize; - bool m_bInitial; + bool m_bInitialized; CPDF_VariableText::Provider* m_pVTProvider; std::unique_ptr<CPDF_VariableText::Iterator> m_pVTIterator; CFX_FloatRect m_rcPlate; |