Re: CVS: commit dom abiword-plugins/wp/impexp/OpenWriter/xp

>
>>
>> Update of /cvsroot/abiword-plugins/wp/impexp/OpenWriter/xp
>> In directory
>> abiword.snt.utwente.nl:/tmp/cvs-serv6016/wp/impexp/OpenWriter/xp
>>
>> Modified Files:
>> ie_exp_OpenWriter.cpp ie_exp_OpenWriter.h
>> ie_imp_OpenWriter.cpp
>> Log Message:
>> plugins should build ok now, except for palmdoc
>>
>
> Hi Dom,
> Thanks for all these. Could you also fix:
> tools/abimathview/xp/ie_imp_MathML.cpp
>
> Which currently fails with..
>
> _MathML.lo -MD -MP -MF .deps/ie_imp_MathML.Tpo -c ie_imp_MathML.cpp -fPIC
> -DPIC -o .libs/ie_imp_MathML.o
> ie_imp_MathML.cpp: In member function 'virtual UT_Error
> IE_Imp_MathML::importFile(const char*)':
> ie_imp_MathML.cpp:327: error: no matching function for call to
> 'ImportStreamFile::ImportStreamFile(FILE*&)'
> ../../../../abi-unstable/src/wp/impexp/xp/ie_imp_Text.h:64: note:
> candidates are: ImportStreamFile::ImportStreamFile(GsfInput*)
> ../../../../abi-unstable/src/wp/impexp/xp/ie_imp_Text.h:62: note:
> ImportStreamFile::ImportStreamFile(const ImportStreamFile&)
> make[3]: *** [ie_imp_MathML.lo] Error 1
> make[
>

Hi Dom,
       Never mind. It was an easy fix I did myself.

Cheers

Martin

> Thanks!
>
> Martin
>
>> Index: ie_exp_OpenWriter.h
>> ===================================================================
>> RCS file:
>> /cvsroot/abiword-plugins/wp/impexp/OpenWriter/xp/ie_exp_OpenWriter.h,v
>> retrieving revision 1.6
>> retrieving revision 1.7
>> diff -u -d -r1.6 -r1.7
>> --- ie_exp_OpenWriter.h 11 Oct 2004 17:42:12 -0000 1.6
>> +++ ie_exp_OpenWriter.h 1 Aug 2006 03:08:01 -0000 1.7
>> @@ -49,7 +49,7 @@
>>
>> protected:
>> virtual UT_Error _writeDocument(void);
>> - virtual bool _openFile(const char * szFilename);
>> + virtual GsfOutput* _openFile(const char * szFilename);
>> virtual bool _closeFile(void);
>>
>> private:
>>
>> Index: ie_exp_OpenWriter.cpp
>> ===================================================================
>> RCS file:
>> /cvsroot/abiword-plugins/wp/impexp/OpenWriter/xp/ie_exp_OpenWriter.cpp,v
>> retrieving revision 1.21
>> retrieving revision 1.22
>> diff -u -d -r1.21 -r1.22
>> --- ie_exp_OpenWriter.cpp 5 Jun 2005 21:54:51 -0000 1.21
>> +++ ie_exp_OpenWriter.cpp 1 Aug 2006 03:08:01 -0000 1.22
>> @@ -1139,18 +1139,18 @@
>> /*!
>> * Open the underlying ZIP file for writing
>> */
>> -bool IE_Exp_OpenWriter::_openFile(const char * szFilename)
>> +GsfOutput* IE_Exp_OpenWriter::_openFile(const char * szFilename)
>> {
>> UT_return_val_if_fail(!m_oo, false);
>>
>> - GsfOutput * sink = GSF_OUTPUT (gsf_output_stdio_new (szFilename,
>> NULL));
>> + GsfOutput * sink = GSF_OUTPUT (UT_go_file_create (szFilename, NULL));
>> if (!sink)
>> return false;
>>
>> m_oo = GSF_OUTFILE (gsf_outfile_zip_new (sink, NULL));
>> g_object_unref(G_OBJECT(sink));
>>
>> - return (m_oo != 0);
>> + return GSF_OUTPUT(m_oo);
>> }
>>
>> /*!
>>
>> Index: ie_imp_OpenWriter.cpp
>> ===================================================================
>> RCS file:
>> /cvsroot/abiword-plugins/wp/impexp/OpenWriter/xp/ie_imp_OpenWriter.cpp,v
>> retrieving revision 1.36
>> retrieving revision 1.37
>> diff -u -d -r1.36 -r1.37
>> --- ie_imp_OpenWriter.cpp 20 Jul 2006 13:47:48 -0000 1.36
>> +++ ie_imp_OpenWriter.cpp 1 Aug 2006 03:08:01 -0000 1.37
>> @@ -645,7 +645,7 @@
>> */
>> UT_Error IE_Imp_OpenWriter::importFile(const char * szFilename)
>> {
>> - GsfInput * oo_src = GSF_INPUT (gsf_input_stdio_new (szFilename,
>> NULL));
>> + GsfInput * oo_src = GSF_INPUT (UT_go_file_open (szFilename, NULL));
>>
>> if (oo_src == NULL)
>> return UT_ERROR;
>>
>> -----------------------------------------------
>> To unsubscribe from this list, send a message to
>> abisource-cvs-commit-request@abisource.com with the word
>> unsubscribe in the message body.
>>
>
>
>
Received on Wed Aug 2 07:29:06 2006