Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.

Nearly automatic merge + re-run script on new files.

Original Review URL: https://codereview.chromium.org/1180593004.
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1174303002.

3 files changed, 29 insertions, 29 deletions

diff --git a/xfa/src/fee/include/ifde_txtedtengine.h b/xfa/src/fee/include/ifde_txtedtengine.h
index 4dcfa69cc8..0ee175380e 100644
--- a/xfa/src/fee/include/ifde_txtedtengine.h
+++ b/xfa/src/fee/include/ifde_txtedtengine.h
@@ -147,7 +147,7 @@ public:
     virtual FX_BOOL	On_PageLoad(IFDE_TxtEdtEngine * pEdit, int32_t nPageIndex, int32_t nPurpose) = 0;

     virtual FX_BOOL	On_PageUnload(IFDE_TxtEdtEngine * pEdit, int32_t nPageIndex, int32_t nPurpose) = 0;

     virtual FX_BOOL	On_PageChange(IFDE_TxtEdtEngine * pEdit, int32_t nPageIndex) = 0;

-    virtual void	On_AddDoRecord(IFDE_TxtEdtEngine * pEdit, FX_BSTR bsDoRecord) = 0;

+    virtual void	On_AddDoRecord(IFDE_TxtEdtEngine * pEdit, const CFX_ByteStringC& bsDoRecord) = 0;

     virtual FX_BOOL On_ValidateField(IFDE_TxtEdtEngine * pEdit, int32_t nBlockIndex, int32_t nFieldIndex, \

                                      const CFX_WideString &wsFieldText, int32_t nCharIndex) = 0;

     virtual FX_BOOL On_ValidateBlock(IFDE_TxtEdtEngine * pEdit, int32_t nBlockIndex) = 0;

@@ -210,8 +210,8 @@ public:
     virtual int32_t				GetSelRange(int32_t nIndex, int32_t &nStart) = 0;

     virtual void					ClearSelection() = 0;

 

-    virtual FX_BOOL					Redo(FX_BSTR bsRedo) = 0;

-    virtual FX_BOOL					Undo(FX_BSTR bsUndo) = 0;

+    virtual FX_BOOL					Redo(const CFX_ByteStringC& bsRedo) = 0;

+    virtual FX_BOOL					Undo(const CFX_ByteStringC& bsUndo) = 0;

 

     virtual int32_t				StartLayout() = 0;

     virtual int32_t				DoLayout(IFX_Pause *pPause) = 0;

diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/src/fee/fde_txtedtengine.cpp
index 9546a2b270..1f4bd62f28 100644
--- a/xfa/src/fee/src/fee/fde_txtedtengine.cpp
+++ b/xfa/src/fee/src/fee/fde_txtedtengine.cpp
@@ -1033,7 +1033,7 @@ void CFDE_TxtEdtEngine::ClearSelection()
         m_Param.pEventSink->On_SelChanged(this);

     }

 }

-FX_BOOL CFDE_TxtEdtEngine::Redo(FX_BSTR bsRedo)

+FX_BOOL CFDE_TxtEdtEngine::Redo(const CFX_ByteStringC& bsRedo)

 {

     if (IsLocked()) {

         return FALSE;

@@ -1050,7 +1050,7 @@ FX_BOOL CFDE_TxtEdtEngine::Redo(FX_BSTR bsRedo)
     pDoRecord->Release();

     return bOK;

 }

-FX_BOOL CFDE_TxtEdtEngine::Undo(FX_BSTR bsUndo)

+FX_BOOL CFDE_TxtEdtEngine::Undo(const CFX_ByteStringC& bsUndo)

 {

     if (IsLocked()) {

         return FALSE;

@@ -2396,7 +2396,7 @@ void CFDE_TxtEdtEngine::DeleteSelect()
         return;

     }

 }

-IFDE_TxtEdtDoRecord * IFDE_TxtEdtDoRecord::Create(FX_BSTR bsDoRecord)

+IFDE_TxtEdtDoRecord * IFDE_TxtEdtDoRecord::Create(const CFX_ByteStringC& bsDoRecord)

 {

     const FX_CHAR*	lpBuf	=	bsDoRecord.GetCStr();

     int32_t	nType	=	*((int32_t*)lpBuf);

@@ -2418,7 +2418,7 @@ IFDE_TxtEdtDoRecord * IFDE_TxtEdtDoRecord::Create(FX_BSTR bsDoRecord)
     }

     return NULL;

 }

