diff options
author | Lei Zhang <thestig@chromium.org> | 2015-10-02 10:29:50 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-10-02 10:29:50 -0700 |
commit | dcfa0ba2928072c962fe8835d1a2ccd309eafbbd (patch) | |
tree | 114f50642abd278f31ff677b8c30357933fa01d6 /core/src | |
parent | 095a83c59120c108d9ac6f0ab71fd3faa5eea810 (diff) | |
download | pdfium-dcfa0ba2928072c962fe8835d1a2ccd309eafbbd.tar.xz |
Turn a couple functions that always return true to return void.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1386463003 .
Diffstat (limited to 'core/src')
-rw-r--r-- | core/src/fpdftext/fpdf_text_int.cpp | 13 | ||||
-rw-r--r-- | core/src/fpdftext/text_int.h | 2 | ||||
-rw-r--r-- | core/src/fxge/ge/fx_ge_font.cpp | 15 |
3 files changed, 14 insertions, 16 deletions
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index b81d967776..906554dde2 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -2574,9 +2574,7 @@ void CPDF_LinkExtract::ParseLink() { } if (nCount > 5 && (CheckWebLink(strBeCheck) || CheckMailLink(strBeCheck))) { - if (!AppendToLinkList(start, nCount, strBeCheck)) { - break; - } + AppendToLinkList(start, nCount, strBeCheck); } } start = ++pos; @@ -2690,16 +2688,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_bIsParsed || 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 0b3b9c8ae0..0efe805f26 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; diff --git a/core/src/fxge/ge/fx_ge_font.cpp b/core/src/fxge/ge/fx_ge_font.cpp index f739409d76..a6ababf572 100644 --- a/core/src/fxge/ge/fx_ge_font.cpp +++ b/core/src/fxge/ge/fx_ge_font.cpp @@ -48,13 +48,13 @@ void CFX_Font::DeleteFace() { FXFT_Done_Face(m_Face); m_Face = NULL; } -FX_BOOL CFX_Font::LoadSubst(const CFX_ByteString& face_name, - FX_BOOL bTrueType, - FX_DWORD flags, - int weight, - int italic_angle, - int CharsetCP, - FX_BOOL bVertical) { +void CFX_Font::LoadSubst(const CFX_ByteString& face_name, + FX_BOOL bTrueType, + FX_DWORD flags, + int weight, + int italic_angle, + int CharsetCP, + FX_BOOL bVertical) { m_bEmbedded = FALSE; m_bVertical = bVertical; m_pSubstFont = new CFX_SubstFont; @@ -71,7 +71,6 @@ FX_BOOL CFX_Font::LoadSubst(const CFX_ByteString& face_name, m_pFontData = FXFT_Get_Face_Stream_Base(m_Face); m_dwSize = FXFT_Get_Face_Stream_Size(m_Face); } - return TRUE; } int CFX_Font::GetGlyphWidth(FX_DWORD glyph_index) { |