diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-11-20 14:55:19 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-11-20 14:55:19 -0800 |
commit | 87d7b4fc58b4ec5fe097de5862490c5720c3ec09 (patch) | |
tree | d1f71eee62f3a2c602a29c3fa95dece9d668d72d /core/src/fpdftext | |
parent | b8ec0a3405c6f184e4b9811870081295cae078c9 (diff) | |
download | pdfium-87d7b4fc58b4ec5fe097de5862490c5720c3ec09.tar.xz |
Make XFA core/ look like master (part N).
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1463173003 .
Diffstat (limited to 'core/src/fpdftext')
-rw-r--r-- | core/src/fpdftext/fpdf_text_int.cpp | 40 | ||||
-rw-r--r-- | core/src/fpdftext/text_int.h | 5 |
2 files changed, 1 insertions, 44 deletions
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index d467fb91e0..3342f38da9 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -83,22 +83,11 @@ CPDFText_ParseOptions::CPDFText_ParseOptions() 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; @@ -131,35 +120,6 @@ CPDF_TextPage::CPDF_TextPage(const CPDF_Page* pPage, int flags) (int)pPage->GetPageHeight(), 0); } -CPDF_TextPage::CPDF_TextPage(const CPDF_Page* pPage, - CPDFText_ParseOptions ParserOptions) - : m_ParseOptions(ParserOptions), - m_pPage(pPage), - m_charList(512), - m_TempCharList(50), - m_parserflag(0), - m_pPreTextObj(nullptr), - m_bIsParsed(false), - m_TextlineDir(-1), - m_CurlineRect(0, 0, 0, 0) { - m_TextBuf.EstimateSize(0, 10240); - pPage->GetDisplayMatrix(m_DisplayMatrix, 0, 0, (int)pPage->GetPageWidth(), - (int)pPage->GetPageHeight(), 0); -} - -CPDF_TextPage::CPDF_TextPage(const CPDF_PageObjects* pPage, int flags) - : m_pPage(pPage), - m_charList(512), - m_TempCharList(50), - m_parserflag(flags), - m_pPreTextObj(nullptr), - m_bIsParsed(false), - m_TextlineDir(-1), - m_CurlineRect(0, 0, 0, 0) { - m_TextBuf.EstimateSize(0, 10240); - CFX_FloatRect pageRect = pPage->CalcBoundingBox(); - m_DisplayMatrix = CFX_AffineMatrix(1, 0, 0, -1, pageRect.right, pageRect.top); -} void CPDF_TextPage::NormalizeObjects(FX_BOOL bNormalize) { m_ParseOptions.m_bNormalizeObjs = bNormalize; } diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h index 46249150ce..da4bf70ad1 100644 --- a/core/src/fpdftext/text_int.h +++ b/core/src/fpdftext/text_int.h @@ -8,7 +8,6 @@ #define CORE_SRC_FPDFTEXT_TEXT_INT_H_ #include "core/include/fpdftext/fpdf_text.h" -#include "core/include/fxcrt/fx_arb.h" #include "core/include/fxcrt/fx_basic.h" class CFX_BidiChar; @@ -52,9 +51,7 @@ typedef CFX_ArrayTemplate<PDFTEXT_Obj> LINEOBJ; class CPDF_TextPage : public IPDF_TextPage { public: - CPDF_TextPage(const CPDF_Page* pPage, int flags = 0); - CPDF_TextPage(const CPDF_PageObjects* pPage, int flags = 0); - CPDF_TextPage(const CPDF_Page* pPage, CPDFText_ParseOptions ParserOptions); + CPDF_TextPage(const CPDF_Page* pPage, int flags); ~CPDF_TextPage() override {} // IPDF_TextPage |