diff options
author | dsinclair <dsinclair@chromium.org> | 2016-04-12 16:55:56 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-12 16:55:56 -0700 |
commit | 17f382a50a7c4e5b6f14f76027a15de4ac17bc4c (patch) | |
tree | 337f45c03f9a6f40d30dc0820f29575fd55034b0 /xfa/fee/fx_wordbreak | |
parent | f1accf62715942e3f833fa57d0e6e1b70f51bae6 (diff) | |
download | pdfium-17f382a50a7c4e5b6f14f76027a15de4ac17bc4c.tar.xz |
Cleanup various IFX_ text interfaces.
This CL removes IFX_ArabicChar, IFX_RTFBreak, IFX_TxtBreak, IFX_WordBreak,
IFX_FormatString, and IFX_GSUBTable. References were updated to be the concrete
classes.
The CFX_GSUBTable was also removed as it is unused.
BUG=pdfium:468
Review URL: https://codereview.chromium.org/1882213002
Diffstat (limited to 'xfa/fee/fx_wordbreak')
-rw-r--r-- | xfa/fee/fx_wordbreak/fx_wordbreak.h | 53 | ||||
-rw-r--r-- | xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp | 3 | ||||
-rw-r--r-- | xfa/fee/fx_wordbreak/fx_wordbreak_impl.h | 41 |
3 files changed, 40 insertions, 57 deletions
diff --git a/xfa/fee/fx_wordbreak/fx_wordbreak.h b/xfa/fee/fx_wordbreak/fx_wordbreak.h index fb35230136..7192700b9a 100644 --- a/xfa/fee/fx_wordbreak/fx_wordbreak.h +++ b/xfa/fee/fx_wordbreak/fx_wordbreak.h @@ -9,22 +9,49 @@ #include "core/fxcrt/include/fx_string.h" #include "core/fxcrt/include/fx_system.h" +#include "xfa/fee/ifde_txtedtengine.h" -class IFX_CharIter; +class CFX_CharIter : public IFX_CharIter { + public: + CFX_CharIter(const CFX_WideString& wsText); + virtual void Release(); + virtual FX_BOOL Next(FX_BOOL bPrev = FALSE); + virtual FX_WCHAR GetChar(); + virtual void SetAt(int32_t nIndex); + virtual int32_t GetAt() const; + virtual FX_BOOL IsEOF(FX_BOOL bTail = TRUE) const; + virtual IFX_CharIter* Clone(); + + protected: + ~CFX_CharIter(); -class IFX_WordBreak { + private: + const CFX_WideString& m_wsText; + int32_t m_nIndex; +}; +class CFX_WordBreak { public: - virtual ~IFX_WordBreak() {} - virtual void Release() = 0; - virtual void Attach(IFX_CharIter* pIter) = 0; - virtual void Attach(const CFX_WideString& wsText) = 0; - virtual FX_BOOL Next(FX_BOOL bPrev) = 0; - virtual void SetAt(int32_t nIndex) = 0; - virtual int32_t GetWordPos() const = 0; - virtual int32_t GetWordLength() const = 0; - virtual void GetWord(CFX_WideString& wsWord) const = 0; - virtual FX_BOOL IsEOF(FX_BOOL bTail = TRUE) const = 0; + CFX_WordBreak(); + + void Release(); + void Attach(IFX_CharIter* pIter); + void Attach(const CFX_WideString& wsText); + FX_BOOL Next(FX_BOOL bPrev); + void SetAt(int32_t nIndex); + int32_t GetWordPos() const; + int32_t GetWordLength() const; + void GetWord(CFX_WideString& wsWord) const; + FX_BOOL IsEOF(FX_BOOL bTail) const; + + protected: + ~CFX_WordBreak(); + FX_BOOL FindNextBreakPos(IFX_CharIter* pIter, + FX_BOOL bPrev, + FX_BOOL bFromNext = TRUE); + + private: + IFX_CharIter* m_pPreIter; + IFX_CharIter* m_pCurIter; }; -IFX_WordBreak* FX_WordBreak_Create(); #endif // XFA_FEE_FX_WORDBREAK_FX_WORDBREAK_H_ diff --git a/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp b/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp index 3f6e240430..e77c5f14bf 100644 --- a/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp +++ b/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp @@ -233,6 +233,3 @@ FX_BOOL CFX_WordBreak::FindNextBreakPos(IFX_CharIter* pIter, } while (!pIter->IsEOF(!bPrev)); return TRUE; } -IFX_WordBreak* FX_WordBreak_Create() { - return new CFX_WordBreak; -} diff --git a/xfa/fee/fx_wordbreak/fx_wordbreak_impl.h b/xfa/fee/fx_wordbreak/fx_wordbreak_impl.h index 16c429b5fe..5cbd185602 100644 --- a/xfa/fee/fx_wordbreak/fx_wordbreak_impl.h +++ b/xfa/fee/fx_wordbreak/fx_wordbreak_impl.h @@ -33,46 +33,5 @@ enum FX_WordBreakProp { FX_WordBreakProp_ExtendNumLet, }; FX_WordBreakProp FX_GetWordBreakProperty(FX_WCHAR wcCodePoint); -class CFX_CharIter : public IFX_CharIter { - public: - CFX_CharIter(const CFX_WideString& wsText); - virtual void Release(); - virtual FX_BOOL Next(FX_BOOL bPrev = FALSE); - virtual FX_WCHAR GetChar(); - virtual void SetAt(int32_t nIndex); - virtual int32_t GetAt() const; - virtual FX_BOOL IsEOF(FX_BOOL bTail = TRUE) const; - virtual IFX_CharIter* Clone(); - - protected: - ~CFX_CharIter(); - - private: - const CFX_WideString& m_wsText; - int32_t m_nIndex; -}; -class CFX_WordBreak : public IFX_WordBreak { - public: - CFX_WordBreak(); - virtual void Release(); - virtual void Attach(IFX_CharIter* pIter); - virtual void Attach(const CFX_WideString& wsText); - virtual FX_BOOL Next(FX_BOOL bPrev); - virtual void SetAt(int32_t nIndex); - virtual int32_t GetWordPos() const; - virtual int32_t GetWordLength() const; - virtual void GetWord(CFX_WideString& wsWord) const; - virtual FX_BOOL IsEOF(FX_BOOL bTail) const; - - protected: - ~CFX_WordBreak(); - FX_BOOL FindNextBreakPos(IFX_CharIter* pIter, - FX_BOOL bPrev, - FX_BOOL bFromNext = TRUE); - - private: - IFX_CharIter* m_pPreIter; - IFX_CharIter* m_pCurIter; -}; #endif // XFA_FEE_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_ |