diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-07-27 11:55:29 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-07-27 11:55:29 -0700 |
commit | ff46aaf499edcf153ee2f57c7016587aa96dcfa0 (patch) | |
tree | 0a0d92713af476897899b126d180cc6294433d10 /core/include/fpdftext | |
parent | aafeff816e22c1333c17d8a0eb4fe8927c28142d (diff) | |
download | pdfium-ff46aaf499edcf153ee2f57c7016587aa96dcfa0.tar.xz |
FX Bool considered harmful, part 3
Try to reland this patch after fixing underlying issues that
caused it to be reverted.
fx_system.h is the only manual edit.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1258093002 .
Diffstat (limited to 'core/include/fpdftext')
-rw-r--r-- | core/include/fpdftext/fpdf_text.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/core/include/fpdftext/fpdf_text.h b/core/include/fpdftext/fpdf_text.h index 04922c4b7f..8b54f2d325 100644 --- a/core/include/fpdftext/fpdf_text.h +++ b/core/include/fpdftext/fpdf_text.h @@ -61,9 +61,9 @@ class CPDFText_ParseOptions public: CPDFText_ParseOptions(); - FX_BOOL m_bGetCharCodeOnly; - FX_BOOL m_bNormalizeObjs; - FX_BOOL m_bOutputHyphen; + bool m_bGetCharCodeOnly; + bool m_bNormalizeObjs; + bool m_bOutputHyphen; }; class IPDF_TextPage { @@ -75,12 +75,12 @@ public: static IPDF_TextPage* CreateTextPage(const CPDF_PageObjects* pObjs, int flags = 0); static IPDF_TextPage* CreateReflowTextPage(IPDF_ReflowedPage* pRefPage); - virtual void NormalizeObjects(FX_BOOL bNormalize) = 0; + virtual void NormalizeObjects(bool bNormalize) = 0; - virtual FX_BOOL ParseTextPage() = 0; + virtual bool ParseTextPage() = 0; - virtual FX_BOOL IsParsered() const = 0; + virtual bool IsParsered() const = 0; public: virtual int CharIndexFromTextIndex(int TextIndex) const = 0; @@ -109,11 +109,11 @@ public: virtual void GetRect(int rectIndex, FX_FLOAT& left, FX_FLOAT& top, FX_FLOAT& right, FX_FLOAT &bottom) const = 0; - virtual FX_BOOL GetBaselineRotate(int rectIndex, int& Rotate) = 0; + virtual bool GetBaselineRotate(int rectIndex, int& Rotate) = 0; - virtual FX_BOOL GetBaselineRotate(const CFX_FloatRect& rect, int& Rotate) = 0; + virtual bool GetBaselineRotate(const CFX_FloatRect& rect, int& Rotate) = 0; - virtual int CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT right, FX_FLOAT bottom, FX_BOOL bContains = FALSE) = 0; + virtual int CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT right, FX_FLOAT bottom, bool bContains = false) = 0; virtual void GetBoundedSegment(int index, int& start, int& count) const = 0; @@ -134,11 +134,11 @@ public: static IPDF_TextPageFind* CreatePageFind(const IPDF_TextPage* pTextPage); public: - virtual FX_BOOL FindFirst(const CFX_WideString& findwhat, int flags, int startPos = 0) = 0; + virtual bool FindFirst(const CFX_WideString& findwhat, int flags, int startPos = 0) = 0; - virtual FX_BOOL FindNext() = 0; + virtual bool FindNext() = 0; - virtual FX_BOOL FindPrev() = 0; + virtual bool FindPrev() = 0; virtual void GetRectArray(CFX_RectArray& rects) const = 0; @@ -154,7 +154,7 @@ public: static IPDF_LinkExtract* CreateLinkExtract(); - virtual FX_BOOL ExtractLinks(const IPDF_TextPage* pTextPage) = 0; + virtual bool ExtractLinks(const IPDF_TextPage* pTextPage) = 0; public: virtual int CountLinks() const = 0; |