diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-23 14:42:09 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-23 14:42:09 -0700 |
| commit | 2f2ffece124e4ed4b96d2846263015d4b5ad6c00 (patch) | |
| tree | 6966e44279e8d9e1516b7c71219cf66f77a89ca2 /core/src/fpdftext/text_int.h | |
| parent | d07958fd2d1c4134d865f4ccb056eb925aaa7d2a (diff) | |
| download | pdfium-2f2ffece124e4ed4b96d2846263015d4b5ad6c00.tar.xz | |
Merge to XFA - else after returns.
(cherry picked from commit 3c012fef2bb72c8ec1faa73e11ee35539b2559d6)
Original Review URL: https://codereview.chromium.org/1243953004 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1239313005 .
Diffstat (limited to 'core/src/fpdftext/text_int.h')
| -rw-r--r-- | core/src/fpdftext/text_int.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h index a521c7c1f7..0acb688f6f 100644 --- a/core/src/fpdftext/text_int.h +++ b/core/src/fpdftext/text_int.h @@ -66,7 +66,6 @@ public: FX_FLOAT yTorelance) const; virtual CFX_WideString GetTextByRect(const CFX_FloatRect& rect) const; virtual void GetRectsArrayByRect(const CFX_FloatRect& rect, CFX_RectArray& resRectArray) const; - virtual int GetOrderByDirection(int order, int direction) const; virtual CFX_WideString GetPageText(int start = 0, int nCount = -1) const; virtual int CountRects(int start, int nCount); @@ -87,7 +86,7 @@ public: static FX_BOOL IsLetter(FX_WCHAR unicode); private: FX_BOOL IsHyphen(FX_WCHAR curChar); - FX_BOOL IsControlChar(PAGECHAR_INFO* pCharInfo); + bool IsControlChar(const PAGECHAR_INFO& charInfo); FX_BOOL GetBaselineRotate(int start, int end, int& Rotate); void ProcessObject(); void ProcessFormObject(CPDF_FormObject* pFormObj, const CFX_AffineMatrix& formMatrix); |