Fix redefinition problems with previous patch

pull/1/head
Francois Andriot 11 years ago committed by Slávek Banko
parent b33ad4b484
commit 690b0c72f5

@ -81,7 +81,7 @@ struct ltstr
class WordPerfectCollector : public WPXDocumentInterface class WordPerfectCollector : public WPXDocumentInterface
#else // HAVE_LIBWPD_090 #else // HAVE_LIBWPD_090
class WordPerfectCollector : public WPXHLListenerImpl class WordPerfectCollector : public WPXHLListenerImpl
#endif HAVE_LIBWPD_090 #endif // HAVE_LIBWPD_090
{ {
public: public:
WordPerfectCollector(WPXInputStream *pInput, DocumentHandler *pHandler); WordPerfectCollector(WPXInputStream *pInput, DocumentHandler *pHandler);
@ -93,12 +93,12 @@ public:
virtual void startDocument(); virtual void startDocument();
virtual void endDocument(); virtual void endDocument();
virtual void definePageStyle(const WPXPropertyList &propList) {}; virtual void definePageStyle(const WPXPropertyList &propList) {};
virtual void openPageSpan(const WPXPropertyList &propList) {}; virtual void openPageSpan(const WPXPropertyList &propList);
virtual void closePageSpan() {}; virtual void closePageSpan();
virtual void openHeader(const WPXPropertyList &propList) {}; virtual void openHeader(const WPXPropertyList &propList);
virtual void closeHeader() {}; virtual void closeHeader();
virtual void openFooter(const WPXPropertyList &propList) {}; virtual void openFooter(const WPXPropertyList &propList);
virtual void closeFooter() {}; virtual void closeFooter();
virtual void defineParagraphStyle(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {}; virtual void defineParagraphStyle(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {};
virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
virtual void closeParagraph(); virtual void closeParagraph();
@ -106,36 +106,36 @@ public:
virtual void openSpan(const WPXPropertyList &propList); virtual void openSpan(const WPXPropertyList &propList);
virtual void closeSpan(); virtual void closeSpan();
virtual void defineSectionStyle(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; virtual void defineSectionStyle(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
virtual void closeSection() {}; virtual void closeSection();
virtual void insertTab(); virtual void insertTab();
virtual void insertSpace() {}; virtual void insertSpace() {};
virtual void insertText(const WPXString &text); virtual void insertText(const WPXString &text);
virtual void insertLineBreak(); virtual void insertLineBreak();
virtual void insertField(const WPXString &type, const WPXPropertyList &propList) {}; virtual void insertField(const WPXString &type, const WPXPropertyList &propList) {};
virtual void defineOrderedListLevel(const WPXPropertyList &propList) {}; virtual void defineOrderedListLevel(const WPXPropertyList &propList);
virtual void defineUnorderedListLevel(const WPXPropertyList &propList) {}; virtual void defineUnorderedListLevel(const WPXPropertyList &propList);
virtual void openOrderedListLevel(const WPXPropertyList &propList) {}; virtual void openOrderedListLevel(const WPXPropertyList &propList);
virtual void openUnorderedListLevel(const WPXPropertyList &propList) {}; virtual void openUnorderedListLevel(const WPXPropertyList &propList);
virtual void closeOrderedListLevel() {}; virtual void closeOrderedListLevel();
virtual void closeUnorderedListLevel() {}; virtual void closeUnorderedListLevel();
virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {}; virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
virtual void closeListElement() {}; virtual void closeListElement();
virtual void openFootnote(const WPXPropertyList &propList) {}; virtual void openFootnote(const WPXPropertyList &propList);
virtual void closeFootnote() {}; virtual void closeFootnote();
virtual void openEndnote(const WPXPropertyList &propList) {}; virtual void openEndnote(const WPXPropertyList &propList);
virtual void closeEndnote() {}; virtual void closeEndnote();
virtual void openComment(const WPXPropertyList &propList) {}; virtual void openComment(const WPXPropertyList &propList) {};
virtual void closeComment() {}; virtual void closeComment() {};
virtual void openTextBox(const WPXPropertyList &propList) {}; virtual void openTextBox(const WPXPropertyList &propList) {};
virtual void closeTextBox() {}; virtual void closeTextBox() {};
virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {}; virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
virtual void openTableRow(const WPXPropertyList &propList) {}; virtual void openTableRow(const WPXPropertyList &propList);
virtual void closeTableRow() {}; virtual void closeTableRow();
virtual void openTableCell(const WPXPropertyList &propList) {}; virtual void openTableCell(const WPXPropertyList &propList);
virtual void closeTableCell() {}; virtual void closeTableCell();
virtual void insertCoveredTableCell(const WPXPropertyList &propList) {}; virtual void insertCoveredTableCell(const WPXPropertyList &propList);
virtual void closeTable() {}; virtual void closeTable();
virtual void openFrame(const WPXPropertyList &propList) {}; virtual void openFrame(const WPXPropertyList &propList) {};
virtual void closeFrame() {}; virtual void closeFrame() {};
virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data) {}; virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data) {};

Loading…
Cancel
Save