summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2013-04-08 19:26:52 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-04-08 19:26:52 +0200
commit690b0c72f5b61c9bfc1b3769f66f2216d26dc3c9 (patch)
treef593fb790418300dfd95347e8af0d7681fea6933
parentb33ad4b484ece5c1090ff1f194389648d7a44c84 (diff)
downloadkoffice-690b0c72f5b61c9bfc1b3769f66f2216d26dc3c9.tar.gz
koffice-690b0c72f5b61c9bfc1b3769f66f2216d26dc3c9.zip
Fix redefinition problems with previous patch
-rw-r--r--filters/kword/wordperfect/import/WordPerfectCollector.hxx56
1 files changed, 28 insertions, 28 deletions
diff --git a/filters/kword/wordperfect/import/WordPerfectCollector.hxx b/filters/kword/wordperfect/import/WordPerfectCollector.hxx
index fa3ec722..7cdb51ea 100644
--- a/filters/kword/wordperfect/import/WordPerfectCollector.hxx
+++ b/filters/kword/wordperfect/import/WordPerfectCollector.hxx
@@ -81,7 +81,7 @@ struct ltstr
class WordPerfectCollector : public WPXDocumentInterface
#else // HAVE_LIBWPD_090
class WordPerfectCollector : public WPXHLListenerImpl
-#endif HAVE_LIBWPD_090
+#endif // HAVE_LIBWPD_090
{
public:
WordPerfectCollector(WPXInputStream *pInput, DocumentHandler *pHandler);
@@ -93,12 +93,12 @@ public:
virtual void startDocument();
virtual void endDocument();
virtual void definePageStyle(const WPXPropertyList &propList) {};
- virtual void openPageSpan(const WPXPropertyList &propList) {};
- virtual void closePageSpan() {};
- virtual void openHeader(const WPXPropertyList &propList) {};
- virtual void closeHeader() {};
- virtual void openFooter(const WPXPropertyList &propList) {};
- virtual void closeFooter() {};
+ virtual void openPageSpan(const WPXPropertyList &propList);
+ virtual void closePageSpan();
+ virtual void openHeader(const WPXPropertyList &propList);
+ virtual void closeHeader();
+ virtual void openFooter(const WPXPropertyList &propList);
+ virtual void closeFooter();
virtual void defineParagraphStyle(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {};
virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
virtual void closeParagraph();
@@ -106,36 +106,36 @@ public:
virtual void openSpan(const WPXPropertyList &propList);
virtual void closeSpan();
virtual void defineSectionStyle(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
- virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
- virtual void closeSection() {};
+ virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
+ virtual void closeSection();
virtual void insertTab();
virtual void insertSpace() {};
virtual void insertText(const WPXString &text);
virtual void insertLineBreak();
virtual void insertField(const WPXString &type, const WPXPropertyList &propList) {};
- virtual void defineOrderedListLevel(const WPXPropertyList &propList) {};
- virtual void defineUnorderedListLevel(const WPXPropertyList &propList) {};
- virtual void openOrderedListLevel(const WPXPropertyList &propList) {};
- virtual void openUnorderedListLevel(const WPXPropertyList &propList) {};
- virtual void closeOrderedListLevel() {};
- virtual void closeUnorderedListLevel() {};
- virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {};
- virtual void closeListElement() {};
- virtual void openFootnote(const WPXPropertyList &propList) {};
- virtual void closeFootnote() {};
- virtual void openEndnote(const WPXPropertyList &propList) {};
- virtual void closeEndnote() {};
+ virtual void defineOrderedListLevel(const WPXPropertyList &propList);
+ virtual void defineUnorderedListLevel(const WPXPropertyList &propList);
+ virtual void openOrderedListLevel(const WPXPropertyList &propList);
+ virtual void openUnorderedListLevel(const WPXPropertyList &propList);
+ virtual void closeOrderedListLevel();
+ virtual void closeUnorderedListLevel();
+ virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
+ virtual void closeListElement();
+ virtual void openFootnote(const WPXPropertyList &propList);
+ virtual void closeFootnote();
+ virtual void openEndnote(const WPXPropertyList &propList);
+ virtual void closeEndnote();
virtual void openComment(const WPXPropertyList &propList) {};
virtual void closeComment() {};
virtual void openTextBox(const WPXPropertyList &propList) {};
virtual void closeTextBox() {};
- virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
- virtual void openTableRow(const WPXPropertyList &propList) {};
- virtual void closeTableRow() {};
- virtual void openTableCell(const WPXPropertyList &propList) {};
- virtual void closeTableCell() {};
- virtual void insertCoveredTableCell(const WPXPropertyList &propList) {};
- virtual void closeTable() {};
+ virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
+ virtual void openTableRow(const WPXPropertyList &propList);
+ virtual void closeTableRow();
+ virtual void openTableCell(const WPXPropertyList &propList);
+ virtual void closeTableCell();
+ virtual void insertCoveredTableCell(const WPXPropertyList &propList);
+ virtual void closeTable();
virtual void openFrame(const WPXPropertyList &propList) {};
virtual void closeFrame() {};
virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data) {};