| Index: core/src/fpdftext/text_int.h
|
| diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h
|
| index 59332e7d0790694d3c6cdc0a1eb5bb942d1b933f..b5a7734e54bf2db3506163bfb8d92594781889cd 100644
|
| --- a/core/src/fpdftext/text_int.h
|
| +++ b/core/src/fpdftext/text_int.h
|
| @@ -60,7 +60,7 @@ class CPDF_TextPage : public IPDF_TextPage {
|
| // IPDF_TextPage
|
| FX_BOOL ParseTextPage() override;
|
| void NormalizeObjects(FX_BOOL bNormalize) override;
|
| - bool IsParsed() const override { return m_IsParsered; }
|
| + bool IsParsed() const override { return m_bIsParsed; }
|
| int CharIndexFromTextIndex(int TextIndex) const override;
|
| int TextIndexFromCharIndex(int CharIndex) const override;
|
| int CountChars() const override;
|
| @@ -129,20 +129,18 @@ class CPDF_TextPage : public IPDF_TextPage {
|
| int32_t GetTextObjectWritingMode(const CPDF_TextObject* pTextObj);
|
| int32_t FindTextlineFlowDirection();
|
|
|
| - protected:
|
| CPDFText_ParseOptions m_ParseOptions;
|
| CFX_WordArray m_CharIndex;
|
| - const CPDF_PageObjects* m_pPage;
|
| + const CPDF_PageObjects* const m_pPage;
|
| PAGECHAR_InfoArray m_charList;
|
| CFX_WideTextBuf m_TextBuf;
|
| PAGECHAR_InfoArray m_TempCharList;
|
| CFX_WideTextBuf m_TempTextBuf;
|
| - int m_parserflag;
|
| + const int m_parserflag;
|
| CPDF_TextObject* m_pPreTextObj;
|
| CFX_AffineMatrix m_perMatrix;
|
| - FX_BOOL m_IsParsered;
|
| + bool m_bIsParsed;
|
| CFX_AffineMatrix m_DisplayMatrix;
|
| -
|
| SEGMENT_Array m_Segment;
|
| CFX_RectArray m_SelRects;
|
| LINEOBJ m_LineObj;
|
| @@ -152,7 +150,7 @@ class CPDF_TextPage : public IPDF_TextPage {
|
|
|
| class CPDF_TextPageFind : public IPDF_TextPageFind {
|
| public:
|
| - CPDF_TextPageFind(const IPDF_TextPage* pTextPage);
|
| + explicit CPDF_TextPageFind(const IPDF_TextPage* pTextPage);
|
| ~CPDF_TextPageFind() override {}
|
|
|
| // IPDF_TextPageFind
|
| @@ -220,10 +218,10 @@ class CPDF_LinkExtract : public IPDF_LinkExtract {
|
| void GetBoundedSegment(int index, int& start, int& count) const override;
|
| void GetRects(int index, CFX_RectArray& rects) const override;
|
|
|
| - FX_BOOL IsExtract() const { return m_IsParserd; }
|
| + FX_BOOL IsExtract() const { return m_bIsParsed; }
|
|
|
| protected:
|
| - void parserLink();
|
| + void ParseLink();
|
| void DeleteLinkList();
|
| FX_BOOL CheckWebLink(CFX_WideString& strBeCheck);
|
| FX_BOOL CheckMailLink(CFX_WideString& str);
|
| @@ -233,7 +231,7 @@ class CPDF_LinkExtract : public IPDF_LinkExtract {
|
| LINK_InfoArray m_LinkList;
|
| const CPDF_TextPage* m_pTextPage;
|
| CFX_WideString m_strPageText;
|
| - FX_BOOL m_IsParserd;
|
| + bool m_bIsParsed;
|
| };
|
|
|
| FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_WCHAR* pDst);
|
|
|