diff options
author | Lei Zhang <thestig@chromium.org> | 2015-10-02 12:28:32 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-10-02 12:28:32 -0700 |
commit | ea5c4d3929928b318b339231804580d93a6e5f21 (patch) | |
tree | e4716d176a1326e823ff075ffad74e1236206de0 /core/src/fpdftext | |
parent | 9e75b82d5d18f748b260202fed5a59682631475c (diff) | |
download | pdfium-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')
-rw-r--r-- | core/src/fpdftext/fpdf_text_int.cpp | 13 | ||||
-rw-r--r-- | core/src/fpdftext/text_int.h | 2 |
2 files changed, 7 insertions, 8 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""; diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h index 7d69492a21..129ef0a8ae 100644 --- a/core/src/fpdftext/text_int.h +++ b/core/src/fpdftext/text_int.h @@ -227,7 +227,7 @@ class CPDF_LinkExtract : public IPDF_LinkExtract { void DeleteLinkList(); FX_BOOL CheckWebLink(CFX_WideString& strBeCheck); FX_BOOL CheckMailLink(CFX_WideString& str); - FX_BOOL AppendToLinkList(int start, int count, const CFX_WideString& strUrl); + void AppendToLinkList(int start, int count, const CFX_WideString& strUrl); private: LINK_InfoArray m_LinkList; |