-CFDE_TxtEdtDoRecord_Insert::CFDE_TxtEdtDoRecord_Insert(FX_BSTR bsDoRecord)

+CFDE_TxtEdtDoRecord_Insert::CFDE_TxtEdtDoRecord_Insert(const CFX_ByteStringC& bsDoRecord)

 {

     Deserialize(bsDoRecord);

 }

@@ -2477,7 +2477,7 @@ void CFDE_TxtEdtDoRecord_Insert::Serialize(CFX_ByteString &bsDoRecord) const
     FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength);

     bsDoRecord.ReleaseBuffer(nLength);

 }

-void CFDE_TxtEdtDoRecord_Insert::Deserialize(FX_BSTR bsDoRecord)

+void CFDE_TxtEdtDoRecord_Insert::Deserialize(const CFX_ByteStringC& bsDoRecord)

 {

     CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength());

     int32_t nType = 0;

@@ -2489,7 +2489,7 @@ void CFDE_TxtEdtDoRecord_Insert::Deserialize(FX_BSTR bsDoRecord)
     ArchiveLoader >> m_nCaret;

     ArchiveLoader >> m_wsInsert;

 }

-CFDE_TxtEdtDoRecord_DeleteRange::CFDE_TxtEdtDoRecord_DeleteRange(FX_BSTR bsDoRecord)

+CFDE_TxtEdtDoRecord_DeleteRange::CFDE_TxtEdtDoRecord_DeleteRange(const CFX_ByteStringC& bsDoRecord)

 {

     Deserialize(bsDoRecord);

 }

@@ -2557,7 +2557,7 @@ void CFDE_TxtEdtDoRecord_DeleteRange::Serialize(CFX_ByteString &bsDoRecord) cons
     FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength);

     bsDoRecord.ReleaseBuffer(nLength);

 }

-void CFDE_TxtEdtDoRecord_DeleteRange::Deserialize(FX_BSTR bsDoRecord)

+void CFDE_TxtEdtDoRecord_DeleteRange::Deserialize(const CFX_ByteStringC& bsDoRecord)

 {

     CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength());

     int32_t nType = 0;

@@ -2572,7 +2572,7 @@ void CFDE_TxtEdtDoRecord_DeleteRange::Deserialize(FX_BSTR bsDoRecord)
     ArchiveLoader >> m_wsRange;

 }

 #ifdef FDE_USEFORMATBLOCK

-CFDE_TxtEdtDoRecord_FieldInsert::CFDE_TxtEdtDoRecord_FieldInsert(FX_BSTR bsDoRecord)

+CFDE_TxtEdtDoRecord_FieldInsert::CFDE_TxtEdtDoRecord_FieldInsert(const CFX_ByteStringC& bsDoRecord)

 {

     Deserialize(bsDoRecord);

 }

@@ -2649,7 +2649,7 @@ void CFDE_TxtEdtDoRecord_FieldInsert::Serialize(CFX_ByteString &bsDoRecord) cons
     FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength);

     bsDoRecord.ReleaseBuffer(nLength);

 }

-void CFDE_TxtEdtDoRecord_FieldInsert::Deserialize(FX_BSTR bsDoRecord)

+void CFDE_TxtEdtDoRecord_FieldInsert::Deserialize(const CFX_ByteStringC& bsDoRecord)

 {

     CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength());

     int32_t nType = 0;

@@ -2669,7 +2669,7 @@ void CFDE_TxtEdtDoRecord_FieldInsert::Deserialize(FX_BSTR bsDoRecord)
     ArchiveLoader >> m_wsIns;

     ArchiveLoader >> m_bSel;

 }

-CFDE_TxtEdtDoRecord_FieldDelete::CFDE_TxtEdtDoRecord_FieldDelete(FX_BSTR bsDoRecord)

+CFDE_TxtEdtDoRecord_FieldDelete::CFDE_TxtEdtDoRecord_FieldDelete(const CFX_ByteStringC& bsDoRecord)

 {

     Deserialize(bsDoRecord);

 }

