diff options
| author | tsepez <tsepez@chromium.org> | 2016-11-02 15:17:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-02 15:17:30 -0700 |
| commit | 12f3e4a58f05850b93af35619cb04f0231d86acc (patch) | |
| tree | 9851d8e46e5c168f5d148864caa2eebf814529dd /core/fpdftext/cpdf_textpage.h | |
| parent | 3b3ce1a242f8445848d3f23d6c35ba01d7c645f4 (diff) | |
| download | pdfium-12f3e4a58f05850b93af35619cb04f0231d86acc.tar.xz | |
Remove FX_BOOL from core
Review-Url: https://codereview.chromium.org/2477443002
Diffstat (limited to 'core/fpdftext/cpdf_textpage.h')
| -rw-r--r-- | core/fpdftext/cpdf_textpage.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h index 99c2b5299b..aa1fc5bb03 100644 --- a/core/fpdftext/cpdf_textpage.h +++ b/core/fpdftext/cpdf_textpage.h @@ -107,8 +107,8 @@ class CPDF_TextPage { FX_FLOAT& right, FX_FLOAT& bottom) const; - static FX_BOOL IsRectIntersect(const CFX_FloatRect& rect1, - const CFX_FloatRect& rect2); + static bool IsRectIntersect(const CFX_FloatRect& rect1, + const CFX_FloatRect& rect2); private: enum class TextOrientation { @@ -124,7 +124,7 @@ class CPDF_TextPage { Hyphen, }; - FX_BOOL IsHyphen(FX_WCHAR curChar); + bool IsHyphen(FX_WCHAR curChar); bool IsControlChar(const PAGECHAR_INFO& charInfo); void ProcessObject(); void ProcessFormObject(CPDF_FormObject* pFormObj, @@ -136,12 +136,11 @@ class CPDF_TextPage { CPDF_PageObjectList::const_iterator ObjPos); GenerateCharacter ProcessInsertObject(const CPDF_TextObject* pObj, const CFX_Matrix& formMatrix); - FX_BOOL GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info); - FX_BOOL IsSameAsPreTextObject(CPDF_TextObject* pTextObj, - const CPDF_PageObjectList* pObjList, - CPDF_PageObjectList::const_iterator ObjPos); - FX_BOOL IsSameTextObject(CPDF_TextObject* pTextObj1, - CPDF_TextObject* pTextObj2); + bool GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info); + bool IsSameAsPreTextObject(CPDF_TextObject* pTextObj, + const CPDF_PageObjectList* pObjList, + CPDF_PageObjectList::const_iterator ObjPos); + bool IsSameTextObject(CPDF_TextObject* pTextObj1, CPDF_TextObject* pTextObj2); int GetCharWidth(uint32_t charCode, CPDF_Font* pFont) const; void CloseTempLine(); FPDFText_MarkedContent PreMarkedContent(PDFTEXT_Obj pObj); @@ -156,9 +155,9 @@ class CPDF_TextPage { void AppendGeneratedCharacter(FX_WCHAR unicode, const CFX_Matrix& formMatrix); void SwapTempTextBuf(int32_t iCharListStartAppend, int32_t iBufStartAppend); - FX_BOOL IsRightToLeft(const CPDF_TextObject* pTextObj, - const CPDF_Font* pFont, - int nItems) const; + bool IsRightToLeft(const CPDF_TextObject* pTextObj, + const CPDF_Font* pFont, + int nItems) const; const CPDF_Page* const m_pPage; std::vector<uint16_t> m_CharIndex; |