summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/include/fxge/fx_font.h14
-rw-r--r--core/src/fpdftext/fpdf_text_int.cpp13
-rw-r--r--core/src/fpdftext/text_int.h2
-rw-r--r--core/src/fxge/ge/fx_ge_font.cpp15
4 files changed, 21 insertions, 23 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index b38b1a1713..8f6db1eb8b 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -60,13 +60,13 @@ class CFX_Font {
CFX_Font();
~CFX_Font();
- FX_BOOL LoadSubst(const CFX_ByteString& face_name,
- FX_BOOL bTrueType,
- FX_DWORD flags,
- int weight,
- int italic_angle,
- int CharsetCP,
- FX_BOOL bVertical = FALSE);
+ void LoadSubst(const CFX_ByteString& face_name,
+ FX_BOOL bTrueType,
+ FX_DWORD flags,
+ int weight,
+ int italic_angle,
+ int CharsetCP,
+ FX_BOOL bVertical = FALSE);
FX_BOOL LoadEmbedded(const uint8_t* data, FX_DWORD size);
FXFT_Face GetFace() const { return m_Face; }
const CFX_SubstFont* GetSubstFont() const { return m_pSubstFont; }
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) {