Merge to XFA - else after returns.

core/src/fpdftext/text_int.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_SRC_FPDFTEXT_TEXT_INT_H_
 #define CORE_SRC_FPDFTEXT_TEXT_INT_H_
 
 class CPDF_TextPage;
@@ skipping 48 matching lines @@
     virtual int CharIndexFromTextIndex(int TextIndex)const ;
     virtual int TextIndexFromCharIndex(int CharIndex)const;
     virtual int                                         CountChars() const;
     virtual     void                                    GetCharInfo(int index, FPDF_CHAR_INFO & info) const;
     virtual void                                        GetRectArray(int start, int nCount, CFX_RectArray& rectArray) const;
     virtual int                                         GetIndexAtPos(CPDF_Point point, FX_FLOAT xTorelance, FX_FLOAT yTorelance) const;
     virtual int                                         GetIndexAtPos(FX_FLOAT x, FX_FLOAT y, FX_FLOAT xTorelance,
             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);
     virtual     void                                    GetRect(int rectIndex, FX_FLOAT& left, FX_FLOAT& top
                                             , FX_FLOAT& right, FX_FLOAT &bottom) const;
     virtual FX_BOOL                                     GetBaselineRotate(int rectIndex, int& Rotate);
     virtual FX_BOOL                                     GetBaselineRotate(const CFX_FloatRect& rect, int& Rotate);
     virtual     int                                             CountBoundedSegments(FX_FLOAT left, FX_FLOAT top,
             FX_FLOAT right, FX_FLOAT bottom, FX_BOOL bContains = FALSE);
     virtual     void                                    GetBoundedSegment(int index, int& start, int& count) const;
     virtual int                                         GetWordBreak(int index, int direction) const;
 public:
     const       PAGECHAR_InfoArray*             GetCharList() const
     {
         return &m_charList;
     }
     static      FX_BOOL                                 IsRectIntersect(const CFX_FloatRect& rect1, const CFX_FloatRect& rect2);
     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);
     void                                                        ProcessTextObject(PDFTEXT_Obj pObj);
     void                                                        ProcessTextObject(CPDF_TextObject*      pTextObj, const CFX_AffineMatrix& formMatrix, FX_POSITION ObjPos);
     int                                                         ProcessInsertObject(const CPDF_TextObject* pObj, const CFX_AffineMatrix& formMatrix);
     FX_BOOL                                                     GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info);
     FX_BOOL                                                     IsSameAsPreTextObject(CPDF_TextObject* pTextObj, FX_POSITION ObjPos);
     FX_BOOL                                                     IsSameTextObject(CPDF_TextObject* pTextObj1, CPDF_TextObject* pTextObj2);
     int                                                         GetCharWidth(FX_DWORD charCode, CPDF_Font* pFont) const;
@@ skipping 99 matching lines @@
     LINK_InfoArray                                      m_LinkList;
     const CPDF_TextPage*                        m_pTextPage;
     CFX_WideString                                      m_strPageText;
     FX_BOOL                                                     m_IsParserd;
 };
 FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_WCHAR* pDst);
 void NormalizeString(CFX_WideString& str);
 void NormalizeCompositeChar(FX_WCHAR wChar, CFX_WideString& sDest);
 
 #endif  // CORE_SRC_FPDFTEXT_TEXT_INT_H_