summaryrefslogtreecommitdiff
path: root/core/src/fpdftext
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/fpdftext')
-rw-r--r--core/src/fpdftext/fpdf_text.cpp6
-rw-r--r--core/src/fpdftext/fpdf_text_search.cpp10
-rw-r--r--core/src/fpdftext/text_int.h14
3 files changed, 20 insertions, 10 deletions
diff --git a/core/src/fpdftext/fpdf_text.cpp b/core/src/fpdftext/fpdf_text.cpp
index f9e1e02cf1..0659024d90 100644
--- a/core/src/fpdftext/fpdf_text.cpp
+++ b/core/src/fpdftext/fpdf_text.cpp
@@ -791,10 +791,6 @@ void PDF_GetPageText(CFX_ByteStringArray& lines,
lines.Add(str);
}
}
-extern void _PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer,
- CPDF_PageObjects* pPage,
- FX_BOOL bUseLF,
- CFX_PtrArray* pObjArray);
void PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer,
CPDF_Document* pDoc,
CPDF_Dictionary* pPage,
@@ -806,5 +802,5 @@ void PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer,
options.m_bTextOnly = TRUE;
options.m_bSeparateForm = FALSE;
page.ParseContent(&options);
- _PDF_GetTextStream_Unicode(buffer, &page, TRUE, NULL);
+ GetTextStream_Unicode(buffer, &page, TRUE, NULL);
}
diff --git a/core/src/fpdftext/fpdf_text_search.cpp b/core/src/fpdftext/fpdf_text_search.cpp
index 95839b54fb..6640018de0 100644
--- a/core/src/fpdftext/fpdf_text_search.cpp
+++ b/core/src/fpdftext/fpdf_text_search.cpp
@@ -6,6 +6,8 @@
#include "../../include/fpdfapi/fpdf_pageobj.h"
#include "../../include/fpdfapi/fpdf_page.h"
+#include "text_int.h"
+
class CPDF_TextStream {
public:
CPDF_TextStream(CFX_WideTextBuf& buffer,
@@ -293,10 +295,10 @@ FX_BOOL CPDF_TextStream::ProcessObject(const CPDF_TextObject* pObj,
}
return FALSE;
}
-void _PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer,
- CPDF_PageObjects* pPage,
- FX_BOOL bUseLF,
- CFX_PtrArray* pObjArray) {
+void GetTextStream_Unicode(CFX_WideTextBuf& buffer,
+ CPDF_PageObjects* pPage,
+ FX_BOOL bUseLF,
+ CFX_PtrArray* pObjArray) {
CPDF_TextStream textstream(buffer, bUseLF, pObjArray);
FX_POSITION pos = pPage->GetFirstObjectPosition();
while (pos) {
diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h
index 24b89f1681..7d69492a21 100644
--- a/core/src/fpdftext/text_int.h
+++ b/core/src/fpdftext/text_int.h
@@ -7,9 +7,16 @@
#ifndef CORE_SRC_FPDFTEXT_TEXT_INT_H_
#define CORE_SRC_FPDFTEXT_TEXT_INT_H_
+#include "../../include/fpdftext/fpdf_text.h"
+#include "../../include/fxcrt/fx_arb.h"
+#include "../../include/fxcrt/fx_basic.h"
+
+class CFX_BidiChar;
+class CPDF_DocProgressiveSearch;
+class CPDF_FormObject;
class CPDF_LinkExtract;
class CPDF_TextPageFind;
-class CPDF_DocProgressiveSearch;
+
#define FPDFTEXT_CHAR_ERROR -1
#define FPDFTEXT_CHAR_NORMAL 0
#define FPDFTEXT_CHAR_GENERATED 1
@@ -19,6 +26,7 @@ class CPDF_DocProgressiveSearch;
#define FPDFTEXT_MC_PASS 0
#define FPDFTEXT_MC_DONE 1
#define FPDFTEXT_MC_DELAY 2
+
typedef struct _PAGECHAR_INFO {
int m_CharCode;
FX_WCHAR m_Unicode;
@@ -231,5 +239,9 @@ class CPDF_LinkExtract : public IPDF_LinkExtract {
FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_WCHAR* pDst);
void NormalizeString(CFX_WideString& str);
void NormalizeCompositeChar(FX_WCHAR wChar, CFX_WideString& sDest);
+void GetTextStream_Unicode(CFX_WideTextBuf& buffer,
+ CPDF_PageObjects* pPage,
+ FX_BOOL bUseLF,
+ CFX_PtrArray* pObjArray);
#endif // CORE_SRC_FPDFTEXT_TEXT_INT_H_