summaryrefslogtreecommitdiff
path: root/xfa/src/fee
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/src/fee')
-rw-r--r--xfa/src/fee/src/fee/fde_txtedtbuf.cpp5
-rw-r--r--xfa/src/fee/src/fee/fde_txtedtbuf.h2
-rw-r--r--xfa/src/fee/src/fee/fde_txtedtengine.cpp4
-rw-r--r--xfa/src/fee/src/fee/fde_txtedtengine.h10
-rw-r--r--xfa/src/fee/src/fee/fde_txtedtpage.cpp6
-rw-r--r--xfa/src/fee/src/fee/fde_txtedtpage.h12
-rw-r--r--xfa/src/fee/src/fee/fde_txtedtparag.cpp6
-rw-r--r--xfa/src/fee/src/fee/fde_txtedtparag.h7
-rw-r--r--xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp1
-rw-r--r--xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp6
10 files changed, 41 insertions, 18 deletions
diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp
index b05a691c1d..c57fff38c4 100644
--- a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp
+++ b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp
@@ -4,12 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fee/src/fee/fde_txtedtbuf.h"
+
#include <algorithm>
#include "xfa/src/fee/include/ifde_txtedtbuf.h"
#include "xfa/src/fee/include/ifde_txtedtengine.h"
-#include "xfa/src/fee/src/fee/fde_txtedtbuf.h"
-#include "xfa/src/foxitlib.h"
+
#define FDE_DEFCHUNKCOUNT 2
#define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9
#define FDE_TXTEDT_FORMATBLOCK_END 0xFFFB
diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.h b/xfa/src/fee/src/fee/fde_txtedtbuf.h
index c9f5fc40e1..1be60f8d15 100644
--- a/xfa/src/fee/src/fee/fde_txtedtbuf.h
+++ b/xfa/src/fee/src/fee/fde_txtedtbuf.h
@@ -7,6 +7,8 @@
#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_
#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_
+#include "xfa/src/fee/include/ifde_txtedtbuf.h"
+#include "xfa/src/fee/include/ifde_txtedtengine.h"
#include "xfa/src/fgas/include/fx_mem.h"
class IFX_CharIter;
diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/src/fee/fde_txtedtengine.cpp
index f8b5444b70..cc5548900a 100644
--- a/xfa/src/fee/src/fee/fde_txtedtengine.cpp
+++ b/xfa/src/fee/src/fee/fde_txtedtengine.cpp
@@ -4,16 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fee/src/fee/fde_txtedtengine.h"
+
#include <algorithm>
#include "xfa/src/fee/include/ifde_txtedtbuf.h"
#include "xfa/src/fee/include/ifde_txtedtengine.h"
#include "xfa/src/fee/include/ifde_txtedtpage.h"
#include "xfa/src/fee/src/fee/fde_txtedtbuf.h"
-#include "xfa/src/fee/src/fee/fde_txtedtengine.h"
#include "xfa/src/fee/src/fee/fde_txtedtparag.h"
#include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/foxitlib.h"
#define FDE_PAGEWIDTH_MAX 0xFFFF
#define FDE_TXTPLATESIZE (1024 * 12)
diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.h b/xfa/src/fee/src/fee/fde_txtedtengine.h
index 69390ddd2f..6c80903cf8 100644
--- a/xfa/src/fee/src/fee/fde_txtedtengine.h
+++ b/xfa/src/fee/src/fee/fde_txtedtengine.h
@@ -7,10 +7,13 @@
#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_
#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_
+#include "core/include/fxcrt/fx_string.h"
+#include "xfa/src/fee/include/ifde_txtedtbuf.h"
+#include "xfa/src/fee/include/ifde_txtedtengine.h"
+
class IFX_TxtBreak;
-class CFDE_TxtEdtParag;
class IFX_CharIter;
-class CFDE_TxtEdtEngine;
+class CFDE_TxtEdtParag;
class CFDE_TxtEdtDoRecord_Insert;
class CFDE_TxtEdtDoRecord_DeleteRange;
@@ -23,6 +26,7 @@ class IFDE_TxtEdtDoRecord {
virtual FX_BOOL Undo() = 0;
virtual void Serialize(CFX_ByteString& bsDoRecord) const = 0;
};
+
class CFDE_TxtEdtEngine : public IFDE_TxtEdtEngine {
friend class CFDE_TxtEdtDoRecord_Insert;
friend class CFDE_TxtEdtDoRecord_DeleteRange;
@@ -192,6 +196,7 @@ class CFDE_TxtEdtEngine : public IFDE_TxtEdtEngine {
FX_WCHAR m_wLineEnd;
FDE_TXTEDT_TEXTCHANGE_INFO m_ChangeInfo;
};
+
class CFDE_TxtEdtDoRecord_Insert : public IFDE_TxtEdtDoRecord {
public:
CFDE_TxtEdtDoRecord_Insert(const CFX_ByteStringC& bsDoRecord);
@@ -213,6 +218,7 @@ class CFDE_TxtEdtDoRecord_Insert : public IFDE_TxtEdtDoRecord {
int32_t m_nCaret;
CFX_WideString m_wsInsert;
};
+
class CFDE_TxtEdtDoRecord_DeleteRange : public IFDE_TxtEdtDoRecord {
public:
CFDE_TxtEdtDoRecord_DeleteRange(const CFX_ByteStringC& bsDoRecord);
diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.cpp b/xfa/src/fee/src/fee/fde_txtedtpage.cpp
index 65cd2ab182..40d0155b45 100644
--- a/xfa/src/fee/src/fee/fde_txtedtpage.cpp
+++ b/xfa/src/fee/src/fee/fde_txtedtpage.cpp
@@ -4,6 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fee/src/fee/fde_txtedtpage.h"
+
#include <algorithm>
#include "xfa/src/fee/include/fx_wordbreak.h"
@@ -12,10 +14,10 @@
#include "xfa/src/fee/include/ifde_txtedtpage.h"
#include "xfa/src/fee/src/fee/fde_txtedtbuf.h"
#include "xfa/src/fee/src/fee/fde_txtedtengine.h"
-#include "xfa/src/fee/src/fee/fde_txtedtpage.h"
#include "xfa/src/fee/src/fee/fde_txtedtparag.h"
-#include "xfa/src/foxitlib.h"
+
#define FDE_TXTEDT_TOLERANCE 0.1f
+
IFDE_TxtEdtPage* IFDE_TxtEdtPage::Create(IFDE_TxtEdtEngine* pEngine,
int32_t nIndex) {
return (IFDE_TxtEdtPage*)new CFDE_TxtEdtPage(pEngine, nIndex);
diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.h b/xfa/src/fee/src/fee/fde_txtedtpage.h
index 5f04e20611..cc7ff244b7 100644
--- a/xfa/src/fee/src/fee/fde_txtedtpage.h
+++ b/xfa/src/fee/src/fee/fde_txtedtpage.h
@@ -7,11 +7,17 @@
#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPAGE_H_
#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPAGE_H_
-class CFDE_TxtEdtEngine;
+#include "core/include/fxcrt/fx_coordinates.h"
+#include "core/include/fxcrt/fx_string.h"
+#include "xfa/src/fdp/include/fde_psr.h"
+#include "xfa/src/fee/include/ifde_txtedtpage.h"
+#include "xfa/src/fgas/include/fx_utl.h"
+
class IFX_CharIter;
+class CFDE_TxtEdtEngine;
class CFDE_TxtEdtPage;
-class CFDE_TxtEdtTextSet;
class CFDE_TxtEdtParag;
+
enum FDE_TXTEDT_CHARTYPE {
FDE_TXTEDT_CHARTYPE_Unknown = 0,
FDE_TXTEDT_CHARTYPE_Tab,
@@ -22,6 +28,7 @@ enum FDE_TXTEDT_CHARTYPE {
FDE_TXTEDT_CHARTYPE_Char,
FDE_TXTEDT_CHARTYPE_CJK,
};
+
inline FDE_TXTEDT_CHARTYPE FDE_GetEditSelCharType(FX_WCHAR wChar) {
if (wChar == 0x9) {
return FDE_TXTEDT_CHARTYPE_Tab;
@@ -87,6 +94,7 @@ class CFDE_TxtEdtTextSet : public IFDE_TextSet {
private:
CFDE_TxtEdtPage* m_pPage;
};
+
class CFDE_TxtEdtPage : public IFDE_TxtEdtPage {
public:
CFDE_TxtEdtPage(IFDE_TxtEdtEngine* pEngine, int32_t nLineIndex);
diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.cpp b/xfa/src/fee/src/fee/fde_txtedtparag.cpp
index af102969b7..83b2fdd270 100644
--- a/xfa/src/fee/src/fee/fde_txtedtparag.cpp
+++ b/xfa/src/fee/src/fee/fde_txtedtparag.cpp
@@ -4,13 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "xfa/src/fee/src/fee/fde_txtedtparag.h"
+
#include "xfa/src/fee/include/fx_wordbreak.h"
#include "xfa/src/fee/include/ifde_txtedtbuf.h"
#include "xfa/src/fee/include/ifde_txtedtengine.h"
#include "xfa/src/fee/src/fee/fde_txtedtbuf.h"
#include "xfa/src/fee/src/fee/fde_txtedtengine.h"
-#include "xfa/src/fee/src/fee/fde_txtedtparag.h"
-#include "xfa/src/foxitlib.h"
+#include "xfa/src/fgas/include/fx_tbk.h"
+
CFDE_TxtEdtParag::CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine)
: m_nCharStart(0),
m_nCharCount(0),
diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.h b/xfa/src/fee/src/fee/fde_txtedtparag.h
index 09c4aef2a3..d850f6fe93 100644
--- a/xfa/src/fee/src/fee/fde_txtedtparag.h
+++ b/xfa/src/fee/src/fee/fde_txtedtparag.h
@@ -7,12 +7,15 @@
#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPARAG_H_
#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPARAG_H_
+#include "xfa/src/fee/include/ifde_txtedtengine.h"
+
class CFDE_TxtEdtEngine;
-class CFDE_TxtEdtParag;
+
class CFDE_TxtEdtParag : public IFDE_TxtEdtParag {
public:
- CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine);
+ explicit CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine);
~CFDE_TxtEdtParag();
+
virtual int32_t GetTextLength() const { return m_nCharCount; }
virtual int32_t GetStartIndex() const { return m_nCharStart; }
virtual int32_t CountLines() const { return m_nLineCount; }
diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp
index 421e1a4610..155d1658c6 100644
--- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp
+++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp
@@ -5,7 +5,6 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h"
-#include "xfa/src/foxitlib.h"
#define FX_IsOdd(a) ((a)&1)
diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp
index 5596aac7bc..9d4cc5cf94 100644
--- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp
+++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp
@@ -5,13 +5,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h"
-#include "xfa/src/foxitlib.h"
-extern const FX_WORD gs_FX_WordBreak_Table[16] = {
+
+const FX_WORD gs_FX_WordBreak_Table[16] = {
0xFFFF, 0xFFF9, 0xFFFB, 0xFFFB, 0xFFFB, 0xFFFB, 0xEFBB, 0xE77B,
0xFFFB, 0xFFFB, 0xFFFB, 0xE77B, 0xE73B, 0xFFFB, 0xFFFB, 0xFFFB,
};
-extern const uint8_t gs_FX_WordBreak_CodePointProperties[(0xFFFF - 1) / 2 + 1] =
+const uint8_t gs_FX_WordBreak_CodePointProperties[(0xFFFF - 1) / 2 + 1] =
// NOLINTNEXTLINE
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00,
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 10:34:41 +0000