Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / src / fee / src / fee / fde_txtedtengine.cpp
index 9546a2b..1f4bd62 100644 (file)
@@ -1033,7 +1033,7 @@ void CFDE_TxtEdtEngine::ClearSelection()
         m_Param.pEventSink->On_SelChanged(this);\r
     }\r
 }\r
-FX_BOOL CFDE_TxtEdtEngine::Redo(FX_BSTR bsRedo)\r
+FX_BOOL CFDE_TxtEdtEngine::Redo(const CFX_ByteStringC& bsRedo)\r
 {\r
     if (IsLocked()) {\r
         return FALSE;\r
@@ -1050,7 +1050,7 @@ FX_BOOL CFDE_TxtEdtEngine::Redo(FX_BSTR bsRedo)
     pDoRecord->Release();\r
     return bOK;\r
 }\r
-FX_BOOL CFDE_TxtEdtEngine::Undo(FX_BSTR bsUndo)\r
+FX_BOOL CFDE_TxtEdtEngine::Undo(const CFX_ByteStringC& bsUndo)\r
 {\r
     if (IsLocked()) {\r
         return FALSE;\r
@@ -2396,7 +2396,7 @@ void CFDE_TxtEdtEngine::DeleteSelect()
         return;\r
     }\r
 }\r
-IFDE_TxtEdtDoRecord * IFDE_TxtEdtDoRecord::Create(FX_BSTR bsDoRecord)\r
+IFDE_TxtEdtDoRecord * IFDE_TxtEdtDoRecord::Create(const CFX_ByteStringC& bsDoRecord)\r
 {\r
     const FX_CHAR*     lpBuf   =       bsDoRecord.GetCStr();\r
     int32_t    nType   =       *((int32_t*)lpBuf);\r
@@ -2418,7 +2418,7 @@ IFDE_TxtEdtDoRecord * IFDE_TxtEdtDoRecord::Create(FX_BSTR bsDoRecord)
     }\r
     return NULL;\r
 }\r
-CFDE_TxtEdtDoRecord_Insert::CFDE_TxtEdtDoRecord_Insert(FX_BSTR bsDoRecord)\r
+CFDE_TxtEdtDoRecord_Insert::CFDE_TxtEdtDoRecord_Insert(const CFX_ByteStringC& bsDoRecord)\r
 {\r
     Deserialize(bsDoRecord);\r
 }\r
@@ -2477,7 +2477,7 @@ void CFDE_TxtEdtDoRecord_Insert::Serialize(CFX_ByteString &bsDoRecord) const
     FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength);\r
     bsDoRecord.ReleaseBuffer(nLength);\r
 }\r
-void CFDE_TxtEdtDoRecord_Insert::Deserialize(FX_BSTR bsDoRecord)\r
+void CFDE_TxtEdtDoRecord_Insert::Deserialize(const CFX_ByteStringC& bsDoRecord)\r
 {\r
     CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength());\r
     int32_t nType = 0;\r
@@ -2489,7 +2489,7 @@ void CFDE_TxtEdtDoRecord_Insert::Deserialize(FX_BSTR bsDoRecord)
     ArchiveLoader >> m_nCaret;\r
     ArchiveLoader >> m_wsInsert;\r
 }\r
-CFDE_TxtEdtDoRecord_DeleteRange::CFDE_TxtEdtDoRecord_DeleteRange(FX_BSTR bsDoRecord)\r
+CFDE_TxtEdtDoRecord_DeleteRange::CFDE_TxtEdtDoRecord_DeleteRange(const CFX_ByteStringC& bsDoRecord)\r
 {\r
     Deserialize(bsDoRecord);\r
 }\r
@@ -2557,7 +2557,7 @@ void CFDE_TxtEdtDoRecord_DeleteRange::Serialize(CFX_ByteString &bsDoRecord) cons
     FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength);\r
     bsDoRecord.ReleaseBuffer(nLength);\r
 }\r
-void CFDE_TxtEdtDoRecord_DeleteRange::Deserialize(FX_BSTR bsDoRecord)\r
+void CFDE_TxtEdtDoRecord_DeleteRange::Deserialize(const CFX_ByteStringC& bsDoRecord)\r
 {\r
     CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength());\r
     int32_t nType = 0;\r
