? ie_exp_GZipAbiWord.cpp
? ie_exp_GZipAbiWord.h
? ie_imp_GZipAbiWord.h
? ie_imp_GZipAbiWord.cpp
Index: Makefile
===================================================================
RCS file: /u2/cvsroot/abi/src/wp/impexp/xp/Makefile,v
retrieving revision 1.22
diff -r1.22 Makefile
26a27
> 			ie_exp_GZipAbiWord.cpp			\
34a36
> 			ie_imp_GZipAbiWord.cpp			\
Index: ie_exp.cpp
===================================================================
RCS file: /u2/cvsroot/abi/src/wp/impexp/xp/ie_exp.cpp,v
retrieving revision 1.16
diff -r1.16 ie_exp.cpp
30a31
> #include "ie_exp_GZipAbiWord.h"
55a57
> 	DeclareExporter(IE_Exp_GZipAbiWord),
Index: ie_exp.h
===================================================================
RCS file: /u2/cvsroot/abi/src/wp/impexp/xp/ie_exp.h,v
retrieving revision 1.8
diff -r1.8 ie_exp.h
74,78c74,78
< 	UT_Bool				_openFile(const char * szFilename);
< 	UT_uint32			_writeBytes(const UT_Byte * pBytes, UT_uint32 length);
< 	UT_Bool				_writeBytes(const UT_Byte * sz);
< 	UT_Bool				_closeFile(void);
< 	void				_abortFile(void);
---
> 	virtual UT_Bool				_openFile(const char * szFilename);
> 	virtual UT_uint32			_writeBytes(const UT_Byte * pBytes, UT_uint32 length);
> 	virtual UT_Bool				_writeBytes(const UT_Byte * sz);
> 	virtual UT_Bool				_closeFile(void);
> 	virtual void				_abortFile(void);
Index: ie_imp.cpp
===================================================================
RCS file: /u2/cvsroot/abi/src/wp/impexp/xp/ie_imp.cpp,v
retrieving revision 1.15
diff -r1.15 ie_imp.cpp
29a30
> #include "ie_imp_GZipAbiWord.h"
53a55
> 	DeclareImporter(IE_Imp_GZipAbiWord),
Index: ie_imp_AbiWord_1.cpp
===================================================================
RCS file: /u2/cvsroot/abi/src/wp/impexp/xp/ie_imp_AbiWord_1.cpp,v
retrieving revision 1.29
diff -r1.29 ie_imp_AbiWord_1.cpp
32d31
< 
59a59,76
> UT_Bool IE_Imp_AbiWord_1::_openFile(const char * szFilename) 
> {
>     m_fp = fopen(szFilename, "r");
>     return (m_fp);
> }
> 
> UT_uint32 IE_Imp_AbiWord_1::_readBytes(char * buf, UT_uint32 length) 
> {
>     return fread(buf, 1, length, m_fp);
> }
> 
> void IE_Imp_AbiWord_1::_closeFile(void) 
> {
>     if (m_fp) {
> 	fclose(m_fp);
>     }
> }
> 
63d79
< 	FILE *fp = NULL;
67,68c83
< 	fp = fopen(szFilename, "r");
< 	if (!fp)
---
> 	if (!_openFile(szFilename))
82c97
< 		size_t len = fread(buf, 1, sizeof(buf), fp);
---
> 		size_t len = _readBytes(buf, sizeof(buf));
106,107c121
< 	if (fp)
< 		fclose(fp);
---
> 	_closeFile();
Index: ie_imp_AbiWord_1.h
===================================================================
RCS file: /u2/cvsroot/abi/src/wp/impexp/xp/ie_imp_AbiWord_1.h,v
retrieving revision 1.15
diff -r1.15 ie_imp_AbiWord_1.h
37,38c37,38
< 	IE_Imp_AbiWord_1(PD_Document * pDocument);
< 	~IE_Imp_AbiWord_1();
---
>     IE_Imp_AbiWord_1(PD_Document * pDocument);
>     ~IE_Imp_AbiWord_1();
40,42c40,42
< 	virtual IEStatus	importFile(const char * szFilename);
< 	virtual void		pasteFromBuffer(PD_DocumentRange * pDocRange,
< 										unsigned char * pData, UT_uint32 lenData);
---
>     virtual IEStatus	importFile(const char * szFilename);
>     virtual void		pasteFromBuffer(PD_DocumentRange * pDocRange,
> 	    unsigned char * pData, UT_uint32 lenData);
44,45c44,45
< 	// the following are public only so that the
< 	// XML parser callback routines can access them.
---
>     // the following are public only so that the
>     // XML parser callback routines can access them.
47,57c47,57
< 	void				_startElement(const XML_Char *name, const XML_Char **atts);
< 	void				_endElement(const XML_Char *name);
< 	void				_charData(const XML_Char*, int);
< 
< 	static UT_Bool		RecognizeSuffix(const char * szSuffix);
< 	static IEStatus		StaticConstructor(PD_Document * pDocument,
< 										  IE_Imp ** ppie);
< 	static UT_Bool		GetDlgLabels(const char ** pszDesc,
< 									 const char ** pszSuffixList,
< 									 IEFileType * ft);
< 	static UT_Bool 		SupportsFileType(IEFileType ft);
---
>     void				_startElement(const XML_Char *name, const XML_Char **atts);
>     void				_endElement(const XML_Char *name);
>     void				_charData(const XML_Char*, int);
> 
>     static UT_Bool		RecognizeSuffix(const char * szSuffix);
>     static IEStatus		StaticConstructor(PD_Document * pDocument,
> 	    IE_Imp ** ppie);
>     static UT_Bool		GetDlgLabels(const char ** pszDesc,
> 	    const char ** pszSuffixList,
> 	    IEFileType * ft);
>     static UT_Bool 		SupportsFileType(IEFileType ft);
60,63c60,67
< 	UT_uint32			_getInlineDepth(void) const;
< 	UT_Bool				_pushInlineFmt(const XML_Char ** atts);
< 	void				_popInlineFmt(void);
< 	const XML_Char *	_getDataItemName(const XML_Char ** atts);
---
>     virtual UT_Bool			_openFile(const char * szFilename);
>     virtual UT_uint32			_readBytes(char * buf, UT_uint32 length);
>     virtual void			_closeFile(void);
> 
>     UT_uint32			_getInlineDepth(void) const;
>     UT_Bool				_pushInlineFmt(const XML_Char ** atts);
>     void				_popInlineFmt(void);
>     const XML_Char *	_getDataItemName(const XML_Char ** atts);
65,80c69,84
< 	typedef enum _parseState { _PS_Init,
< 							   _PS_Doc,
< 							   _PS_Sec,
< 							   _PS_Block,
< 							   _PS_DataSec,
< 							   _PS_DataItem,
< 							   _PS_StyleSec,
< 							   _PS_Style
< 	} ParseState;
< 
< 	IEStatus			m_iestatus;
< 	ParseState			m_parseState;
< 	XML_Char			m_charDataSeen[4];
< 	UT_uint32			m_lenCharDataSeen;
< 	UT_uint32			m_lenCharDataExpected;
< 	UT_Bool				m_bSeenCR;
---
>     typedef enum _parseState { _PS_Init,
> 			       _PS_Doc,
> 			       _PS_Sec,
> 			       _PS_Block,
> 			       _PS_DataSec,
> 			       _PS_DataItem,
> 			       _PS_StyleSec,
> 			       _PS_Style
>     } ParseState;
> 
>     IEStatus			m_iestatus;
>     ParseState			m_parseState;
>     XML_Char			m_charDataSeen[4];
>     UT_uint32			m_lenCharDataSeen;
>     UT_uint32			m_lenCharDataExpected;
>     UT_Bool				m_bSeenCR;
82,83c86,87
< 	UT_Vector			m_vecInlineFmt;
< 	UT_Stack			m_stackFmtStartIndex;
---
>     UT_Vector			m_vecInlineFmt;
>     UT_Stack			m_stackFmtStartIndex;
85,86c89,91
< 	UT_ByteBuf			m_currentDataItem;
< 	XML_Char *			m_currentDataItemName;
---
>     UT_ByteBuf			m_currentDataItem;
>     XML_Char *			m_currentDataItemName;
>     FILE *			m_fp;
Index: ie_types.h
===================================================================
RCS file: /u2/cvsroot/abi/src/wp/impexp/xp/ie_types.h,v
retrieving revision 1.8
diff -r1.8 ie_types.h
40a41
> 							IEFT_GZipAbiWord,
