Merge to XFA - else after returns.

core/src/fpdftext/text_int.h

Index: core/src/fpdftext/text_int.h
diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h
index a521c7c1f78b637db0da1d349c4197b92f59d41c..0acb688f6f358ec5f82da7d35860d27dea2d5cab 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);