| Index: core/src/fpdfdoc/doc_vt.cpp
|
| diff --git a/core/src/fpdfdoc/doc_vt.cpp b/core/src/fpdfdoc/doc_vt.cpp
|
| index f3b9bbb4843a65aeccaeedadfaf053d2fe957da3..fd3f5bafd1d1c461b4b32cff6c2ea48003f0fdbd 100644
|
| --- a/core/src/fpdfdoc/doc_vt.cpp
|
| +++ b/core/src/fpdfdoc/doc_vt.cpp
|
| @@ -317,7 +317,7 @@ void CSection::ClearWord(const CPVT_WordPlace & place)
|
| delete m_WordArray.GetAt(place.nWordIndex);
|
| m_WordArray.RemoveAt(place.nWordIndex);
|
| }
|
| -CTypeset::CTypeset(CSection * pSection) : m_pSection(pSection), m_pVT(pSection->m_pVT), m_rcRet(0.0f, 0.0f, 0.0f, 0.0f)
|
| +CTypeset::CTypeset(CSection * pSection) : m_rcRet(0.0f, 0.0f, 0.0f, 0.0f), m_pVT(pSection->m_pVT), m_pSection(pSection)
|
| {
|
| }
|
| CTypeset::~CTypeset()
|
| @@ -804,21 +804,21 @@ void CTypeset::OutputLines()
|
| m_rcRet = CPVT_FloatRect(fMinX, fMinY, fMaxX, fMaxY);
|
| }
|
| CPDF_VariableText::CPDF_VariableText() :
|
| - m_pVTProvider(NULL),
|
| - m_pVTIterator(NULL),
|
| - m_bInitial(FALSE),
|
| - m_bRichText(FALSE),
|
| + m_nLimitChar(0),
|
| + m_nCharArray(0),
|
| m_bMultiLine(FALSE),
|
| m_bLimitWidth(FALSE),
|
| m_bAutoFontSize(FALSE),
|
| - m_nLimitChar(0),
|
| - m_nCharArray(0),
|
| m_nAlignment(0),
|
| + m_fLineLeading(0.0f),
|
| m_fCharSpace(0.0f),
|
| - m_fFontSize(0.0f),
|
| m_nHorzScale(100),
|
| m_wSubWord(0),
|
| - m_fLineLeading(0.0f)
|
| + m_fFontSize(0.0f),
|
| + m_bInitial(FALSE),
|
| + m_bRichText(FALSE),
|
| + m_pVTProvider(NULL),
|
| + m_pVTIterator(NULL)
|
| {
|
| }
|
| CPDF_VariableText::~CPDF_VariableText()
|
| @@ -1687,8 +1687,8 @@ IPDF_VariableText_Provider* CPDF_VariableText::SetProvider(IPDF_VariableText_Pro
|
| return pOld;
|
| }
|
| CPDF_VariableText_Iterator::CPDF_VariableText_Iterator(CPDF_VariableText * pVT):
|
| - m_pVT(pVT),
|
| - m_CurPos(-1, -1, -1)
|
| + m_CurPos(-1, -1, -1),
|
| + m_pVT(pVT)
|
| {
|
| }
|
| CPDF_VariableText_Iterator::~CPDF_VariableText_Iterator()
|
|
|