Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(177)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: core/src/fpdftext/fpdf_text_int.cpp

Issue 1252613002: FX_BOOL considered harmful. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Manual edits. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/src/fpdftext/fpdf_text.cpp ('k') | core/src/fpdftext/fpdf_text_search.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/src/fpdftext/fpdf_text_int.cpp
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp
index 6755939ca2a8f7877d1038a3776434e238c3abb0..c12cba77b3782d7526d2558d770b45a3d73501b8 100644
--- a/core/src/fpdftext/fpdf_text_int.cpp
+++ b/core/src/fpdftext/fpdf_text_int.cpp
@@ -19,10 +19,10 @@
namespace {
-FX_BOOL _IsIgnoreSpaceCharacter(FX_WCHAR curChar)
+bool _IsIgnoreSpaceCharacter(FX_WCHAR curChar)
{
if(curChar < 255 ) {
- return FALSE;
+ return false;
}
if ( (curChar >= 0x0600 && curChar <= 0x06FF)
|| (curChar >= 0xFE70 && curChar <= 0xFEFF)
@@ -33,9 +33,9 @@ FX_BOOL _IsIgnoreSpaceCharacter(FX_WCHAR curChar)
|| (curChar >= 0x2DE0 && curChar <= 0x2DFF)
|| curChar == 8467
|| (curChar >= 0x2000 && curChar <= 0x206F)) {
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
FX_FLOAT _NormalizeThreshold(FX_FLOAT threshold)
@@ -56,7 +56,7 @@ FX_FLOAT _CalculateBaseSpace(const CPDF_TextObject* pTextObj,
FX_FLOAT baseSpace = 0.0;
const int nItems = pTextObj->CountItems();
if (pTextObj->m_TextState.GetObject()->m_CharSpace && nItems >= 3) {
- FX_BOOL bAllChar = TRUE;
+ bool bAllChar = true;
FX_FLOAT spacing = matrix.TransformDistance(
pTextObj->m_TextState.GetObject()->m_CharSpace);
baseSpace = spacing;
@@ -67,7 +67,7 @@ FX_FLOAT _CalculateBaseSpace(const CPDF_TextObject* pTextObj,
FX_FLOAT fontsize_h = pTextObj->m_TextState.GetFontSizeH();
FX_FLOAT kerning = -fontsize_h * item.m_OriginX / 1000;
baseSpace = std::min(baseSpace, kerning + spacing);
- bAllChar = FALSE;
+ bAllChar = false;
}
}
if (baseSpace < 0.0 || (nItems == 3 && !bAllChar)) {
@@ -80,7 +80,7 @@ FX_FLOAT _CalculateBaseSpace(const CPDF_TextObject* pTextObj,
} // namespace
CPDFText_ParseOptions::CPDFText_ParseOptions()
- : m_bGetCharCodeOnly(FALSE), m_bNormalizeObjs(TRUE), m_bOutputHyphen(FALSE)
+ : m_bGetCharCodeOnly(false), m_bNormalizeObjs(true), m_bOutputHyphen(false)
{
}
IPDF_TextPage* IPDF_TextPage::CreateTextPage(const CPDF_Page* pPage, CPDFText_ParseOptions ParserOptions)
@@ -118,7 +118,7 @@ CPDF_TextPage::CPDF_TextPage(const CPDF_Page* pPage, int flags)
: m_charList(512),
m_TempCharList(50),
m_pPreTextObj(NULL),
- m_IsParsered(FALSE),
+ m_IsParsered(false),
m_TextlineDir(-1),
m_CurlineRect(0, 0, 0, 0)
{
@@ -132,7 +132,7 @@ CPDF_TextPage::CPDF_TextPage(const CPDF_Page* pPage, CPDFText_ParseOptions Parse
, m_charList(512)
, m_TempCharList(50)
, m_pPreTextObj(NULL)
- , m_IsParsered(FALSE)
+ , m_IsParsered(false)
, m_TextlineDir(-1)
, m_CurlineRect(0, 0, 0, 0)
{
@@ -145,7 +145,7 @@ CPDF_TextPage::CPDF_TextPage(const CPDF_PageObjects* pPage, int flags)
: m_charList(512),
m_TempCharList(50),
m_pPreTextObj(NULL),
- m_IsParsered(FALSE),
+ m_IsParsered(false),
m_TextlineDir(-1),
m_CurlineRect(0, 0, 0, 0)
{
@@ -155,14 +155,14 @@ CPDF_TextPage::CPDF_TextPage(const CPDF_PageObjects* pPage, int flags)
CFX_FloatRect pageRect = pPage->CalcBoundingBox();
m_DisplayMatrix = CFX_AffineMatrix(1, 0, 0, -1, pageRect.right, pageRect.top);
}
-void CPDF_TextPage::NormalizeObjects(FX_BOOL bNormalize)
+void CPDF_TextPage::NormalizeObjects(bool bNormalize)
{
m_ParseOptions.m_bNormalizeObjs = bNormalize;
}
-FX_BOOL CPDF_TextPage::IsControlChar(PAGECHAR_INFO* pCharInfo)
+bool CPDF_TextPage::IsControlChar(PAGECHAR_INFO* pCharInfo)
{
if(!pCharInfo) {
- return FALSE;
+ return false;
}
switch(pCharInfo->m_Unicode) {
case 0x2:
@@ -174,26 +174,26 @@ FX_BOOL CPDF_TextPage::IsControlChar(PAGECHAR_INFO* pCharInfo)
case 0x98:
case 0xfffe:
if(pCharInfo->m_Flag == FPDFTEXT_CHAR_HYPHEN) {
- return FALSE;
+ return false;
} else {
- return TRUE;
+ return true;
}
default:
- return FALSE;
+ return false;
}
}
-FX_BOOL CPDF_TextPage::ParseTextPage()
+bool CPDF_TextPage::ParseTextPage()
{
if (!m_pPage) {
- m_IsParsered = FALSE;
- return FALSE;
+ m_IsParsered = false;
+ return false;
}
- m_IsParsered = FALSE;
+ m_IsParsered = false;
m_TextBuf.Clear();
m_charList.RemoveAll();
m_pPreTextObj = NULL;
ProcessObject();
- m_IsParsered = TRUE;
+ m_IsParsered = true;
if(!m_ParseOptions.m_bGetCharCodeOnly) {
m_CharIndex.RemoveAll();
int nCount = m_charList.GetSize();
@@ -202,15 +202,15 @@ FX_BOOL CPDF_TextPage::ParseTextPage()
}
for(int i = 0; i < nCount; i++) {
int indexSize = m_CharIndex.GetSize();
- FX_BOOL bNormal = FALSE;
+ bool bNormal = false;
PAGECHAR_INFO charinfo = *(PAGECHAR_INFO*)m_charList.GetAt(i);
if(charinfo.m_Flag == FPDFTEXT_CHAR_GENERATED) {
- bNormal = TRUE;
+ bNormal = true;
}
else if(charinfo.m_Unicode == 0 || IsControlChar(&charinfo))
- bNormal = FALSE;
+ bNormal = false;
else {
- bNormal = TRUE;
+ bNormal = true;
}
if(bNormal) {
if(indexSize % 2) {
@@ -237,7 +237,7 @@ FX_BOOL CPDF_TextPage::ParseTextPage()
m_CharIndex.RemoveAt(indexSize - 1);
}
}
- return TRUE;
+ return true;
}
int CPDF_TextPage::CountChars() const
{
@@ -288,7 +288,7 @@ void CPDF_TextPage::GetRectArray(int start, int nCount, CFX_RectArray& rectArray
CPDF_TextObject* pCurObj = NULL;
CFX_FloatRect rect;
int curPos = start;
- FX_BOOL flagNewRect = TRUE;
+ bool flagNewRect = true;
if (nCount + start > m_charList.GetSize() || nCount == -1) {
nCount = m_charList.GetSize() - start;
}
@@ -306,7 +306,7 @@ void CPDF_TextPage::GetRectArray(int start, int nCount, CFX_RectArray& rectArray
if (pCurObj != info_curchar.m_pTextObj) {
rectArray.Add(rect);
pCurObj = info_curchar.m_pTextObj;
- flagNewRect = TRUE;
+ flagNewRect = true;
}
if (flagNewRect) {
FX_FLOAT orgX = info_curchar.m_OriginX, orgY = info_curchar.m_OriginY;
@@ -331,7 +331,7 @@ void CPDF_TextPage::GetRectArray(int start, int nCount, CFX_RectArray& rectArray
} else {
rect.top = info_curchar.m_CharBox.top;
}
- flagNewRect = FALSE;
+ flagNewRect = false;
rect = info_curchar.m_CharBox;
rect.Normalize();
} else {
@@ -404,8 +404,8 @@ CFX_WideString CPDF_TextPage::GetTextByRect(const CFX_FloatRect& rect) const
int nCount = m_charList.GetSize();
int pos = 0;
FX_FLOAT posy = 0;
- FX_BOOL IsContainPreChar = FALSE;
- FX_BOOL ISAddLineFeed = FALSE;
+ bool IsContainPreChar = false;
+ bool ISAddLineFeed = false;
while (pos < nCount) {
PAGECHAR_INFO charinfo = *(PAGECHAR_INFO*)m_charList.GetAt(pos++);
if (IsRectIntersect(rect, charinfo.m_CharBox)) {
@@ -415,20 +415,20 @@ CFX_WideString CPDF_TextPage::GetTextByRect(const CFX_FloatRect& rect) const
strText += L"\r\n";
}
}
- IsContainPreChar = TRUE;
- ISAddLineFeed = FALSE;
+ IsContainPreChar = true;
+ ISAddLineFeed = false;
if (charinfo.m_Unicode) {
strText += charinfo.m_Unicode;
}
} else if (charinfo.m_Unicode == 32) {
if (IsContainPreChar && charinfo.m_Unicode) {
strText += charinfo.m_Unicode;
- IsContainPreChar = FALSE;
- ISAddLineFeed = FALSE;
+ IsContainPreChar = false;
+ ISAddLineFeed = false;
}
} else {
- IsContainPreChar = FALSE;
- ISAddLineFeed = TRUE;
+ IsContainPreChar = false;
+ ISAddLineFeed = true;
}
}
return strText;
@@ -442,7 +442,7 @@ void CPDF_TextPage::GetRectsArrayByRect(const CFX_FloatRect& rect, CFX_RectArray
return;
}
CFX_FloatRect curRect;
- FX_BOOL flagNewRect = TRUE;
+ bool flagNewRect = true;
CPDF_TextObject* pCurObj = NULL;
int nCount = m_charList.GetSize();
int pos = 0;
@@ -458,11 +458,11 @@ void CPDF_TextPage::GetRectsArrayByRect(const CFX_FloatRect& rect, CFX_RectArray
if (pCurObj != info_curchar.m_pTextObj) {
resRectArray.Add(curRect);
pCurObj = info_curchar.m_pTextObj;
- flagNewRect = TRUE;
+ flagNewRect = true;
}
if (flagNewRect) {
curRect = info_curchar.m_CharBox;
- flagNewRect = FALSE;
+ flagNewRect = false;
curRect.Normalize();
} else {
info_curchar.m_CharBox.Normalize();
@@ -766,13 +766,13 @@ void CPDF_TextPage::GetRect(int rectIndex, FX_FLOAT& left, FX_FLOAT& top, FX_FLO
right = m_SelRects.GetAt(rectIndex).right;
bottom = m_SelRects.GetAt(rectIndex).bottom;
}
-FX_BOOL CPDF_TextPage::GetBaselineRotate(int start, int end, int& Rotate)
+bool CPDF_TextPage::GetBaselineRotate(int start, int end, int& Rotate)
{
if(m_ParseOptions.m_bGetCharCodeOnly) {
- return FALSE;
+ return false;
}
if(end == start) {
- return FALSE;
+ return false;
}
FX_FLOAT dx, dy;
FPDF_CHAR_INFO info1, info2;
@@ -781,7 +781,7 @@ FX_BOOL CPDF_TextPage::GetBaselineRotate(int start, int end, int& Rotate)
while(info2.m_CharBox.Width() == 0 || info2.m_CharBox.Height() == 0) {
end--;
if(end <= start) {
- return FALSE;
+ return false;
}
GetCharInfo(end, info2);
}
@@ -804,16 +804,16 @@ FX_BOOL CPDF_TextPage::GetBaselineRotate(int start, int end, int& Rotate)
} else if(Rotate > 0) {
Rotate = 360 - Rotate;
}
- return TRUE;
+ return true;
}
-FX_BOOL CPDF_TextPage::GetBaselineRotate(const CFX_FloatRect& rect , int& Rotate)
+bool CPDF_TextPage::GetBaselineRotate(const CFX_FloatRect& rect , int& Rotate)
{
if(m_ParseOptions.m_bGetCharCodeOnly) {
- return FALSE;
+ return false;
}
- int start, end, count, n = CountBoundedSegments(rect.left, rect.top, rect.right, rect.bottom, TRUE);
+ int start, end, count, n = CountBoundedSegments(rect.left, rect.top, rect.right, rect.bottom, true);
if(n < 1) {
- return FALSE;
+ return false;
}
if(n > 1) {
GetBoundedSegment(n - 1, start, count);
@@ -825,18 +825,18 @@ FX_BOOL CPDF_TextPage::GetBaselineRotate(const CFX_FloatRect& rect , int& Rotate
}
return GetBaselineRotate(start, end, Rotate);
}
-FX_BOOL CPDF_TextPage::GetBaselineRotate(int rectIndex, int& Rotate)
+bool CPDF_TextPage::GetBaselineRotate(int rectIndex, int& Rotate)
{
if(m_ParseOptions.m_bGetCharCodeOnly) {
- return FALSE;
+ return false;
}
if (!m_IsParsered || rectIndex < 0 || rectIndex > m_SelRects.GetSize()) {
- return FALSE;
+ return false;
}
CFX_FloatRect rect = m_SelRects.GetAt(rectIndex);
return GetBaselineRotate(rect , Rotate);
}
-int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT right, FX_FLOAT bottom, FX_BOOL bContains )
+int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT right, FX_FLOAT bottom, bool bContains )
{
if(m_ParseOptions.m_bGetCharCodeOnly) {
return -1;
@@ -852,8 +852,8 @@ int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT ri
FPDF_SEGMENT segment;
segment.m_Start = 0;
segment.m_nCount = 0;
- FX_BOOL segmentStatus = 0;
- FX_BOOL IsContainPreChar = FALSE;
+ bool segmentStatus = 0;
+ bool IsContainPreChar = false;
while (pos < nCount) {
PAGECHAR_INFO charinfo = *(PAGECHAR_INFO*)m_charList.GetAt(pos);
if(bContains && rect.Contains(charinfo.m_CharBox)) {
@@ -864,7 +864,7 @@ int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT ri
} else if (segmentStatus == 1) {
segment.m_nCount++;
}
- IsContainPreChar = TRUE;
+ IsContainPreChar = true;
} else if (!bContains && (IsRectIntersect(rect, charinfo.m_CharBox) || rect.Contains(charinfo.m_OriginX, charinfo.m_OriginY))) {
if (segmentStatus == 0 || segmentStatus == 2) {
segment.m_Start = pos;
@@ -873,9 +873,9 @@ int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT ri
} else if (segmentStatus == 1) {
segment.m_nCount++;
}
- IsContainPreChar = TRUE;
+ IsContainPreChar = true;
} else if (charinfo.m_Unicode == 32) {
- if (IsContainPreChar == TRUE) {
+ if (IsContainPreChar == true) {
if (segmentStatus == 0 || segmentStatus == 2) {
segment.m_Start = pos;
segment.m_nCount = 1;
@@ -883,7 +883,7 @@ int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT ri
} else if (segmentStatus == 1) {
segment.m_nCount++;
}
- IsContainPreChar = FALSE;
+ IsContainPreChar = false;
} else {
if (segmentStatus == 1) {
segmentStatus = 2;
@@ -899,7 +899,7 @@ int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT ri
segment.m_Start = 0;
segment.m_nCount = 0;
}
- IsContainPreChar = FALSE;
+ IsContainPreChar = false;
}
pos++;
}
@@ -1195,7 +1195,7 @@ void CPDF_TextPage::AddCharInfoByRLDirection(CFX_WideString& str, int i)
PAGECHAR_INFO Info = *(PAGECHAR_INFO*)m_TempCharList.GetAt(i);
if(!IsControlChar(&Info)) {
Info.m_Index = m_TextBuf.GetLength();
- FX_WCHAR wChar = FX_GetMirrorChar(str.GetAt(i), TRUE, FALSE);
+ FX_WCHAR wChar = FX_GetMirrorChar(str.GetAt(i), true, false);
FX_WCHAR* pDst = NULL;
FX_STRSIZE nCount = FX_Unicode_GetNormalization(wChar, pDst);
if (nCount >= 1) {
@@ -1232,10 +1232,10 @@ void CPDF_TextPage::CloseTempLine()
nonstd::unique_ptr<IFX_BidiChar> pBidiChar(IFX_BidiChar::Create());
CFX_WideString str = m_TempTextBuf.GetWideString();
CFX_WordArray order;
- FX_BOOL bR2L = FALSE;
+ bool bR2L = false;
int32_t start = 0, count = 0;
int nR2L = 0, nL2R = 0;
- FX_BOOL bPrevSpace = FALSE;
+ bool bPrevSpace = false;
for (int i = 0; i < str.GetLength(); i++) {
if(str.GetAt(i) == 32) {
if(bPrevSpace) {
@@ -1246,9 +1246,9 @@ void CPDF_TextPage::CloseTempLine()
i--;
continue;
}
- bPrevSpace = TRUE;
+ bPrevSpace = true;
} else {
- bPrevSpace = FALSE;
+ bPrevSpace = false;
}
if(pBidiChar->AppendChar(str.GetAt(i))) {
int32_t ret = pBidiChar->GetBidiInfo(start, count);
@@ -1278,7 +1278,7 @@ void CPDF_TextPage::CloseTempLine()
}
}
if(nR2L > 0 && nR2L >= nL2R) {
- bR2L = TRUE;
+ bR2L = true;
}
if (m_parserflag == FPDFTEXT_RLTB || bR2L) {
int count = order.GetSize();
@@ -1292,7 +1292,7 @@ void CPDF_TextPage::CloseTempLine()
}
} else {
int j = i;
- FX_BOOL bSymbol = FALSE;
+ bool bSymbol = false;
while(j > 0 && order.GetAt(j) != 2) {
bSymbol = !order.GetAt(j);
j -= 3;
@@ -1324,7 +1324,7 @@ void CPDF_TextPage::CloseTempLine()
}
} else {
int count = order.GetSize();
- FX_BOOL bL2R = FALSE;
+ bool bL2R = false;
for(int i = 0; i < count; i += 3) {
int ret = order.GetAt(i + 2);
int start = order.GetAt(i);
@@ -1340,7 +1340,7 @@ void CPDF_TextPage::CloseTempLine()
}
if(j == 3) {
i = -3;
- bL2R = TRUE;
+ bL2R = true;
continue;
}
int end = m_TempCharList.GetSize() - 1;
@@ -1450,7 +1450,7 @@ int32_t CPDF_TextPage::PreMarkedContent(PDFTEXT_Obj Obj)
return FPDFTEXT_MC_PASS;
}
CFX_WideString actText;
- FX_BOOL bExist = FALSE;
+ bool bExist = false;
CPDF_Dictionary* pDict = NULL;
int n = 0;
for (n = 0; n < nContentMark; n++) {
@@ -1459,7 +1459,7 @@ int32_t CPDF_TextPage::PreMarkedContent(PDFTEXT_Obj Obj)
pDict = (CPDF_Dictionary*)item.GetParam();
CPDF_String* temp = (CPDF_String*)(pDict ? pDict->GetElement(FX_BSTRC("ActualText")) : NULL);
if (temp) {
- bExist = TRUE;
+ bExist = true;
actText = temp->GetUnicodeText();
}
}
@@ -1481,24 +1481,24 @@ int32_t CPDF_TextPage::PreMarkedContent(PDFTEXT_Obj Obj)
if (nItems < 1) {
return FPDFTEXT_MC_PASS;
}
- bExist = FALSE;
+ bExist = false;
for (FX_STRSIZE i = 0; i < nItems; i++) {
FX_WCHAR wChar = actText.GetAt(i);
if (-1 == pFont->CharCodeFromUnicode(wChar)) {
continue;
} else {
- bExist = TRUE;
+ bExist = true;
break;
}
}
if (!bExist) {
return FPDFTEXT_MC_PASS;
}
- bExist = FALSE;
+ bExist = false;
for (FX_STRSIZE i = 0; i < nItems; i++) {
FX_WCHAR wChar = actText.GetAt(i);
if ((wChar > 0x80 && wChar < 0xFFFD) || (wChar <= 0x80 && isprint(wChar))) {
- bExist = TRUE;
+ bExist = true;
break;
}
}
@@ -1682,8 +1682,8 @@ void CPDF_TextPage::ProcessTextObject(PDFTEXT_Obj Obj)
int nItems = pTextObj->CountItems();
FX_FLOAT baseSpace = _CalculateBaseSpace(pTextObj, matrix);
- const FX_BOOL bR2L = IsRightToLeft(pTextObj, pFont, nItems);
- const FX_BOOL bIsBidiAndMirrorInverse =
+ const bool bR2L = IsRightToLeft(pTextObj, pFont, nItems);
+ const bool bIsBidiAndMirrorInverse =
bR2L && (matrix.a * matrix.d - matrix.b * matrix.c) < 0;
int32_t iBufStartAppend = m_TempTextBuf.GetLength();
int32_t iCharListStartAppend = m_TempCharList.GetSize();
@@ -1752,7 +1752,7 @@ void CPDF_TextPage::ProcessTextObject(PDFTEXT_Obj Obj)
}
spacing = 0;
CFX_WideString wstrItem = pFont->UnicodeFromCharCode(item.m_CharCode);
- FX_BOOL bNoUnicode = FALSE;
+ bool bNoUnicode = false;
FX_WCHAR wChar = wstrItem.GetAt(0);
if ((wstrItem.IsEmpty() || wChar == 0) && item.m_CharCode) {
if(wstrItem.IsEmpty()) {
@@ -1760,7 +1760,7 @@ void CPDF_TextPage::ProcessTextObject(PDFTEXT_Obj Obj)
} else {
wstrItem.SetAt(0, (FX_WCHAR)item.m_CharCode);
}
- bNoUnicode = TRUE;
+ bNoUnicode = true;
}
charinfo.m_Index = -1;
charinfo.m_CharCode = item.m_CharCode;
@@ -1794,7 +1794,7 @@ void CPDF_TextPage::ProcessTextObject(PDFTEXT_Obj Obj)
continue;
} else {
int nTotal = wstrItem.GetLength();
- FX_BOOL bDel = FALSE;
+ bool bDel = false;
const int count = std::min(m_TempCharList.GetSize(), 7);
FX_FLOAT threshold = charinfo.m_Matrix.TransformXDistance((FX_FLOAT)TEXT_CHARRATIO_GAPDELTA * pTextObj->GetFontSize());
for (int n = m_TempCharList.GetSize();
@@ -1805,7 +1805,7 @@ void CPDF_TextPage::ProcessTextObject(PDFTEXT_Obj Obj)
charinfo1->m_pTextObj->GetFont() == charinfo.m_pTextObj->GetFont() &&
FXSYS_fabs(charinfo1->m_OriginX - charinfo.m_OriginX) < threshold &&
FXSYS_fabs(charinfo1->m_OriginY - charinfo.m_OriginY) < threshold) {
- bDel = TRUE;
+ bDel = true;
break;
}
}
@@ -1850,7 +1850,7 @@ void CPDF_TextPage::SwapTempTextBuf(int32_t iCharListStartAppend,
std::swap(pTempBuffer[i], pTempBuffer[j]);
}
}
-FX_BOOL CPDF_TextPage::IsRightToLeft(const CPDF_TextObject* pTextObj,
+bool CPDF_TextPage::IsRightToLeft(const CPDF_TextObject* pTextObj,
const CPDF_Font* pFont,
int nItems) const
{
@@ -1924,7 +1924,7 @@ int32_t CPDF_TextPage::GetTextObjectWritingMode(const CPDF_TextObject* pTextObj)
}
return m_TextlineDir;
}
-FX_BOOL CPDF_TextPage::IsHyphen(FX_WCHAR curChar)
+bool CPDF_TextPage::IsHyphen(FX_WCHAR curChar)
{
CFX_WideString strCurText = m_TempTextBuf.GetWideString();
if(strCurText.GetLength() == 0) {
@@ -1941,7 +1941,7 @@ FX_BOOL CPDF_TextPage::IsHyphen(FX_WCHAR curChar)
FX_WCHAR preChar = strCurText.GetAt((nIndex));
if (((preChar >= L'A' && preChar <= L'Z') || (preChar >= L'a' && preChar <= L'z'))
&& ((curChar >= L'A' && curChar <= L'Z') || (curChar >= L'a' && curChar <= L'z'))) {
- return TRUE;
+ return true;
}
}
int size = m_TempCharList.GetSize();
@@ -1951,21 +1951,21 @@ FX_BOOL CPDF_TextPage::IsHyphen(FX_WCHAR curChar)
} else {
size = m_charList.GetSize();
if(size == 0) {
- return FALSE;
+ return false;
}
preChar = (PAGECHAR_INFO)m_charList[size - 1];
}
if (FPDFTEXT_CHAR_PIECE == preChar.m_Flag)
if (0xAD == preChar.m_Unicode || 0x2D == preChar.m_Unicode) {
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
int CPDF_TextPage::ProcessInsertObject(const CPDF_TextObject* pObj, const CFX_AffineMatrix& formMatrix)
{
FindPreviousTextObject();
- FX_BOOL bNewline = FALSE;
+ bool bNewline = false;
int WritingMode = GetTextObjectWritingMode(pObj);
if(WritingMode == -1) {
WritingMode = GetTextObjectWritingMode(m_pPreTextObj);
@@ -2029,8 +2029,8 @@ int CPDF_TextPage::ProcessInsertObject(const CPDF_TextObject* pObj, const CFX_Af
rect1.Intersect(rect2);
if (WritingMode == 0) {
if ((rect1.IsEmpty() && rect2.Height() > 5 && rect3.Height() > 5)
- || ((y > threshold * 2 || y < threshold * -3) && (FXSYS_fabs(y) < 1 ? FXSYS_fabs(x) < FXSYS_fabs(y) : TRUE))) {
- bNewline = TRUE;
+ || ((y > threshold * 2 || y < threshold * -3) && (FXSYS_fabs(y) < 1 ? FXSYS_fabs(x) < FXSYS_fabs(y) : true))) {
+ bNewline = true;
if(nItem > 1 ) {
CPDF_TextObjectItem tempItem;
m_pPreTextObj->GetItemInfo(0, &tempItem);
@@ -2042,11 +2042,11 @@ int CPDF_TextPage::ProcessInsertObject(const CPDF_TextObject* pObj, const CFX_Af
&& m.b < 0.1 && m.c < 0.1 ) {
CFX_FloatRect re(0, m_pPreTextObj->m_Bottom, 1000, m_pPreTextObj->m_Top);
if(re.Contains(pObj->GetPosX(), pObj->GetPosY())) {
- bNewline = FALSE;
+ bNewline = false;
} else {
CFX_FloatRect re(0, pObj->m_Bottom, 1000, pObj->m_Top);
if(re.Contains(m_pPreTextObj->GetPosX(), m_pPreTextObj->GetPosY())) {
- bNewline = FALSE;
+ bNewline = false;
}
}
}
@@ -2097,10 +2097,10 @@ int CPDF_TextPage::ProcessInsertObject(const CPDF_TextObject* pObj, const CFX_Af
}
return 0;
}
-FX_BOOL CPDF_TextPage::IsSameTextObject(CPDF_TextObject* pTextObj1, CPDF_TextObject* pTextObj2)
+bool CPDF_TextPage::IsSameTextObject(CPDF_TextObject* pTextObj1, CPDF_TextObject* pTextObj2)
{
if (!pTextObj1 || !pTextObj2) {
- return FALSE;
+ return false;
}
CFX_FloatRect rcPreObj(pTextObj2->m_Left, pTextObj2->m_Bottom, pTextObj2->m_Right, pTextObj2->m_Top);
CFX_FloatRect rcCurObj(pTextObj1->m_Left, pTextObj1->m_Bottom, pTextObj1->m_Right, pTextObj1->m_Top);
@@ -2111,46 +2111,46 @@ FX_BOOL CPDF_TextPage::IsSameTextObject(CPDF_TextObject* pTextObj1, CPDF_TextObj
PAGECHAR_INFO perCharTemp = (PAGECHAR_INFO)m_charList[nCount - 2];
FX_FLOAT dbSpace = perCharTemp.m_CharBox.Width();
if (dbXdif > dbSpace) {
- return FALSE;
+ return false;
}
}
}
if (!rcPreObj.IsEmpty() || !rcCurObj.IsEmpty()) {
rcPreObj.Intersect(rcCurObj);
if (rcPreObj.IsEmpty()) {
- return FALSE;
+ return false;
}
if (FXSYS_fabs(rcPreObj.Width() - rcCurObj.Width()) > rcCurObj.Width() / 2) {
- return FALSE;
+ return false;
}
if (pTextObj2->GetFontSize() != pTextObj1->GetFontSize()) {
- return FALSE;
+ return false;
}
}
int nPreCount = pTextObj2->CountItems();
int nCurCount = pTextObj1->CountItems();
if (nPreCount != nCurCount) {
- return FALSE;
+ return false;
}
CPDF_TextObjectItem itemPer, itemCur;
for (int i = 0; i < nPreCount; i++) {
pTextObj2->GetItemInfo(i, &itemPer);
pTextObj1->GetItemInfo(i, &itemCur);
if (itemCur.m_CharCode != itemPer.m_CharCode) {
- return FALSE;
+ return false;
}
}
if(FXSYS_fabs(pTextObj1->GetPosX() - pTextObj2->GetPosX()) > GetCharWidth(itemPer.m_CharCode, pTextObj2->GetFont())*pTextObj2->GetFontSize() / 1000 * 0.9 ||
FXSYS_fabs(pTextObj1->GetPosY() - pTextObj2->GetPosY()) >
FX_MAX(FX_MAX(rcPreObj.Height() , rcPreObj.Width()), pTextObj2->GetFontSize()) / 8) {
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
-FX_BOOL CPDF_TextPage::IsSameAsPreTextObject(CPDF_TextObject* pTextObj, FX_POSITION ObjPos)
+bool CPDF_TextPage::IsSameAsPreTextObject(CPDF_TextObject* pTextObj, FX_POSITION ObjPos)
{
if (!pTextObj) {
- return FALSE;
+ return false;
}
int i = 0;
if (!ObjPos) {
@@ -2166,13 +2166,13 @@ FX_BOOL CPDF_TextPage::IsSameAsPreTextObject(CPDF_TextObject* pTextObj, FX_POSIT
continue;
}
if(IsSameTextObject((CPDF_TextObject*)pObj, pTextObj)) {
- return TRUE;
+ return true;
}
i++;
}
- return FALSE;
+ return false;
}
-FX_BOOL CPDF_TextPage::GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info)
+bool CPDF_TextPage::GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info)
{
int size = m_TempCharList.GetSize();
PAGECHAR_INFO preChar;
@@ -2181,7 +2181,7 @@ FX_BOOL CPDF_TextPage::GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info)
} else {
size = m_charList.GetSize();
if(size == 0) {
- return FALSE;
+ return false;
}
preChar = (PAGECHAR_INFO)m_charList[size - 1];
}
@@ -2206,37 +2206,37 @@ FX_BOOL CPDF_TextPage::GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info)
info.m_OriginX = preChar.m_OriginX + preWidth * (fs) / 1000;
info.m_OriginY = preChar.m_OriginY;
info.m_CharBox = CFX_FloatRect(info.m_OriginX, info.m_OriginY, info.m_OriginX, info.m_OriginY);
- return TRUE;
+ return true;
}
-FX_BOOL CPDF_TextPage::IsRectIntersect(const CFX_FloatRect& rect1, const CFX_FloatRect& rect2)
+bool CPDF_TextPage::IsRectIntersect(const CFX_FloatRect& rect1, const CFX_FloatRect& rect2)
{
CFX_FloatRect rect = rect1;
rect.Intersect(rect2);
return !rect.IsEmpty();
}
-FX_BOOL CPDF_TextPage::IsLetter(FX_WCHAR unicode)
+bool CPDF_TextPage::IsLetter(FX_WCHAR unicode)
{
if (unicode < L'A') {
- return FALSE;
+ return false;
}
if (unicode > L'Z' && unicode < L'a') {
- return FALSE;
+ return false;
}
if (unicode > L'z') {
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
CPDF_TextPageFind::CPDF_TextPageFind(const IPDF_TextPage* pTextPage)
: m_pTextPage(pTextPage),
m_flags(0),
m_findNextStart(-1),
m_findPreStart(-1),
- m_bMatchCase(FALSE),
- m_bMatchWholeWord(FALSE),
+ m_bMatchCase(false),
+ m_bMatchWholeWord(false),
m_resStart(0),
m_resEnd(-1),
- m_IsFind(FALSE)
+ m_IsFind(false)
{
m_strText = m_pTextPage->GetPageText();
int nCount = pTextPage->CountChars();
@@ -2285,10 +2285,10 @@ int CPDF_TextPageFind::GetCharIndex(int index) const
}
return -1;
}
-FX_BOOL CPDF_TextPageFind::FindFirst(const CFX_WideString& findwhat, int flags, int startPos)
+bool CPDF_TextPageFind::FindFirst(const CFX_WideString& findwhat, int flags, int startPos)
{
if (!m_pTextPage) {
- return FALSE;
+ return false;
}
if (m_strText.IsEmpty() || m_bMatchCase != (flags & FPDFTEXT_MATCHCASE)) {
m_strText = m_pTextPage->GetPageText();
@@ -2298,8 +2298,8 @@ FX_BOOL CPDF_TextPageFind::FindFirst(const CFX_WideString& findwhat, int flags,
m_flags = flags;
m_bMatchCase = flags & FPDFTEXT_MATCHCASE;
if (m_strText.IsEmpty()) {
- m_IsFind = FALSE;
- return TRUE;
+ m_IsFind = false;
+ return true;
}
FX_STRSIZE len = findwhatStr.GetLength();
if (!m_bMatchCase) {
@@ -2327,36 +2327,36 @@ FX_BOOL CPDF_TextPageFind::FindFirst(const CFX_WideString& findwhat, int flags,
m_csFindWhatArray.Add(findwhatStr);
}
if(m_csFindWhatArray.GetSize() <= 0) {
- return FALSE;
+ return false;
}
- m_IsFind = TRUE;
+ m_IsFind = true;
m_resStart = 0;
m_resEnd = -1;
- return TRUE;
+ return true;
}
-FX_BOOL CPDF_TextPageFind::FindNext()
+bool CPDF_TextPageFind::FindNext()
{
if (!m_pTextPage) {
- return FALSE;
+ return false;
}
m_resArray.RemoveAll();
if(m_findNextStart == -1) {
- return FALSE;
+ return false;
}
if(m_strText.IsEmpty()) {
- m_IsFind = FALSE;
+ m_IsFind = false;
return m_IsFind;
}
int strLen = m_strText.GetLength();
if (m_findNextStart > strLen - 1) {
- m_IsFind = FALSE;
+ m_IsFind = false;
return m_IsFind;
}
int nCount = m_csFindWhatArray.GetSize();
int nResultPos = 0;
int nStartPos = 0;
nStartPos = m_findNextStart;
- FX_BOOL bSpaceStart = FALSE;
+ bool bSpaceStart = false;
for(int iWord = 0; iWord < nCount; iWord++) {
CFX_WideString csWord = m_csFindWhatArray[iWord];
if(csWord.IsEmpty()) {
@@ -2368,33 +2368,33 @@ FX_BOOL CPDF_TextPageFind::FindNext()
}
iWord = -1;
} else if(iWord == 0) {
- bSpaceStart = TRUE;
+ bSpaceStart = true;
}
continue;
}
int endIndex;
nResultPos = m_strText.Find(csWord.c_str(), nStartPos);
if (nResultPos == -1) {
- m_IsFind = FALSE;
+ m_IsFind = false;
return m_IsFind;
}
endIndex = nResultPos + csWord.GetLength() - 1;
if(iWord == 0) {
m_resStart = nResultPos;
}
- FX_BOOL bMatch = TRUE;
+ bool bMatch = true;
if(iWord != 0 && !bSpaceStart) {
int PreResEndPos = nStartPos;
int curChar = csWord.GetAt(0);
CFX_WideString lastWord = m_csFindWhatArray[iWord - 1];
int lastChar = lastWord.GetAt(lastWord.GetLength() - 1);
if(nStartPos == nResultPos && !(_IsIgnoreSpaceCharacter(lastChar) || _IsIgnoreSpaceCharacter(curChar))) {
- bMatch = FALSE;
+ bMatch = false;
}
for(int d = PreResEndPos; d < nResultPos; d++) {
FX_WCHAR strInsert = m_strText.GetAt(d);
if(strInsert != TEXT_LINEFEED_CHAR && strInsert != TEXT_BLANK_CHAR && strInsert != TEXT_RETURN_CHAR && strInsert != 160) {
- bMatch = FALSE;
+ bMatch = false;
break;
}
}
@@ -2402,7 +2402,7 @@ FX_BOOL CPDF_TextPageFind::FindNext()
if(nResultPos > 0) {
FX_WCHAR strInsert = m_strText.GetAt(nResultPos - 1);
if(strInsert != TEXT_LINEFEED_CHAR && strInsert != TEXT_BLANK_CHAR && strInsert != TEXT_RETURN_CHAR && strInsert != 160) {
- bMatch = FALSE;
+ bMatch = false;
m_resStart = nResultPos;
} else {
m_resStart = nResultPos - 1;
@@ -2423,7 +2423,7 @@ FX_BOOL CPDF_TextPageFind::FindNext()
}
}
m_resEnd = nResultPos + m_csFindWhatArray[m_csFindWhatArray.GetSize() - 1].GetLength() - 1;
- m_IsFind = TRUE;
+ m_IsFind = true;
int resStart = GetCharIndex(m_resStart);
int resEnd = GetCharIndex(m_resEnd);
m_pTextPage->GetRectArray(resStart, resEnd - resStart + 1, m_resArray);
@@ -2436,20 +2436,20 @@ FX_BOOL CPDF_TextPageFind::FindNext()
}
return m_IsFind;
}
-FX_BOOL CPDF_TextPageFind::FindPrev()
+bool CPDF_TextPageFind::FindPrev()
{
if (!m_pTextPage) {
- return FALSE;
+ return false;
}
m_resArray.RemoveAll();
if(m_strText.IsEmpty() || m_findPreStart < 0) {
- m_IsFind = FALSE;
+ m_IsFind = false;
return m_IsFind;
}
CPDF_TextPageFind findEngine(m_pTextPage);
- FX_BOOL ret = findEngine.FindFirst(m_findWhat, m_flags);
+ bool ret = findEngine.FindFirst(m_findWhat, m_flags);
if(!ret) {
- m_IsFind = FALSE;
+ m_IsFind = false;
return m_IsFind;
}
int order = -1, MatchedCount = 0;
@@ -2466,12 +2466,12 @@ FX_BOOL CPDF_TextPageFind::FindPrev()
}
}
if(order == -1) {
- m_IsFind = FALSE;
+ m_IsFind = false;
return m_IsFind;
}
m_resStart = m_pTextPage->TextIndexFromCharIndex(order);
m_resEnd = m_pTextPage->TextIndexFromCharIndex(order + MatchedCount - 1);
- m_IsFind = TRUE;
+ m_IsFind = true;
m_pTextPage->GetRectArray(order, MatchedCount, m_resArray);
if(m_flags & FPDFTEXT_CONSECUTIVE) {
m_findNextStart = m_resStart + 1;
@@ -2530,16 +2530,16 @@ void CPDF_TextPageFind::ExtractFindWhat(const CFX_WideString& findwhat)
index++;
}
}
-FX_BOOL CPDF_TextPageFind::IsMatchWholeWord(const CFX_WideString& csPageText, int startPos, int endPos)
+bool CPDF_TextPageFind::IsMatchWholeWord(const CFX_WideString& csPageText, int startPos, int endPos)
{
int char_left = 0;
int char_right = 0;
int char_count = endPos - startPos + 1;
if(char_count < 1) {
- return FALSE;
+ return false;
}
if (char_count == 1 && csPageText.GetAt(startPos) > 255) {
- return TRUE;
+ return true;
}
if(startPos - 1 >= 0 ) {
char_left = csPageText.GetAt(startPos - 1);
@@ -2549,33 +2549,33 @@ FX_BOOL CPDF_TextPageFind::IsMatchWholeWord(const CFX_WideString& csPageText, in
}
if ((char_left > 'A' && char_left < 'a') || (char_left > 'a' && char_left < 'z') || (char_left > 0xfb00 && char_left < 0xfb06) || (char_left >= '0' && char_left <= '9') ||
(char_right > 'A' && char_right < 'a') || (char_right > 'a' && char_right < 'z') || (char_right > 0xfb00 && char_right < 0xfb06) || (char_right >= '0' && char_right <= '9')) {
- return FALSE;
+ return false;
}
if(!(('A' > char_left || char_left > 'Z') && ('a' > char_left || char_left > 'z')
&& ('A' > char_right || char_right > 'Z') && ('a' > char_right || char_right > 'z'))) {
- return FALSE;
+ return false;
}
if (char_count > 0) {
if (csPageText.GetAt(startPos) >= L'0' && csPageText.GetAt(startPos) <= L'9' && char_left >= L'0' && char_left <= L'9') {
- return FALSE;
+ return false;
}
if (csPageText.GetAt(endPos) >= L'0' && csPageText.GetAt(endPos) <= L'9' && char_right >= L'0' && char_right <= L'9') {
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
-FX_BOOL CPDF_TextPageFind::ExtractSubString(CFX_WideString& rString, const FX_WCHAR* lpszFullString,
+bool CPDF_TextPageFind::ExtractSubString(CFX_WideString& rString, const FX_WCHAR* lpszFullString,
int iSubString, FX_WCHAR chSep)
{
if (lpszFullString == NULL) {
- return FALSE;
+ return false;
}
while (iSubString--) {
lpszFullString = FXSYS_wcschr(lpszFullString, chSep);
if (lpszFullString == NULL) {
rString.Empty();
- return FALSE;
+ return false;
}
lpszFullString++;
while(*lpszFullString == chSep) {
@@ -2588,7 +2588,7 @@ FX_BOOL CPDF_TextPageFind::ExtractSubString(CFX_WideString& rString, const FX_WC
ASSERT(nLen >= 0);
FXSYS_memcpy(rString.GetBuffer(nLen), lpszFullString, nLen * sizeof(FX_WCHAR));
rString.ReleaseBuffer();
- return TRUE;
+ return true;
}
CFX_WideString CPDF_TextPageFind::MakeReverse(const CFX_WideString& str)
{
@@ -2616,27 +2616,27 @@ int CPDF_TextPageFind::GetMatchedCount()const
}
CPDF_LinkExtract::CPDF_LinkExtract()
: m_pTextPage(NULL),
- m_IsParserd(FALSE)
+ m_IsParserd(false)
{
}
CPDF_LinkExtract::~CPDF_LinkExtract()
{
DeleteLinkList();
}
-FX_BOOL CPDF_LinkExtract::ExtractLinks(const IPDF_TextPage* pTextPage)
+bool CPDF_LinkExtract::ExtractLinks(const IPDF_TextPage* pTextPage)
{
if (!pTextPage || !pTextPage->IsParsered()) {
- return FALSE;
+ return false;
}
m_pTextPage = (const CPDF_TextPage*)pTextPage;
m_strPageText = m_pTextPage->GetPageText(0, -1);
DeleteLinkList();
if (m_strPageText.IsEmpty()) {
- return FALSE;
+ return false;
}
parserLink();
- m_IsParserd = TRUE;
- return TRUE;
+ m_IsParserd = true;
+ return true;
}
void CPDF_LinkExtract::DeleteLinkList()
{
@@ -2691,39 +2691,39 @@ void CPDF_LinkExtract::parserLink()
}
}
}
-FX_BOOL CPDF_LinkExtract::CheckWebLink(CFX_WideString& strBeCheck)
+bool CPDF_LinkExtract::CheckWebLink(CFX_WideString& strBeCheck)
{
CFX_WideString str = strBeCheck;
str.MakeLower();
if (str.Find(L"http://www.") != -1) {
strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"http://www."));
- return TRUE;
+ return true;
} else if (str.Find(L"http://") != -1) {
strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"http://"));
- return TRUE;
+ return true;
} else if (str.Find(L"https://www.") != -1) {
strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"https://www."));
- return TRUE;
+ return true;
} else if (str.Find(L"https://") != -1) {
strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"https://"));
- return TRUE;
+ return true;
} else if (str.Find(L"www.") != -1) {
strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"www."));
strBeCheck = L"http://" + strBeCheck;
- return TRUE;
+ return true;
} else {
- return FALSE;
+ return false;
}
}
-FX_BOOL CPDF_LinkExtract::CheckMailLink(CFX_WideString& str)
+bool CPDF_LinkExtract::CheckMailLink(CFX_WideString& str)
{
str.MakeLower();
int aPos = str.Find(L'@');
if (aPos < 1) {
- return FALSE;
+ return false;
}
if (str.GetAt(aPos - 1) == L'.' || str.GetAt(aPos - 1) == L'_') {
- return FALSE;
+ return false;
}
int i;
for (i = aPos - 1; i >= 0; i--) {
@@ -2732,7 +2732,7 @@ FX_BOOL CPDF_LinkExtract::CheckMailLink(CFX_WideString& str)
continue;
} else {
if (i == aPos - 1) {
- return FALSE;
+ return false;
}
str = str.Right(str.GetLength() - i - 1);
break;
@@ -2740,7 +2740,7 @@ FX_BOOL CPDF_LinkExtract::CheckMailLink(CFX_WideString& str)
}
aPos = str.Find(L'@');
if (aPos < 1) {
- return FALSE;
+ return false;
}
CFX_WideString strtemp = L"";
for (i = 0; i < aPos; i++) {
@@ -2756,13 +2756,13 @@ FX_BOOL CPDF_LinkExtract::CheckMailLink(CFX_WideString& str)
}
aPos = str.Find(L'@');
if (aPos < 1) {
- return FALSE;
+ return false;
}
str.TrimRight(L'.');
strtemp = str;
int ePos = str.Find(L'.');
if (ePos == -1) {
- return FALSE;
+ return false;
}
while (ePos != -1) {
strtemp = strtemp.Right(strtemp.GetLength() - ePos - 1);
@@ -2785,22 +2785,22 @@ FX_BOOL CPDF_LinkExtract::CheckMailLink(CFX_WideString& str)
if (wch == L'-' || wch == L'.' || (wch >= L'a' && wch <= L'z') || (wch >= L'0' && wch <= L'9')) {
continue;
} else {
- return FALSE;
+ return false;
}
}
if (str.Find(L"mailto:") == -1) {
str = L"mailto:" + str;
}
- return TRUE;
+ return true;
}
-FX_BOOL CPDF_LinkExtract::AppendToLinkList(int start, int count, const CFX_WideString& strUrl)
+bool CPDF_LinkExtract::AppendToLinkList(int start, int count, const CFX_WideString& strUrl)
{
CPDF_LinkExt* linkInfo = new CPDF_LinkExt;
linkInfo->m_strUrl = strUrl;
linkInfo->m_Start = start;
linkInfo->m_Count = count;
m_LinkList.Add(linkInfo);
- return TRUE;
+ return true;
}
CFX_WideString CPDF_LinkExtract::GetURL(int index) const
{
« no previous file with comments | « core/src/fpdftext/fpdf_text.cpp ('k') | core/src/fpdftext/fpdf_text_search.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698