@@ -2746,7 +2746,7 @@ void CFDE_TxtEdtDoRecord_FieldDelete::Serialize(CFX_ByteString &bsDoRecord) cons
     FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength);

     bsDoRecord.ReleaseBuffer(nLength);

 }

-void CFDE_TxtEdtDoRecord_FieldDelete::Deserialize(FX_BSTR bsDoRecord)

+void CFDE_TxtEdtDoRecord_FieldDelete::Deserialize(const CFX_ByteStringC& bsDoRecord)

 {

     CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength());

     int32_t nType = 0;

@@ -2766,7 +2766,7 @@ void CFDE_TxtEdtDoRecord_FieldDelete::Deserialize(FX_BSTR bsDoRecord)
     ArchiveLoader >> m_wsDel;

     ArchiveLoader >> m_bSel;

 }

-CFDE_TxtEdtDoRecord_FieldReplace::CFDE_TxtEdtDoRecord_FieldReplace(FX_BSTR bsDoRecord)

+CFDE_TxtEdtDoRecord_FieldReplace::CFDE_TxtEdtDoRecord_FieldReplace(const CFX_ByteStringC& bsDoRecord)

 {

     Deserialize(bsDoRecord);

 }

@@ -2847,7 +2847,7 @@ void CFDE_TxtEdtDoRecord_FieldReplace::Serialize(CFX_ByteString &bsDoRecord) con
     FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength);

     bsDoRecord.ReleaseBuffer(nLength);

 }

-void CFDE_TxtEdtDoRecord_FieldReplace::Deserialize(FX_BSTR bsDoRecord)

+void CFDE_TxtEdtDoRecord_FieldReplace::Deserialize(const CFX_ByteStringC& bsDoRecord)

 {

     CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength());

     int32_t nType = 0;

diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.h b/xfa/src/fee/src/fee/fde_txtedtengine.h
index 9b555131f6..c482f5b52c 100644
--- a/xfa/src/fee/src/fee/fde_txtedtengine.h
+++ b/xfa/src/fee/src/fee/fde_txtedtengine.h
@@ -29,7 +29,7 @@ class CFDE_TxtEdtDoRecord_FieldReplace;
 class IFDE_TxtEdtDoRecord

 {

 public:

-    static IFDE_TxtEdtDoRecord * Create(FX_BSTR bsDoRecord);

+    static IFDE_TxtEdtDoRecord * Create(const CFX_ByteStringC& bsDoRecord);

     virtual void	Release() = 0;

     virtual FX_BOOL Redo() = 0;

     virtual FX_BOOL Undo() = 0;

@@ -105,8 +105,8 @@ public:
     virtual int32_t	GetSelRange(int32_t nIndex, int32_t &nStart);

     virtual void		ClearSelection();

 

-    virtual FX_BOOL		Redo(FX_BSTR bsRedo);

-    virtual FX_BOOL		Undo(FX_BSTR bsUndo);

+    virtual FX_BOOL		Redo(const CFX_ByteStringC& bsRedo);

+    virtual FX_BOOL		Undo(const CFX_ByteStringC& bsUndo);

 

     virtual int32_t	StartLayout();

     virtual int32_t	DoLayout(IFX_Pause *pPause);

@@ -200,7 +200,7 @@ private:
 class CFDE_TxtEdtDoRecord_Insert : public IFDE_TxtEdtDoRecord

 {

 public:

-    CFDE_TxtEdtDoRecord_Insert(FX_BSTR bsDoRecord);

+    CFDE_TxtEdtDoRecord_Insert(const CFX_ByteStringC& bsDoRecord);

     CFDE_TxtEdtDoRecord_Insert(	CFDE_TxtEdtEngine * pEngine,

                                 int32_t nCaret,

                                 const FX_WCHAR* lpText,

@@ -211,7 +211,7 @@ public:
     virtual void	Serialize(CFX_ByteString &bsDoRecord) const;

 protected:

     ~CFDE_TxtEdtDoRecord_Insert();

-    void			Deserialize(FX_BSTR bsDoRecord);

+    void			Deserialize(const CFX_ByteStringC& bsDoRecord);

 private:

     CFDE_TxtEdtEngine *	m_pEngine;

     int32_t			m_nCaret;

@@ -220,7 +220,7 @@ private:
 class CFDE_TxtEdtDoRecord_DeleteRange : public IFDE_TxtEdtDoRecord

 {

 public:

-    CFDE_TxtEdtDoRecord_DeleteRange(FX_BSTR bsDoRecord);

+    CFDE_TxtEdtDoRecord_DeleteRange(const CFX_ByteStringC& bsDoRecord);

     CFDE_TxtEdtDoRecord_DeleteRange(CFDE_TxtEdtEngine * pEngine,

                                     int32_t nIndex,

                                     int32_t nCaret,

@@ -232,7 +232,7 @@ public:
     virtual void	Serialize(CFX_ByteString &bsDoRecord) const;

 protected:

     ~CFDE_TxtEdtDoRecord_DeleteRange();

-    void			Deserialize(FX_BSTR bsDoRecord);

+    void			Deserialize(const CFX_ByteStringC& bsDoRecord);

 private:

     CFDE_TxtEdtEngine *	m_pEngine;

     FX_BOOL				m_bSel;

@@ -244,7 +244,7 @@ private:
 class CFDE_TxtEdtDoRecord_FieldInsert : public IFDE_TxtEdtDoRecord

 {

 public:

-    CFDE_TxtEdtDoRecord_FieldInsert(FX_BSTR bsDoRecord);

+    CFDE_TxtEdtDoRecord_FieldInsert(const CFX_ByteStringC& bsDoRecord);

     CFDE_TxtEdtDoRecord_FieldInsert(CFDE_TxtEdtEngine * pEngine,

                                     int32_t nCaret,

                                     CFDE_TxtEdtField * pField,

@@ -260,7 +260,7 @@ public:
     virtual void	Serialize(CFX_ByteString &bsDoRecord) const;

 protected:

     ~CFDE_TxtEdtDoRecord_FieldInsert();

-    void	Deserialize(FX_BSTR bsDoRecord);

+    void	Deserialize(const CFX_ByteStringC& bsDoRecord);

 

 private:

     CFDE_TxtEdtEngine *	m_pEngine;

@@ -276,7 +276,7 @@ private:
 class CFDE_TxtEdtDoRecord_FieldDelete : public IFDE_TxtEdtDoRecord

 {

 public:

-    CFDE_TxtEdtDoRecord_FieldDelete(FX_BSTR bsDoRecord);

+    CFDE_TxtEdtDoRecord_FieldDelete(const CFX_ByteStringC& bsDoRecord);

     CFDE_TxtEdtDoRecord_FieldDelete(CFDE_TxtEdtEngine * pEngine,

                                     int32_t nCaret,

                                     CFDE_TxtEdtField * pField,

@@ -292,7 +292,7 @@ public:
     virtual void	Serialize(CFX_ByteString &bsDoRecord) const;

 protected:

     ~CFDE_TxtEdtDoRecord_FieldDelete();

-    void	Deserialize(FX_BSTR bsDoRecord);

+    void	Deserialize(const CFX_ByteStringC& bsDoRecord);

 private:

     CFDE_TxtEdtEngine * m_pEngine;

     int32_t			m_nCaret;

@@ -307,7 +307,7 @@ private:
 class CFDE_TxtEdtDoRecord_FieldReplace : public IFDE_TxtEdtDoRecord

 {

 public:

-    CFDE_TxtEdtDoRecord_FieldReplace(FX_BSTR bsDoRecord);

+    CFDE_TxtEdtDoRecord_FieldReplace(const CFX_ByteStringC& bsDoRecord);

     CFDE_TxtEdtDoRecord_FieldReplace(	CFDE_TxtEdtEngine * pEngine,

                                         int32_t nCaret,

                                         int32_t nNewCaret,

@@ -324,7 +324,7 @@ public:
     virtual void	Serialize(CFX_ByteString &bsDoRecord) const;

 protected:

     ~CFDE_TxtEdtDoRecord_FieldReplace();

-    void	Deserialize(FX_BSTR bsDoRecord);

+    void	Deserialize(const CFX_ByteStringC& bsDoRecord);

 private:

     CFDE_TxtEdtEngine * m_pEngine;

     int32_t			m_nCaret;