summaryrefslogtreecommitdiff
path: root/core/fpdftext/cpdf_textpage.h
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-03-13 16:43:37 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-03-14 14:14:51 +0000
commit812e96c2b4c5908a1979da5e27cdcecda0d1dfc9 (patch)
treef0b0607f6b757eb22237527215094bd87b5d03ba /core/fpdftext/cpdf_textpage.h
parent893822aa5b6254591f8e80fbffcbb4fa6ad849aa (diff)
downloadpdfium-812e96c2b4c5908a1979da5e27cdcecda0d1dfc9.tar.xz
Replace FX_CHAR and FX_WCHAR with underlying types.
Change-Id: I96e0a20d66b9184d22f64d8e4ce0dadd5a78c1e8 Reviewed-on: https://pdfium-review.googlesource.com/2967 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdftext/cpdf_textpage.h')
-rw-r--r--core/fpdftext/cpdf_textpage.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h
index 91942d1bec..e8de6205a2 100644
--- a/core/fpdftext/cpdf_textpage.h
+++ b/core/fpdftext/cpdf_textpage.h
@@ -49,8 +49,8 @@ class FPDF_CHAR_INFO {
FPDF_CHAR_INFO();
~FPDF_CHAR_INFO();
- FX_WCHAR m_Unicode;
- FX_WCHAR m_Charcode;
+ wchar_t m_Unicode;
+ wchar_t m_Charcode;
int32_t m_Flag;
FX_FLOAT m_FontSize;
CFX_PointF m_Origin;
@@ -72,7 +72,7 @@ class PAGECHAR_INFO {
int m_Index;
int m_CharCode;
- FX_WCHAR m_Unicode;
+ wchar_t m_Unicode;
int32_t m_Flag;
CFX_PointF m_Origin;
CFX_FloatRect m_CharBox;
@@ -125,7 +125,7 @@ class CPDF_TextPage {
Hyphen,
};
- bool IsHyphen(FX_WCHAR curChar);
+ bool IsHyphen(wchar_t curChar);
bool IsControlChar(const PAGECHAR_INFO& charInfo);
void ProcessObject();
void ProcessFormObject(CPDF_FormObject* pFormObj,
@@ -137,7 +137,7 @@ class CPDF_TextPage {
CPDF_PageObjectList::const_iterator ObjPos);
GenerateCharacter ProcessInsertObject(const CPDF_TextObject* pObj,
const CFX_Matrix& formMatrix);
- bool GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info);
+ bool GenerateCharInfo(wchar_t unicode, PAGECHAR_INFO& info);
bool IsSameAsPreTextObject(CPDF_TextObject* pTextObj,
const CPDF_PageObjectList* pObjList,
CPDF_PageObjectList::const_iterator ObjPos);
@@ -148,12 +148,12 @@ class CPDF_TextPage {
void ProcessMarkedContent(PDFTEXT_Obj pObj);
void CheckMarkedContentObject(int32_t& start, int32_t& nCount) const;
void FindPreviousTextObject();
- void AddCharInfoByLRDirection(FX_WCHAR wChar, PAGECHAR_INFO info);
- void AddCharInfoByRLDirection(FX_WCHAR wChar, PAGECHAR_INFO info);
+ void AddCharInfoByLRDirection(wchar_t wChar, PAGECHAR_INFO info);
+ void AddCharInfoByRLDirection(wchar_t wChar, PAGECHAR_INFO info);
TextOrientation GetTextObjectWritingMode(
const CPDF_TextObject* pTextObj) const;
TextOrientation FindTextlineFlowOrientation() const;
- void AppendGeneratedCharacter(FX_WCHAR unicode, const CFX_Matrix& formMatrix);
+ void AppendGeneratedCharacter(wchar_t unicode, const CFX_Matrix& formMatrix);
void SwapTempTextBuf(int32_t iCharListStartAppend, int32_t iBufStartAppend);
bool IsRightToLeft(const CPDF_TextObject* pTextObj,