]>
Commit | Line | Data |
---|---|---|
63f26082 | 1 | --- abiword-2.8.1.orig/plugins/mht/xp/ie_imp_MHT.cpp 2009-05-27 14:49:02.000000000 +0200 |
2 | +++ abiword-2.8.1/plugins/mht/xp/ie_imp_MHT.cpp 2010-02-14 18:57:15.942889982 +0100 | |
3 | @@ -292,7 +292,7 @@ | |
4 | } | |
5 | ||
6 | IE_ImpGraphic * pieg = 0; | |
7 | - if (IE_ImpGraphic::constructImporter (pBB, IEGFT_Unknown, &pieg) != UT_OK) | |
8 | + if (IE_ImpGraphic::constructImporter (*pBB, IEGFT_Unknown, &pieg) != UT_OK) | |
9 | { | |
10 | UT_DEBUGMSG(("unable to construct image importer!\n")); | |
11 | return 0; | |
12 | --- abiword-2.8.1.orig/src/wp/impexp/xp/ie_imp_XML.cpp 2009-06-25 07:28:16.000000000 +0200 | |
13 | +++ abiword-2.8.1/src/wp/impexp/xp/ie_imp_XML.cpp 2010-02-14 18:59:07.409540483 +0100 | |
14 | @@ -128,6 +128,32 @@ | |
15 | return m_error; | |
16 | } | |
17 | ||
18 | +UT_Error IE_Imp_XML::importFile(const char * fname) | |
19 | +{ | |
20 | + m_szFileName = 0; | |
21 | + | |
22 | + UT_XML default_xml; | |
23 | + UT_XML * parser = &default_xml; | |
24 | + if (m_pParser) parser = m_pParser; | |
25 | + | |
26 | + parser->setListener (this); | |
27 | + if (m_pReader) parser->setReader (m_pReader); | |
28 | + | |
29 | + UT_Error err = parser->parse (fname); | |
30 | + | |
31 | + if ((err != UT_OK) && (err != UT_IE_SKIPINVALID)) | |
32 | + m_error = UT_IE_BOGUSDOCUMENT; | |
33 | + | |
34 | + if (m_error != UT_OK) | |
35 | + { | |
36 | + UT_DEBUGMSG(("Problem reading document\n")); | |
37 | + if(m_error != UT_IE_SKIPINVALID) | |
38 | + m_szFileName = 0; | |
39 | + } | |
40 | + | |
41 | + return m_error; | |
42 | +} | |
43 | + | |
44 | UT_Error IE_Imp_XML::importFile(const char * data, UT_uint32 length) | |
45 | { | |
46 | m_szFileName = 0; | |
47 | --- abiword-2.8.1.orig/src/wp/impexp/xp/ie_imp_XML.h 2009-06-25 07:28:16.000000000 +0200 | |
48 | +++ abiword-2.8.1/src/wp/impexp/xp/ie_imp_XML.h 2010-02-14 18:58:02.799427644 +0100 | |
49 | @@ -57,6 +57,7 @@ | |
50 | public: | |
51 | IE_Imp_XML(PD_Document * pDocument, bool whiteSignificant); | |
52 | virtual ~IE_Imp_XML(); | |
53 | + virtual UT_Error importFile(const char * fname); | |
54 | virtual UT_Error importFile(const char * data, UT_uint32 length); | |
55 | virtual UT_Error importFile(const UT_ByteBuf * data); | |
56 |