From 1b04bcc6af13669920700322052fc4ab4fad47a2 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 23 Oct 2015 12:37:42 -0700 Subject: XFA: Manually apply changes to fpdf_text.h and fx_font.h from master Driven off of https://codereview.chromium.org/1398383002/ Then make the other files as similar as possible. Note that this required changes to xfa/ code, and required adding some Set() methods. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1411833003 . --- core/src/fpdftext/fpdf_text_int.cpp | 2 +- core/src/fpdftext/text_int.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/fpdftext') diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index 8931acdde4..1b476d7b1f 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -2561,7 +2561,7 @@ CPDF_LinkExtract::~CPDF_LinkExtract() { DeleteLinkList(); } FX_BOOL CPDF_LinkExtract::ExtractLinks(const IPDF_TextPage* pTextPage) { - if (!pTextPage || !pTextPage->IsParsered()) { + if (!pTextPage || !pTextPage->IsParsed()) { return FALSE; } m_pTextPage = (const CPDF_TextPage*)pTextPage; diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h index 129ef0a8ae..59332e7d07 100644 --- a/core/src/fpdftext/text_int.h +++ b/core/src/fpdftext/text_int.h @@ -60,7 +60,7 @@ class CPDF_TextPage : public IPDF_TextPage { // IPDF_TextPage FX_BOOL ParseTextPage() override; void NormalizeObjects(FX_BOOL bNormalize) override; - FX_BOOL IsParsered() const override { return m_IsParsered; } + bool IsParsed() const override { return m_IsParsered; } int CharIndexFromTextIndex(int TextIndex) const override; int TextIndexFromCharIndex(int CharIndex) const override; int CountChars() const override; -- cgit v1.2.3