| Index: xfa/src/fee/src/fee/fde_txtedtblock.h
|
| diff --git a/xfa/src/fee/src/fee/fde_txtedtblock.h b/xfa/src/fee/src/fee/fde_txtedtblock.h
|
| index 9ae19ed61fd43ae42b88c00ab2a0063be84c2b78..2805fbd35a167448736f4d1872b48b6dec92fee7 100644
|
| --- a/xfa/src/fee/src/fee/fde_txtedtblock.h
|
| +++ b/xfa/src/fee/src/fee/fde_txtedtblock.h
|
| @@ -42,33 +42,33 @@ enum FDE_FORMAT_CARET_DIRECTION {
|
| class CFDE_TxtEdtBlock
|
| {
|
| public:
|
| - CFDE_TxtEdtBlock(CFDE_TxtEdtEngine * pEngine, const CFX_WideString &wsBlock, FX_INT32 nPosition);
|
| + CFDE_TxtEdtBlock(CFDE_TxtEdtEngine * pEngine, const CFX_WideString &wsBlock, int32_t nPosition);
|
| ~CFDE_TxtEdtBlock();
|
| void GetDisplayText(CFX_WideString &wsDisplay);
|
| - FX_INT32 GetLength() const;
|
| + int32_t GetLength() const;
|
| void GetBlockText(CFX_WideString &wsBlock);
|
| - FX_INT32 CountField() const;
|
| - void GetFieldText(FX_INT32 nIndex, CFX_WideString &wsField);
|
| - FX_INT32 GetFieldTextLength() const;
|
| + int32_t CountField() const;
|
| + void GetFieldText(int32_t nIndex, CFX_WideString &wsField);
|
| + int32_t GetFieldTextLength() const;
|
|
|
| - FX_INT32 GetPos() const;
|
| + int32_t GetPos() const;
|
| void GetRealText(CFX_WideString &wsText) const;
|
| void Backup();
|
| void Restore();
|
| - void SetIndex(FX_INT32 nIndex)
|
| + void SetIndex(int32_t nIndex)
|
| {
|
| m_nIndex = nIndex;
|
| }
|
| - FX_INT32 GetIndex() const
|
| + int32_t GetIndex() const
|
| {
|
| return m_nIndex;
|
| }
|
| private:
|
| CFDE_TxtEdtEngine * m_pEngine;
|
| - FX_INT32 m_nDisplayLength;
|
| - FX_INT32 m_nIndex;
|
| + int32_t m_nDisplayLength;
|
| + int32_t m_nIndex;
|
|
|
| - FX_INT32 m_nPosition;
|
| + int32_t m_nPosition;
|
| CFX_ArrayTemplate<CFDE_TxtEdtField*> m_FieldArr;
|
| CFX_ArrayTemplate<CFDE_TxtEdtField*> m_EditFieldArr;
|
| };
|
| @@ -78,14 +78,14 @@ public:
|
| CFDE_TxtEdtFieldFormatParser();
|
| ~CFDE_TxtEdtFieldFormatParser();
|
| FX_BOOL Parse(const CFX_WideString &wsFormat);
|
| - FX_INT32 CountItems() const;
|
| - void GetItem(FX_INT32 nIndex, CFX_WideString &wsKey, CFX_WideString &wsValue) const;
|
| + int32_t CountItems() const;
|
| + void GetItem(int32_t nIndex, CFX_WideString &wsKey, CFX_WideString &wsValue) const;
|
| private:
|
| typedef struct {
|
| - FX_INT32 nKeyStart;
|
| - FX_INT32 nKeyCount;
|
| - FX_INT32 nValStart;
|
| - FX_INT32 nValCount;
|
| + int32_t nKeyStart;
|
| + int32_t nKeyCount;
|
| + int32_t nValStart;
|
| + int32_t nValCount;
|
| } FDE_TXTEDTFORMATITEM, * FDE_LPTXTEDTFORMATITEM;
|
|
|
| CFX_WideString m_wsFormat;
|
| @@ -94,85 +94,85 @@ private:
|
| class CFDE_TxtEdtField
|
| {
|
| public:
|
| - static CFDE_TxtEdtField * Create(const CFX_WideString &wsField, FX_INT32 nIndex, CFDE_TxtEdtBlock * pBlock);
|
| + static CFDE_TxtEdtField * Create(const CFX_WideString &wsField, int32_t nIndex, CFDE_TxtEdtBlock * pBlock);
|
| virtual void Release();
|
| - virtual FX_INT32 Insert( FX_INT32 nIndex, const CFX_WideString &wsIns,
|
| - FX_INT32 &nCaret, FX_BOOL &bBefore);
|
| - virtual FX_INT32 Delete( FX_INT32 nIndex, FX_INT32 nCount,
|
| - CFX_WideString &wsDel, FX_INT32 &nCaret,
|
| + virtual int32_t Insert( int32_t nIndex, const CFX_WideString &wsIns,
|
| + int32_t &nCaret, FX_BOOL &bBefore);
|
| + virtual int32_t Delete( int32_t nIndex, int32_t nCount,
|
| + CFX_WideString &wsDel, int32_t &nCaret,
|
| FX_BOOL &bBefore);
|
| - virtual FX_INT32 Replace(FX_INT32 nIndex, FX_INT32 nCount,
|
| + virtual int32_t Replace(int32_t nIndex, int32_t nCount,
|
| const CFX_WideString &wsIns, CFX_WideString &wsDel,
|
| - FX_INT32 &nCaret, FX_BOOL &bBefore);
|
| + int32_t &nCaret, FX_BOOL &bBefore);
|
| virtual void GetDisplayText(CFX_WideString &wsDisplay);
|
| - virtual FX_INT32 GetDisplayLength();
|
| + virtual int32_t GetDisplayLength();
|
| virtual void GetFieldText(CFX_WideString &wsField);
|
| - virtual FX_INT32 GetFieldTextLength() const;
|
| - virtual FX_INT32 GetRealIndex(FX_INT32 nIndex) const;
|
| + virtual int32_t GetFieldTextLength() const;
|
| + virtual int32_t GetRealIndex(int32_t nIndex) const;
|
|
|
|
|
| - virtual FX_INT32 NormalizeCaretPos( FX_INT32 nIndex,
|
| + virtual int32_t NormalizeCaretPos( int32_t nIndex,
|
| FDE_FORMAT_CARET_DIRECTION eDirection = FDE_FORMAT_CARET_MIDDLE) const;
|
|
|
| - virtual FX_BOOL GetEditableRange(FX_INT32 &nBgn, FX_INT32 &nEnd) const;
|
| + virtual FX_BOOL GetEditableRange(int32_t &nBgn, int32_t &nEnd) const;
|
| virtual void Backup();
|
| virtual void Restore();
|
| virtual FX_BOOL IsFix() const
|
| {
|
| return FALSE;
|
| }
|
| - void SetIndex(FX_INT32 nIndex)
|
| + void SetIndex(int32_t nIndex)
|
| {
|
| m_nIndex = nIndex;
|
| }
|
| - FX_INT32 GetIndex() const
|
| + int32_t GetIndex() const
|
| {
|
| return m_nIndex;
|
| }
|
| - FX_INT32 GetBlockIndex() const
|
| + int32_t GetBlockIndex() const
|
| {
|
| return m_pBlock->GetIndex();
|
| }
|
| protected:
|
| - CFDE_TxtEdtField(FX_INT32 nIndex, CFDE_TxtEdtBlock * pBlock);
|
| + CFDE_TxtEdtField(int32_t nIndex, CFDE_TxtEdtBlock * pBlock);
|
| virtual ~CFDE_TxtEdtField() {}
|
| - virtual FX_INT32 Validate(const CFX_WideString & wsText) const;
|
| + virtual int32_t Validate(const CFX_WideString & wsText) const;
|
| virtual void GetNormalizedFieldText(CFX_WideString &wsField) const;
|
| - FX_INT32 m_nLength;
|
| + int32_t m_nLength;
|
| CFX_WideString m_wsField;
|
| CFX_WideString m_wsBackup;
|
| FX_WCHAR m_wcFill;
|
| FX_BOOL m_bReserveSpace;
|
| FX_BOOL m_bLeftAlignment;
|
| - FX_INT32 m_nIndex;
|
| + int32_t m_nIndex;
|
| CFDE_TxtEdtBlock * m_pBlock;
|
| };
|
| class CFDE_TxtEdtField_Integer : public CFDE_TxtEdtField
|
| {
|
| public:
|
| - CFDE_TxtEdtField_Integer(const CFX_WideString &wsField, FX_INT32 nIndex, CFDE_TxtEdtBlock * pBlock);
|
| + CFDE_TxtEdtField_Integer(const CFX_WideString &wsField, int32_t nIndex, CFDE_TxtEdtBlock * pBlock);
|
| protected:
|
| virtual ~CFDE_TxtEdtField_Integer() {}
|
| - virtual FX_INT32 Validate(const CFX_WideString &wsText) const;
|
| + virtual int32_t Validate(const CFX_WideString &wsText) const;
|
| private:
|
| FX_BOOL m_bSign;
|
| };
|
| class CFDE_TxtEdtField_Float : public CFDE_TxtEdtField
|
| {
|
| public:
|
| - CFDE_TxtEdtField_Float(const CFX_WideString &wsField, FX_INT32 nIndex, CFDE_TxtEdtBlock * pBlock);
|
| + CFDE_TxtEdtField_Float(const CFX_WideString &wsField, int32_t nIndex, CFDE_TxtEdtBlock * pBlock);
|
| protected:
|
| virtual ~CFDE_TxtEdtField_Float() {}
|
| - virtual FX_INT32 Validate(const CFX_WideString & wsText) const;
|
| + virtual int32_t Validate(const CFX_WideString & wsText) const;
|
| private:
|
| FX_BOOL m_bSigned;
|
| - FX_INT32 m_nIntPartlength;
|
| - FX_INT32 m_nDecPartLength;
|
| + int32_t m_nIntPartlength;
|
| + int32_t m_nDecPartLength;
|
| };
|
| class CFDE_TxtEdtField_Password : public CFDE_TxtEdtField
|
| {
|
| public:
|
| - CFDE_TxtEdtField_Password(const CFX_WideString &wsField, FX_INT32 nIndex, CFDE_TxtEdtBlock * pBlock);
|
| + CFDE_TxtEdtField_Password(const CFX_WideString &wsField, int32_t nIndex, CFDE_TxtEdtBlock * pBlock);
|
|
|
| protected:
|
| virtual ~CFDE_TxtEdtField_Password() {}
|
| @@ -183,33 +183,33 @@ private:
|
| class CFDE_TxtEdtField_String : public CFDE_TxtEdtField
|
| {
|
| public:
|
| - CFDE_TxtEdtField_String(const CFX_WideString &wsField, FX_INT32 nIndex, CFDE_TxtEdtBlock * pBlock);
|
| + CFDE_TxtEdtField_String(const CFX_WideString &wsField, int32_t nIndex, CFDE_TxtEdtBlock * pBlock);
|
| protected:
|
| virtual ~CFDE_TxtEdtField_String() {}
|
| };
|
| class CFDE_TxtEdtField_Fixed : public CFDE_TxtEdtField
|
| {
|
| public:
|
| - CFDE_TxtEdtField_Fixed(const CFX_WideString &wsField, FX_INT32 nIndex, CFDE_TxtEdtBlock * pBlock);
|
| - virtual FX_INT32 Insert( FX_INT32 nIndex, const CFX_WideString &wsIns,
|
| - FX_INT32 &nCaret, FX_BOOL &bBefore)
|
| + CFDE_TxtEdtField_Fixed(const CFX_WideString &wsField, int32_t nIndex, CFDE_TxtEdtBlock * pBlock);
|
| + virtual int32_t Insert( int32_t nIndex, const CFX_WideString &wsIns,
|
| + int32_t &nCaret, FX_BOOL &bBefore)
|
| {
|
| return FALSE;
|
| }
|
| - virtual FX_INT32 Delete( FX_INT32 nIndex, FX_INT32 nCount, CFX_WideString &wsDel,
|
| - FX_INT32 &nCaret, FX_BOOL &bBefore)
|
| + virtual int32_t Delete( int32_t nIndex, int32_t nCount, CFX_WideString &wsDel,
|
| + int32_t &nCaret, FX_BOOL &bBefore)
|
| {
|
| return FALSE;
|
| }
|
| - virtual FX_INT32 Replace(FX_INT32 nIndex, FX_INT32 nCount, const CFX_WideString &wsIns,
|
| - CFX_WideString &wsDel, FX_INT32 &nCaret, FX_BOOL &bBefore)
|
| + virtual int32_t Replace(int32_t nIndex, int32_t nCount, const CFX_WideString &wsIns,
|
| + CFX_WideString &wsDel, int32_t &nCaret, FX_BOOL &bBefore)
|
| {
|
| return FALSE;
|
| }
|
| virtual void GetDisplayText(CFX_WideString &wsDisplay);
|
| - virtual FX_INT32 NormalizeCaretPos( FX_INT32 nIndex,
|
| + virtual int32_t NormalizeCaretPos( int32_t nIndex,
|
| FDE_FORMAT_CARET_DIRECTION eDirection ) const;
|
| - virtual FX_BOOL GetEditableRange(FX_INT32 &nBgn, FX_INT32 &nEnd) const
|
| + virtual FX_BOOL GetEditableRange(int32_t &nBgn, int32_t &nEnd) const
|
| {
|
| return FALSE;
|
| }
|
|
|