From 7386e293a2b67794e6af02d0b71020a4bc987ce0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 20 Nov 2015 09:35:06 -0800 Subject: Reduce diffs with master in core This week's version. Mostly whitespace, but takes the master version of core/src/fxge/ge/fx_ge_text.cpp verbatim. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1462923004 . --- core/src/fpdftext/fpdf_text_int.cpp | 7 ++++++- core/src/fpdftext/text_int.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'core/src/fpdftext') diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index 0754757940..d467fb91e0 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -82,26 +82,32 @@ CPDFText_ParseOptions::CPDFText_ParseOptions() : m_bGetCharCodeOnly(FALSE), m_bNormalizeObjs(TRUE), m_bOutputHyphen(FALSE) {} + IPDF_TextPage* IPDF_TextPage::CreateTextPage( const CPDF_Page* pPage, CPDFText_ParseOptions ParserOptions) { return new CPDF_TextPage(pPage, ParserOptions); } + IPDF_TextPage* IPDF_TextPage::CreateTextPage(const CPDF_Page* pPage, int flags) { return new CPDF_TextPage(pPage, flags); } + IPDF_TextPage* IPDF_TextPage::CreateTextPage(const CPDF_PageObjects* pObjs, int flags) { return new CPDF_TextPage(pObjs, flags); } + IPDF_TextPageFind* IPDF_TextPageFind::CreatePageFind( const IPDF_TextPage* pTextPage) { return pTextPage ? new CPDF_TextPageFind(pTextPage) : nullptr; } + IPDF_LinkExtract* IPDF_LinkExtract::CreateLinkExtract() { return new CPDF_LinkExtract(); } + #define TEXT_BLANK_CHAR L' ' #define TEXT_LINEFEED_CHAR L'\n' #define TEXT_RETURN_CHAR L'\r' @@ -1391,7 +1397,6 @@ void CPDF_TextPage::ProcessMarkedContent(PDFTEXT_Obj Obj) { for (n = 0; n < nContentMark; n++) { CPDF_ContentMarkItem& item = pMarkData->GetItem(n); CFX_ByteString tagStr = (CFX_ByteString)item.GetName(); - pDict = ToDictionary(static_cast(item.GetParam())); CPDF_String* temp = ToString(pDict ? pDict->GetElement(FX_BSTRC("ActualText")) : nullptr); diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h index 576ab7ca9a..46249150ce 100644 --- a/core/src/fpdftext/text_int.h +++ b/core/src/fpdftext/text_int.h @@ -195,6 +195,7 @@ class CPDF_TextPageFind : public IPDF_TextPageFind { CFX_RectArray m_resArray; FX_BOOL m_IsFind; }; + class CPDF_LinkExt { public: CPDF_LinkExt() {} -- cgit v1.2.3