summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fxfa/parser')
-rw-r--r--xfa/fxfa/parser/cxfa_dataexporter.cpp10
-rw-r--r--xfa/fxfa/parser/cxfa_dataexporter.h4
-rw-r--r--xfa/fxfa/parser/cxfa_node.cpp4
-rw-r--r--xfa/fxfa/parser/cxfa_simple_parser.cpp4
-rw-r--r--xfa/fxfa/parser/cxfa_simple_parser.h4
-rw-r--r--xfa/fxfa/parser/cxfa_widetextread.cpp8
-rw-r--r--xfa/fxfa/parser/cxfa_widetextread.h12
-rw-r--r--xfa/fxfa/parser/cxfa_xml_parser.cpp2
-rw-r--r--xfa/fxfa/parser/cxfa_xml_parser.h6
-rw-r--r--xfa/fxfa/parser/xfa_utils.h2
10 files changed, 28 insertions, 28 deletions
diff --git a/xfa/fxfa/parser/cxfa_dataexporter.cpp b/xfa/fxfa/parser/cxfa_dataexporter.cpp
index 1ec9c44de6..f97e8a34ed 100644
--- a/xfa/fxfa/parser/cxfa_dataexporter.cpp
+++ b/xfa/fxfa/parser/cxfa_dataexporter.cpp
@@ -198,7 +198,7 @@ void RegenerateFormFile_Changed(CXFA_Node* pNode,
break;
IFX_MemoryStream* pMemStream = IFX_MemoryStream::Create(true);
- IFX_Stream* pTempStream = IFX_Stream::CreateStream(
+ IFGAS_Stream* pTempStream = IFGAS_Stream::CreateStream(
(IFX_SeekableWriteStream*)pMemStream, FX_STREAMACCESS_Text |
FX_STREAMACCESS_Write |
FX_STREAMACCESS_Append);
@@ -317,7 +317,7 @@ void RegenerateFormFile_Changed(CXFA_Node* pNode,
}
void RegenerateFormFile_Container(CXFA_Node* pNode,
- IFX_Stream* pStream,
+ IFGAS_Stream* pStream,
bool bSaveXML = false) {
XFA_Element eType = pNode->GetElementType();
if (eType == XFA_Element::Field || eType == XFA_Element::Draw ||
@@ -371,7 +371,7 @@ void RegenerateFormFile_Container(CXFA_Node* pNode,
} // namespace
void XFA_DataExporter_RegenerateFormFile(CXFA_Node* pNode,
- IFX_Stream* pStream,
+ IFGAS_Stream* pStream,
const FX_CHAR* pChecksum,
bool bSaveXML) {
if (pNode->IsModelNode()) {
@@ -456,7 +456,7 @@ bool CXFA_DataExporter::Export(IFX_SeekableWriteStream* pWrite,
ASSERT(false);
return false;
}
- IFX_Stream* pStream = IFX_Stream::CreateStream(
+ IFGAS_Stream* pStream = IFGAS_Stream::CreateStream(
pWrite,
FX_STREAMACCESS_Text | FX_STREAMACCESS_Write | FX_STREAMACCESS_Append);
if (!pStream)
@@ -468,7 +468,7 @@ bool CXFA_DataExporter::Export(IFX_SeekableWriteStream* pWrite,
return bRet;
}
-bool CXFA_DataExporter::Export(IFX_Stream* pStream,
+bool CXFA_DataExporter::Export(IFGAS_Stream* pStream,
CXFA_Node* pNode,
uint32_t dwFlag,
const FX_CHAR* pChecksum) {
diff --git a/xfa/fxfa/parser/cxfa_dataexporter.h b/xfa/fxfa/parser/cxfa_dataexporter.h
index 41f32a2fad..8496e0d9a6 100644
--- a/xfa/fxfa/parser/cxfa_dataexporter.h
+++ b/xfa/fxfa/parser/cxfa_dataexporter.h
@@ -12,7 +12,7 @@
class CXFA_Document;
class CXFA_Node;
class IFX_SeekableWriteStream;
-class IFX_Stream;
+class IFGAS_Stream;
class CXFA_DataExporter {
public:
@@ -25,7 +25,7 @@ class CXFA_DataExporter {
const FX_CHAR* pChecksum);
protected:
- bool Export(IFX_Stream* pStream,
+ bool Export(IFGAS_Stream* pStream,
CXFA_Node* pNode,
uint32_t dwFlag,
const FX_CHAR* pChecksum);
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 05ddcfc71b..16062f7b6f 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -1443,8 +1443,8 @@ void CXFA_Node::Script_NodeClass_SaveXML(CFXJSE_Arguments* pArguments) {
}
std::unique_ptr<IFX_MemoryStream, ReleaseDeleter<IFX_MemoryStream>>
pMemoryStream(IFX_MemoryStream::Create(true));
- std::unique_ptr<IFX_Stream, ReleaseDeleter<IFX_Stream>> pStream(
- IFX_Stream::CreateStream(
+ std::unique_ptr<IFGAS_Stream, ReleaseDeleter<IFGAS_Stream>> pStream(
+ IFGAS_Stream::CreateStream(
static_cast<IFX_SeekableWriteStream*>(pMemoryStream.get()),
FX_STREAMACCESS_Text | FX_STREAMACCESS_Write |
FX_STREAMACCESS_Append));
diff --git a/xfa/fxfa/parser/cxfa_simple_parser.cpp b/xfa/fxfa/parser/cxfa_simple_parser.cpp
index 4599b1c4fc..a9025fa42a 100644
--- a/xfa/fxfa/parser/cxfa_simple_parser.cpp
+++ b/xfa/fxfa/parser/cxfa_simple_parser.cpp
@@ -281,7 +281,7 @@ int32_t CXFA_SimpleParser::StartParse(IFX_SeekableReadStream* pStream,
XFA_XDPPACKET ePacketID) {
CloseParser();
m_pFileRead = pStream;
- m_pStream.reset(IFX_Stream::CreateStream(
+ m_pStream.reset(IFGAS_Stream::CreateStream(
pStream, FX_STREAMACCESS_Read | FX_STREAMACCESS_Text));
if (!m_pStream)
return XFA_PARSESTATUS_StreamErr;
@@ -325,7 +325,7 @@ int32_t CXFA_SimpleParser::ParseXMLData(const CFX_WideString& wsXML,
CloseParser();
pXMLNode = nullptr;
- std::unique_ptr<IFX_Stream> pStream(new CXFA_WideTextRead(wsXML));
+ std::unique_ptr<IFGAS_Stream> pStream(new CXFA_WideTextRead(wsXML));
m_pXMLDoc.reset(new CFDE_XMLDoc);
CXFA_XMLParser* pParser =
new CXFA_XMLParser(m_pXMLDoc->GetRoot(), pStream.get());
diff --git a/xfa/fxfa/parser/cxfa_simple_parser.h b/xfa/fxfa/parser/cxfa_simple_parser.h
index db6765f400..fa9fdb3014 100644
--- a/xfa/fxfa/parser/cxfa_simple_parser.h
+++ b/xfa/fxfa/parser/cxfa_simple_parser.h
@@ -17,7 +17,7 @@ class CXFA_Node;
class CXFA_XMLParser;
class IFX_SeekableReadStream;
class IFX_Pause;
-class IFX_Stream;
+class IFGAS_Stream;
class CXFA_SimpleParser {
public:
@@ -77,7 +77,7 @@ class CXFA_SimpleParser {
CXFA_XMLParser* m_pXMLParser;
std::unique_ptr<CFDE_XMLDoc> m_pXMLDoc;
- std::unique_ptr<IFX_Stream, ReleaseDeleter<IFX_Stream>> m_pStream;
+ std::unique_ptr<IFGAS_Stream, ReleaseDeleter<IFGAS_Stream>> m_pStream;
IFX_SeekableReadStream* m_pFileRead;
CXFA_Document* m_pFactory;
CXFA_Node* m_pRootNode;
diff --git a/xfa/fxfa/parser/cxfa_widetextread.cpp b/xfa/fxfa/parser/cxfa_widetextread.cpp
index be2de7c9e4..cf03a09e7c 100644
--- a/xfa/fxfa/parser/cxfa_widetextread.cpp
+++ b/xfa/fxfa/parser/cxfa_widetextread.cpp
@@ -19,7 +19,7 @@ void CXFA_WideTextRead::Release() {
delete this;
}
-IFX_Stream* CXFA_WideTextRead::Retain() {
+IFGAS_Stream* CXFA_WideTextRead::Retain() {
m_iRefCount++;
return this;
}
@@ -98,9 +98,9 @@ uint16_t CXFA_WideTextRead::SetCodePage(uint16_t wCodePage) {
return GetCodePage();
}
-IFX_Stream* CXFA_WideTextRead::CreateSharedStream(uint32_t dwAccess,
- int32_t iOffset,
- int32_t iLength) {
+IFGAS_Stream* CXFA_WideTextRead::CreateSharedStream(uint32_t dwAccess,
+ int32_t iOffset,
+ int32_t iLength) {
return nullptr;
}
diff --git a/xfa/fxfa/parser/cxfa_widetextread.h b/xfa/fxfa/parser/cxfa_widetextread.h
index 3a39061079..bea3ab8fba 100644
--- a/xfa/fxfa/parser/cxfa_widetextread.h
+++ b/xfa/fxfa/parser/cxfa_widetextread.h
@@ -9,13 +9,13 @@
#include "xfa/fgas/crt/fgas_stream.h"
-class CXFA_WideTextRead : public IFX_Stream {
+class CXFA_WideTextRead : public IFGAS_Stream {
public:
explicit CXFA_WideTextRead(const CFX_WideString& wsBuffer);
- // IFX_Stream
+ // IFGAS_Stream
void Release() override;
- IFX_Stream* Retain() override;
+ IFGAS_Stream* Retain() override;
uint32_t GetAccessModes() const override;
int32_t GetLength() const override;
int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset) override;
@@ -30,9 +30,9 @@ class CXFA_WideTextRead : public IFX_Stream {
int32_t GetBOM(uint8_t bom[4]) const override;
uint16_t GetCodePage() const override;
uint16_t SetCodePage(uint16_t wCodePage) override;
- IFX_Stream* CreateSharedStream(uint32_t dwAccess,
- int32_t iOffset,
- int32_t iLength) override;
+ IFGAS_Stream* CreateSharedStream(uint32_t dwAccess,
+ int32_t iOffset,
+ int32_t iLength) override;
CFX_WideString GetSrcText() const;
diff --git a/xfa/fxfa/parser/cxfa_xml_parser.cpp b/xfa/fxfa/parser/cxfa_xml_parser.cpp
index 70e0d7cc9e..ac378f0b95 100644
--- a/xfa/fxfa/parser/cxfa_xml_parser.cpp
+++ b/xfa/fxfa/parser/cxfa_xml_parser.cpp
@@ -6,7 +6,7 @@
#include "xfa/fxfa/parser/cxfa_xml_parser.h"
-CXFA_XMLParser::CXFA_XMLParser(CFDE_XMLNode* pRoot, IFX_Stream* pStream)
+CXFA_XMLParser::CXFA_XMLParser(CFDE_XMLNode* pRoot, IFGAS_Stream* pStream)
: m_nElementStart(0),
m_dwCheckStatus(0),
m_dwCurrentCheckStatus(0),
diff --git a/xfa/fxfa/parser/cxfa_xml_parser.h b/xfa/fxfa/parser/cxfa_xml_parser.h
index 59def4be67..cff279453d 100644
--- a/xfa/fxfa/parser/cxfa_xml_parser.h
+++ b/xfa/fxfa/parser/cxfa_xml_parser.h
@@ -11,12 +11,12 @@
#include "xfa/fde/xml/fde_xml_imp.h"
-class IFX_Stream;
+class IFGAS_Stream;
class IFX_Pause;
class CXFA_XMLParser : public CFDE_XMLParser {
public:
- CXFA_XMLParser(CFDE_XMLNode* pRoot, IFX_Stream* pStream);
+ CXFA_XMLParser(CFDE_XMLNode* pRoot, IFGAS_Stream* pStream);
~CXFA_XMLParser() override;
// CFDE_XMLParser
@@ -31,7 +31,7 @@ class CXFA_XMLParser : public CFDE_XMLParser {
protected:
CFDE_XMLNode* m_pRoot;
- IFX_Stream* m_pStream;
+ IFGAS_Stream* m_pStream;
std::unique_ptr<CFDE_XMLSyntaxParser, ReleaseDeleter<CFDE_XMLSyntaxParser>>
m_pParser;
CFDE_XMLNode* m_pParent;
diff --git a/xfa/fxfa/parser/xfa_utils.h b/xfa/fxfa/parser/xfa_utils.h
index 7981704973..961c0a4189 100644
--- a/xfa/fxfa/parser/xfa_utils.h
+++ b/xfa/fxfa/parser/xfa_utils.h
@@ -173,7 +173,7 @@ bool XFA_FieldIsMultiListBox(CXFA_Node* pFieldNode);
void XFA_DataExporter_DealWithDataGroupNode(CXFA_Node* pDataNode);
void XFA_DataExporter_RegenerateFormFile(CXFA_Node* pNode,
- IFX_Stream* pStream,
+ IFGAS_Stream* pStream,
const FX_CHAR* pChecksum = nullptr,
bool bSaveXML = false);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 12:26:41 +0000