summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-02-11 09:06:11 -0800
committerTom Sepez <tsepez@chromium.org>2016-02-11 09:06:11 -0800
commit6b90e983a9e3e7aee0c637a7b0c3c51f0dfc1faf (patch)
tree4a7ee0b7d6f381b7e3b4270bf74746db45715a76 /core/include
parente238549d212e97fe01dba3740949a98172c21454 (diff)
downloadpdfium-6b90e983a9e3e7aee0c637a7b0c3c51f0dfc1faf.tar.xz
Remove unused NormalizeString()
- NormalizeString() has 1 caller: - CTextBaseLine::WriteOutput(), which has only 1 caller: - CTextPage::WriteOutput(), which has only 1 caller: - PDF_GetPageText_Unicode(), which has only 1 caller: - PDF_GetPageText(), which has no callers. Removing this also makes CheckRotate(), NormalizeCompositeChar(), and CTextPage unused. Removing those makes CTextBaseline() unused. Removing that makes txtproc.h unused. PDF_GetTextStream_Unicode also unused. ... and so on until entire files can be removed. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1689843002 .
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fpdfapi/fpdf_pageobj.h1
-rw-r--r--core/include/fpdftext/fpdf_text.h66
2 files changed, 6 insertions, 61 deletions
diff --git a/core/include/fpdfapi/fpdf_pageobj.h b/core/include/fpdfapi/fpdf_pageobj.h
index 3336d0b957..7a3d390fed 100644
--- a/core/include/fpdfapi/fpdf_pageobj.h
+++ b/core/include/fpdfapi/fpdf_pageobj.h
@@ -455,7 +455,6 @@ class CPDF_TextObject : public CPDF_PageObject {
friend class CPDF_RenderStatus;
friend class CPDF_StreamContentParser;
friend class CPDF_TextRenderer;
- friend class CTextPage;
// CPDF_PageObject:
void CopyData(const CPDF_PageObject* pSrcObject) override;
diff --git a/core/include/fpdftext/fpdf_text.h b/core/include/fpdftext/fpdf_text.h
index 20efb9171f..140fe90bf7 100644
--- a/core/include/fpdftext/fpdf_text.h
+++ b/core/include/fpdftext/fpdf_text.h
@@ -17,27 +17,6 @@ class IPDF_ReflowedPage;
class IPDF_TextPage;
class IPDF_TextPageFind;
-#define PDF2TXT_AUTO_ROTATE 1
-#define PDF2TXT_AUTO_WIDTH 2
-#define PDF2TXT_KEEP_COLUMN 4
-#define PDF2TXT_USE_OCR 8
-#define PDF2TXT_INCLUDE_INVISIBLE 16
-void PDF_GetPageText(CFX_ByteStringArray& lines,
- CPDF_Document* pDoc,
- CPDF_Dictionary* pPage,
- int iMinWidth,
- FX_DWORD flags);
-void PDF_GetPageText_Unicode(CFX_WideStringArray& lines,
- CPDF_Document* pDoc,
- CPDF_Dictionary* pPage,
- int iMinWidth,
- FX_DWORD flags);
-void PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer,
- CPDF_Document* pDoc,
- CPDF_Dictionary* pPage,
- FX_DWORD flags);
-CFX_WideString PDF_GetFirstTextLine_Unicode(CPDF_Document* pDoc,
- CPDF_Dictionary* pPage);
#define CHAR_ERROR -1
#define CHAR_NORMAL 0
#define CHAR_GENERATED 1
@@ -55,7 +34,8 @@ struct FPDF_CHAR_INFO {
CFX_Matrix m_Matrix;
};
-typedef CFX_ArrayTemplate<CFX_FloatRect> CFX_RectArray;
+using CFX_RectArray = CFX_ArrayTemplate<CFX_FloatRect>;
+
#define FPDFTEXT_LRTB 0
#define FPDFTEXT_RLTB 1
#define FPDFTEXT_TBRL 2
@@ -63,112 +43,78 @@ typedef CFX_ArrayTemplate<CFX_FloatRect> CFX_RectArray;
#define FPDFTEXT_RIGHT 1
#define FPDFTEXT_UP -2
#define FPDFTEXT_DOWN 2
-#define FPDFTEXT_WRITINGMODE_UNKNOW 0
-#define FPDFTEXT_WRITINGMODE_LRTB 1
-#define FPDFTEXT_WRITINGMODE_RLTB 2
-#define FPDFTEXT_WRITINGMODE_TBRL 3
class IPDF_TextPage {
public:
static IPDF_TextPage* CreateTextPage(const CPDF_Page* pPage, int flags = 0);
static IPDF_TextPage* CreateReflowTextPage(IPDF_ReflowedPage* pRefPage);
-
virtual ~IPDF_TextPage() {}
virtual FX_BOOL ParseTextPage() = 0;
-
virtual bool IsParsed() const = 0;
-
virtual int CharIndexFromTextIndex(int TextIndex) const = 0;
-
virtual int TextIndexFromCharIndex(int CharIndex) const = 0;
-
virtual int CountChars() const = 0;
-
virtual void GetCharInfo(int index, FPDF_CHAR_INFO* info) const = 0;
-
virtual void GetRectArray(int start,
int nCount,
CFX_RectArray& rectArray) const = 0;
-
virtual int GetIndexAtPos(CPDF_Point point,
FX_FLOAT xTolerance,
FX_FLOAT yTolerance) const = 0;
-
virtual int GetIndexAtPos(FX_FLOAT x,
FX_FLOAT y,
FX_FLOAT xTolerance,
FX_FLOAT yTolerance) const = 0;
-
virtual CFX_WideString GetTextByRect(const CFX_FloatRect& rect) const = 0;
-
virtual void GetRectsArrayByRect(const CFX_FloatRect& rect,
CFX_RectArray& resRectArray) const = 0;
-
virtual int CountRects(int start, int nCount) = 0;
-
virtual void GetRect(int rectIndex,
FX_FLOAT& left,
FX_FLOAT& top,
FX_FLOAT& right,
FX_FLOAT& bottom) const = 0;
-
virtual FX_BOOL GetBaselineRotate(int rectIndex, int& Rotate) = 0;
-
virtual FX_BOOL GetBaselineRotate(const CFX_FloatRect& rect, int& Rotate) = 0;
-
virtual int CountBoundedSegments(FX_FLOAT left,
FX_FLOAT top,
FX_FLOAT right,
FX_FLOAT bottom,
FX_BOOL bContains = FALSE) = 0;
-
virtual void GetBoundedSegment(int index, int& start, int& count) const = 0;
-
virtual int GetWordBreak(int index, int direction) const = 0;
-
virtual CFX_WideString GetPageText(int start = 0, int nCount = -1) const = 0;
};
#define FPDFTEXT_MATCHCASE 0x00000001
#define FPDFTEXT_MATCHWHOLEWORD 0x00000002
#define FPDFTEXT_CONSECUTIVE 0x00000004
+
class IPDF_TextPageFind {
public:
- virtual ~IPDF_TextPageFind() {}
-
static IPDF_TextPageFind* CreatePageFind(const IPDF_TextPage* pTextPage);
+ virtual ~IPDF_TextPageFind() {}
- public:
virtual FX_BOOL FindFirst(const CFX_WideString& findwhat,
int flags,
int startPos = 0) = 0;
-
virtual FX_BOOL FindNext() = 0;
-
virtual FX_BOOL FindPrev() = 0;
-
virtual void GetRectArray(CFX_RectArray& rects) const = 0;
-
virtual int GetCurOrder() const = 0;
-
virtual int GetMatchedCount() const = 0;
};
+
class IPDF_LinkExtract {
public:
- virtual ~IPDF_LinkExtract() {}
-
static IPDF_LinkExtract* CreateLinkExtract();
+ virtual ~IPDF_LinkExtract() {}
virtual FX_BOOL ExtractLinks(const IPDF_TextPage* pTextPage) = 0;
-
- public:
virtual int CountLinks() const = 0;
-
virtual CFX_WideString GetURL(int index) const = 0;
-
virtual void GetBoundedSegment(int index, int& start, int& count) const = 0;
-
virtual void GetRects(int index, CFX_RectArray& rects) const = 0;
};