@@ -2572,7 +2572,7 @@ void CFDE_TxtEdtDoRecord_DeleteRange::Deserialize(FX_BSTR bsDoRecord)
     ArchiveLoader >> m_wsRange;\r
 }\r
 #ifdef FDE_USEFORMATBLOCK\r
-CFDE_TxtEdtDoRecord_FieldInsert::CFDE_TxtEdtDoRecord_FieldInsert(FX_BSTR bsDoRecord)\r
+CFDE_TxtEdtDoRecord_FieldInsert::CFDE_TxtEdtDoRecord_FieldInsert(const CFX_ByteStringC& bsDoRecord)\r
 {\r
     Deserialize(bsDoRecord);\r
 }\r
@@ -2649,7 +2649,7 @@ void CFDE_TxtEdtDoRecord_FieldInsert::Serialize(CFX_ByteString &bsDoRecord) cons
     FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength);\r
     bsDoRecord.ReleaseBuffer(nLength);\r
 }\r
-void CFDE_TxtEdtDoRecord_FieldInsert::Deserialize(FX_BSTR bsDoRecord)\r
+void CFDE_TxtEdtDoRecord_FieldInsert::Deserialize(const CFX_ByteStringC& bsDoRecord)\r
 {\r
     CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength());\r
     int32_t nType = 0;\r
@@ -2669,7 +2669,7 @@ void CFDE_TxtEdtDoRecord_FieldInsert::Deserialize(FX_BSTR bsDoRecord)
     ArchiveLoader >> m_wsIns;\r
     ArchiveLoader >> m_bSel;\r
 }\r
-CFDE_TxtEdtDoRecord_FieldDelete::CFDE_TxtEdtDoRecord_FieldDelete(FX_BSTR bsDoRecord)\r
+CFDE_TxtEdtDoRecord_FieldDelete::CFDE_TxtEdtDoRecord_FieldDelete(const CFX_ByteStringC& bsDoRecord)\r
 {\r
     Deserialize(bsDoRecord);\r
 }\r
@@ -2746,7 +2746,7 @@ void CFDE_TxtEdtDoRecord_FieldDelete::Serialize(CFX_ByteString &bsDoRecord) cons
     FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength);\r
     bsDoRecord.ReleaseBuffer(nLength);\r
 }\r
-void CFDE_TxtEdtDoRecord_FieldDelete::Deserialize(FX_BSTR bsDoRecord)\r
+void CFDE_TxtEdtDoRecord_FieldDelete::Deserialize(const CFX_ByteStringC& bsDoRecord)\r
 {\r
     CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength());\r
     int32_t nType = 0;\r
@@ -2766,7 +2766,7 @@ void CFDE_TxtEdtDoRecord_FieldDelete::Deserialize(FX_BSTR bsDoRecord)
     ArchiveLoader >> m_wsDel;\r
     ArchiveLoader >> m_bSel;\r
 }\r
-CFDE_TxtEdtDoRecord_FieldReplace::CFDE_TxtEdtDoRecord_FieldReplace(FX_BSTR bsDoRecord)\r
+CFDE_TxtEdtDoRecord_FieldReplace::CFDE_TxtEdtDoRecord_FieldReplace(const CFX_ByteStringC& bsDoRecord)\r
 {\r
     Deserialize(bsDoRecord);\r
 }\r
@@ -2847,7 +2847,7 @@ void CFDE_TxtEdtDoRecord_FieldReplace::Serialize(CFX_ByteString &bsDoRecord) con
     FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength);\r
     bsDoRecord.ReleaseBuffer(nLength);\r
 }\r
-void CFDE_TxtEdtDoRecord_FieldReplace::Deserialize(FX_BSTR bsDoRecord)\r
+void CFDE_TxtEdtDoRecord_FieldReplace::Deserialize(const CFX_ByteStringC& bsDoRecord)\r
 {\r
     CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength());\r
     int32_t nType = 0;\r