diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
| commit | 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 (patch) | |
| tree | e2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 /core/src/fpdftext | |
| parent | 63de95b699a4374982c2ddffced89e0da028fe4c (diff) | |
| download | pdfium-6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33.tar.xz | |
Merge to XFA: Kill CFX_Object.
Not just a simple merge, but changes to remove CFX_Object from XFA.
Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1087053002
Diffstat (limited to 'core/src/fpdftext')
| -rw-r--r-- | core/src/fpdftext/fpdf_text_search.cpp | 2 | ||||
| -rw-r--r-- | core/src/fpdftext/text_int.h | 6 | ||||
| -rw-r--r-- | core/src/fpdftext/txtproc.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/core/src/fpdftext/fpdf_text_search.cpp b/core/src/fpdftext/fpdf_text_search.cpp index 3bd6450303..bfd742f1ab 100644 --- a/core/src/fpdftext/fpdf_text_search.cpp +++ b/core/src/fpdftext/fpdf_text_search.cpp @@ -7,7 +7,7 @@ #include "../../include/fpdfapi/fpdf_pageobj.h" #include "../../include/fpdftext/fpdf_text.h" #include "../../include/fpdfapi/fpdf_page.h" -class CPDF_TextStream : public CFX_Object +class CPDF_TextStream { public: CPDF_TextStream(CFX_WideTextBuf& buffer, FX_BOOL bUseLF, CFX_PtrArray* pObjArray); diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h index 65ffddea0a..d0a434300b 100644 --- a/core/src/fpdftext/text_int.h +++ b/core/src/fpdftext/text_int.h @@ -6,7 +6,7 @@ #ifndef _PDF_TEXT_INT_H_ #define _PDF_TEXT_INT_H_ -class CPDF_TextParseOptions : public CFX_Object +class CPDF_TextParseOptions { public: CPDF_TextParseOptions(); @@ -27,7 +27,7 @@ class CPDF_DocProgressiveSearch; #define FPDFTEXT_MC_PASS 0 #define FPDFTEXT_MC_DONE 1 #define FPDFTEXT_MC_DELAY 2 -typedef struct _PAGECHAR_INFO: public CFX_Object { +typedef struct _PAGECHAR_INFO { int m_CharCode; FX_WCHAR m_Unicode; FX_FLOAT m_OriginX; @@ -172,7 +172,7 @@ private: CFX_RectArray m_resArray; FX_BOOL m_IsFind; }; -class CPDF_LinkExt: public CFX_Object +class CPDF_LinkExt { public: CPDF_LinkExt() {}; diff --git a/core/src/fpdftext/txtproc.h b/core/src/fpdftext/txtproc.h index 5a88ee52f9..abbe105305 100644 --- a/core/src/fpdftext/txtproc.h +++ b/core/src/fpdftext/txtproc.h @@ -6,14 +6,14 @@ #ifndef _PDF_TXTPROC_H_ #define _PDF_TXTPROC_H_ -class CTextColumn : public CFX_Object +class CTextColumn { public: FX_FLOAT m_AvgPos; int m_Count; int m_TextPos; }; -class CTextBox : public CFX_Object +class CTextBox { public: CFX_WideString m_Text; @@ -25,7 +25,7 @@ public: FX_FLOAT m_FontSizeV; CTextColumn* m_pColumn; }; -class CTextBaseLine : public CFX_Object +class CTextBaseLine { public: CTextBaseLine(); @@ -46,7 +46,7 @@ public: }; class CPDF_PageObject; class CPDF_TextObject; -class CTextPage : public CFX_Object +class CTextPage { public: CTextPage(); |