diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-27 12:08:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-27 12:08:12 -0700 |
| commit | 8d2aae7ee320da3a8ffe01c57e38b3f98443257d (patch) | |
| tree | e694c6f82ec72fa46e6172b4475996b30d3f6a3a /core/src/fpdftext/txtproc.h | |
| parent | ff46aaf499edcf153ee2f57c7016587aa96dcfa0 (diff) | |
| download | pdfium-8d2aae7ee320da3a8ffe01c57e38b3f98443257d.tar.xz | |
Revert "FX Bool considered harmful, part 3"
This reverts commit ff46aaf499edcf153ee2f57c7016587aa96dcfa0.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1255293002 .
Diffstat (limited to 'core/src/fpdftext/txtproc.h')
| -rw-r--r-- | core/src/fpdftext/txtproc.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/src/fpdftext/txtproc.h b/core/src/fpdftext/txtproc.h index efe9ff9082..275aabd53b 100644 --- a/core/src/fpdftext/txtproc.h +++ b/core/src/fpdftext/txtproc.h @@ -33,8 +33,8 @@ public: ~CTextBaseLine(); void InsertTextBox(FX_FLOAT leftx, FX_FLOAT rightx, FX_FLOAT topy, FX_FLOAT bottomy, FX_FLOAT spacew, FX_FLOAT fontsize_v, const CFX_WideString& str); - bool GetWidth(FX_FLOAT& leftx, FX_FLOAT& rightx); - bool CanMerge(CTextBaseLine* pOther); + FX_BOOL GetWidth(FX_FLOAT& leftx, FX_FLOAT& rightx); + FX_BOOL CanMerge(CTextBaseLine* pOther); void Merge(CTextBaseLine* pOther); void MergeBoxes(); void CountChars(int& count, FX_FLOAT& width, int& minchars); @@ -57,9 +57,9 @@ public: FX_FLOAT rightx, FX_FLOAT topy, FX_FLOAT bottomy, FX_FLOAT spacew, FX_FLOAT fontsize_v, CFX_ByteString& str, CPDF_Font* pFont); void WriteOutput(CFX_WideStringArray& lines, int iMinWidth); - bool m_bAutoWidth; - bool m_bKeepColumn; - bool m_bBreakSpace; + FX_BOOL m_bAutoWidth; + FX_BOOL m_bKeepColumn; + FX_BOOL m_bBreakSpace; private: CFX_PtrArray m_BaseLines; |