summaryrefslogtreecommitdiff
path: root/core/src/fpdftext/fpdf_text_int.cpp
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-10-02 12:28:32 -0700
committerLei Zhang <thestig@chromium.org>2015-10-02 12:28:32 -0700
commitea5c4d3929928b318b339231804580d93a6e5f21 (patch)
treee4716d176a1326e823ff075ffad74e1236206de0 /core/src/fpdftext/fpdf_text_int.cpp
parent9e75b82d5d18f748b260202fed5a59682631475c (diff)
downloadpdfium-ea5c4d3929928b318b339231804580d93a6e5f21.tar.xz
Merge to XFA: Turn a couple functions that always return true to return void.
R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1386463003 . (cherry picked from commit dcfa0ba2928072c962fe8835d1a2ccd309eafbbd) Review URL: https://codereview.chromium.org/1379093003 .
Diffstat (limited to 'core/src/fpdftext/fpdf_text_int.cpp')
-rw-r--r--core/src/fpdftext/fpdf_text_int.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp
index b343c1d566..e427a1d2a8 100644
--- a/core/src/fpdftext/fpdf_text_int.cpp
+++ b/core/src/fpdftext/fpdf_text_int.cpp
@@ -2614,9 +2614,7 @@ void CPDF_LinkExtract::parserLink() {
}
if (nCount > 5 &&
(CheckWebLink(strBeCheck) || CheckMailLink(strBeCheck))) {
- if (!AppendToLinkList(start, nCount, strBeCheck)) {
- break;
- }
+ AppendToLinkList(start, nCount, strBeCheck);
}
}
start = ++pos;
@@ -2730,16 +2728,17 @@ FX_BOOL CPDF_LinkExtract::CheckMailLink(CFX_WideString& str) {
}
return TRUE;
}
-FX_BOOL CPDF_LinkExtract::AppendToLinkList(int start,
- int count,
- const CFX_WideString& strUrl) {
+
+void 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;
}
+
CFX_WideString CPDF_LinkExtract::GetURL(int index) const {
if (!m_IsParserd || index < 0 || index >= m_LinkList.GetSize()) {
return L"";