app-office/abiword: [QA] Move patches to a distfile

Closes: https://bugs.gentoo.org/620546

13 files changed, 25 insertions, 1463 deletions

diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index b6385d129cbf..435ebe1a12d9 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1 +1,2 @@
-DIST abiword-3.0.2.tar.gz 11154333 SHA256 afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522 SHA512 29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3 WHIRLPOOL c916d144a68f6581927c6d75d12cac2ae39e213e1ca928f190c19ffd8843cb0c463e671ec4ef6b21ab0d4c49a084e04a8b7eeed75bf45fdc0f76dfa4391ff898
+DIST abiword-3.0.2-patchset.tar.gz 10475 BLAKE2B 41b4b894e1b433ca722270e09410de22be906920b551d19580db32b4c8557595902d23a7ed320cc71b1fc191f830e72178158ffb02cafb07e01c72d12ccd4faa SHA512 e81688bbe58cdc9c6848cd2bc74207bf9c6e8dd1f2652a707f007ce9a2f3cf8cc77eac65b04e24b67a694773f0b08ba14bdcf10db549e33cbb7ee5da634bdfb3
+DIST abiword-3.0.2.tar.gz 11154333 BLAKE2B af49570ad766b0e698313a4a88f14b2370a0a230866c4e8672f56780705060dba4207d4e13358cc290fb3c1a4a6a56efa05fed1f0540f10f7572d8e717e6cd20 SHA512 29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3
diff --git a/app-office/abiword/abiword-3.0.2-r1.ebuild b/app-office/abiword/abiword-3.0.2-r1.ebuild
index 3638c3f324b6..98001c8f2544 100644
--- a/app-office/abiword/abiword-3.0.2-r1.ebuild
+++ b/app-office/abiword/abiword-3.0.2-r1.ebuild
@@ -9,7 +9,8 @@ inherit gnome2
 
 DESCRIPTION="Fully featured yet light and fast cross platform word processor"
 HOMEPAGE="http://www.abisource.com/"
-SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz"
+SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -67,30 +68,30 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	# http://bugzilla.abisource.com/show_bug.cgi?id=13842
-	"${FILESDIR}"/${PN}-2.8.3-desktop.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-2.8.3-desktop.patch
 
 	# http://bugzilla.abisource.com/show_bug.cgi?id=13843
-	"${FILESDIR}"/${PN}-2.6.0-boolean.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-2.6.0-boolean.patch
 
 	# http://bugzilla.abisource.com/show_bug.cgi?id=13844
-	"${FILESDIR}"/${PN}-3.0.0-librevenge.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.0-librevenge.patch
 
 	# http://bugzilla.abisource.com/show_bug.cgi?id=13845
-	"${FILESDIR}"/${PN}-3.0.0-link-grammar-5-second.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.0-link-grammar-5-second.patch
 
 	# http://bugzilla.abisource.com/show_bug.cgi?id=13846
-	"${FILESDIR}"/${PN}-3.0.0-libwp.patch
-	"${FILESDIR}"/${PN}-3.0.1-libwps-0.4.patch
-	"${FILESDIR}"/${PN}-3.0.1-fixwps.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.0-libwp.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.1-libwps-0.4.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.1-fixwps.patch
 
 	# http://bugzilla.abisource.com/show_bug.cgi?id=13847
-	"${FILESDIR}"/${PN}-3.0.2-fix-installing-readme.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-fix-installing-readme.patch
 
 	# http://bugzilla.abisource.com/show_bug.cgi?id=13841
-	"${FILESDIR}"/${PN}-3.0.2-fix-nullptr-c++98.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-fix-nullptr-c++98.patch
 
 	# http://bugzilla.abisource.com/show_bug.cgi?id=13815
-	"${FILESDIR}"/${PN}-3.0.2-fix-black-drawing-regression.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-fix-black-drawing-regression.patch
 )
 
 src_configure() {
diff --git a/app-office/abiword/abiword-3.0.2.ebuild b/app-office/abiword/abiword-3.0.2.ebuild
index cad3c647a5b2..9a6ce7846e39 100644
--- a/app-office/abiword/abiword-3.0.2.ebuild
+++ b/app-office/abiword/abiword-3.0.2.ebuild
@@ -7,7 +7,8 @@ inherit autotools gnome2
 
 DESCRIPTION="Fully featured yet light and fast cross platform word processor"
 HOMEPAGE="http://www.abisource.com/"
-SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz"
+SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -64,15 +65,15 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.3-desktop.patch
-	"${FILESDIR}"/${PN}-2.6.0-boolean.patch
-	"${FILESDIR}"/${PN}-3.0.0-librevenge.patch
-	"${FILESDIR}"/${PN}-3.0.0-link-grammar-5-second.patch
-	"${FILESDIR}"/${PN}-3.0.0-libwp.patch
-	"${FILESDIR}"/${PN}-3.0.1-libwps-0.4.patch
-	"${FILESDIR}"/${PN}-3.0.1-fixwps.patch
-	"${FILESDIR}"/${PN}-3.0.2-fix-installing-readme.patch
-	"${FILESDIR}"/${PN}-3.0.2-fix-nullptr-c++98.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-2.8.3-desktop.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-2.6.0-boolean.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.0-librevenge.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.0-link-grammar-5-second.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.0-libwp.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.1-libwps-0.4.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.1-fixwps.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-fix-installing-readme.patch
+	"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-fix-nullptr-c++98.patch
 )
 
 src_prepare() {
diff --git a/app-office/abiword/files/abiword-2.6.0-boolean.patch b/app-office/abiword/files/abiword-2.6.0-boolean.patch
deleted file mode 100644
index 9f226c0d2377..000000000000
--- a/app-office/abiword/files/abiword-2.6.0-boolean.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u -r abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h abiword-2.6.0/src/text/ptbl/xp/pd_Style.h
---- abiword-2.6.0.orig/src/text/ptbl/xp/pd_Style.h	2008-03-18 23:16:20.000000000 +0100
-+++ abiword-2.6.0/src/text/ptbl/xp/pd_Style.h	2008-03-25 17:14:23.000000000 +0100
-@@ -23,6 +23,9 @@
- #ifndef PD_STYLE_H
- #define PD_STYLE_H
- 
-+#ifndef FALSE
-+#define FALSE 0
-+#endif /* FALSE */
- #include "ut_types.h"
- #include "pt_Types.h"
- #include "ut_xml.h"
diff --git a/app-office/abiword/files/abiword-2.8.3-desktop.patch b/app-office/abiword/files/abiword-2.8.3-desktop.patch
deleted file mode 100644
index d908ad48d53c..000000000000
--- a/app-office/abiword/files/abiword-2.8.3-desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r abiword-2.8.3.orig/abiword.desktop abiword-2.8.3/abiword.desktop
---- abiword-2.8.3.orig/abiword.desktop	2010-04-02 19:59:58.000000000 +0200
-+++ abiword-2.8.3/abiword.desktop	2010-04-08 09:07:01.000000000 +0200
-@@ -6,7 +6,7 @@
- Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
- StartupNotify=true
- X-Desktop-File-Install-Version=0.9
--MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;
-+MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;application/x-applix-word;application/x-mswrite;application/x-kword;application/x-mif;
- Name=AbiWord
- GenericName=Word Processor
- Comment=Compose, edit, and view documents
diff --git a/app-office/abiword/files/abiword-3.0.0-librevenge.patch b/app-office/abiword/files/abiword-3.0.0-librevenge.patch
deleted file mode 100644
index b2121eb3560f..000000000000
--- a/app-office/abiword/files/abiword-3.0.0-librevenge.patch
+++ /dev/null
@@ -1,1169 +0,0 @@
---- a/plugins/wpg/xp/ie_impGraphic_WPG.cpp
-+++ b/plugins/wpg/xp/ie_impGraphic_WPG.cpp
-@@ -31,7 +31,7 @@
- #include <gsf/gsf-input-memory.h>
- #include <gsf/gsf-input-stdio.h>
- #include <gsf/gsf-infile-msole.h>
--#include <libwpd-stream/libwpd-stream.h>
-+#include <librevenge-0.0/librevenge-stream/librevenge-stream.h>
- #include "xap_Module.h"
- 
- using libwpg::WPGraphics;
-@@ -38,30 +38,35 @@
- 
- ABI_PLUGIN_DECLARE("WPG")
- 
--class AbiWordPerfectGraphicsInputStream : public WPXInputStream
-+class AbiWordPerfectGraphicsInputStream : public librevenge::RVNGInputStream
- {
- public:
- 	AbiWordPerfectGraphicsInputStream(GsfInput *input);
- 	~AbiWordPerfectGraphicsInputStream();
- 
--	virtual bool isOLEStream();
--	virtual WPXInputStream * getDocumentOLEStream();
--	virtual WPXInputStream * getDocumentOLEStream(const char * name);
-+	virtual bool isStructured();
-+	virtual unsigned subStreamCount();
-+	virtual const char* subStreamName(unsigned);
-+	bool existsSubStream(const char*);
-+	virtual librevenge::RVNGInputStream* getSubStreamByName(const char*);
-+	virtual librevenge::RVNGInputStream* getSubStreamById(unsigned);
- 	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
--	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
-+	virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType);
- 	virtual long tell();
--	virtual bool atEOS();
-+	virtual bool isEnd();
- 
- private:
- 
- 	GsfInput *m_input;
- 	GsfInfile *m_ole;
-+	std::map<unsigned, std::string> m_substreams;
- };
- 
- AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) :
--	WPXInputStream(),
-+	librevenge::RVNGInputStream(),
- 	m_input(input),
--	m_ole(NULL)
-+	m_ole(NULL),
-+	m_substreams()
- {
- 	g_object_ref(G_OBJECT(input));
- }
-@@ -86,50 +91,120 @@
- 	return buf;
- }
- 
--int AbiWordPerfectGraphicsInputStream::seek(long offset, WPX_SEEK_TYPE seekType) 
-+int AbiWordPerfectGraphicsInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) 
- {
- 	GSeekType gsfSeekType = G_SEEK_SET;
- 	switch(seekType)
- 	{
--	case WPX_SEEK_CUR:
-+	case librevenge::RVNG_SEEK_CUR:
- 		gsfSeekType = G_SEEK_CUR;
- 		break;
--	case WPX_SEEK_SET:
-+	case librevenge::RVNG_SEEK_SET:
- 		gsfSeekType = G_SEEK_SET;
- 		break;
-+	case librevenge::RVNG_SEEK_END:
-+		gsfSeekType = G_SEEK_END;
-+		break;
- 	}
- 
- 	return gsf_input_seek(m_input, offset, gsfSeekType);
- }
- 
--bool AbiWordPerfectGraphicsInputStream::isOLEStream()
-+bool AbiWordPerfectGraphicsInputStream::isStructured()
- {
- 	if (!m_ole)
- 		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
- 
--	if (m_ole != NULL)
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
- 		return true;
- 
- 	return false;
- }
- 
--WPXInputStream * AbiWordPerfectGraphicsInputStream::getDocumentOLEStream()
-+unsigned AbiWordPerfectGraphicsInputStream::subStreamCount()
- {
--	return getDocumentOLEStream("PerfectOffice_MAIN");
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			int numChildren = gsf_infile_num_children(m_ole);
-+			if (numChildren > 0)
-+				return numChildren;
-+			return 0;
-+		}
-+	
-+	return 0;
- }
- 
--WPXInputStream * AbiWordPerfectGraphicsInputStream::getDocumentOLEStream(const char * name)
-+const char * AbiWordPerfectGraphicsInputStream::subStreamName(unsigned id)
- {
--	WPXInputStream *documentStream = NULL;
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
- 	
- 	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			if ((int)id >= gsf_infile_num_children(m_ole))
-+			{
-+				return 0;
-+			}
-+			std::map<unsigned, std::string>::iterator i = m_substreams.lower_bound(id);
-+			if (i == m_substreams.end() || m_substreams.key_comp()(id, i->first))
-+				{
-+					std::string name = gsf_infile_name_by_index(m_ole, (int)id);
-+					i = m_substreams.insert(i, std::map<unsigned, std::string>::value_type(id, name));
-+				}
-+			return i->second.c_str();
-+		}
-+	
-+	return 0;
-+}
-+
-+bool AbiWordPerfectGraphicsInputStream::existsSubStream(const char * name)
-+{
-+	if (!m_ole)
- 		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
- 	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
- 	if (m_ole)
- 		{
- 			GsfInput *document = gsf_infile_child_by_name(m_ole, name);
- 			if (document) 
- 				{
-+					g_object_unref(G_OBJECT (document));
-+					return true;
-+				}
-+		}
-+	
-+	return false;
-+}
-+
-+librevenge::RVNGInputStream * AbiWordPerfectGraphicsInputStream::getSubStreamByName(const char * name)
-+{
-+	librevenge::RVNGInputStream *documentStream = NULL;
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			GsfInput *document = gsf_infile_child_by_name(m_ole, name);
-+			if (document) 
-+				{
- 					documentStream = new AbiWordPerfectGraphicsInputStream(document);
- 					g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
- 				}
-@@ -138,12 +213,35 @@
- 	return documentStream;
- }
- 
-+librevenge::RVNGInputStream * AbiWordPerfectGraphicsInputStream::getSubStreamById(unsigned id)
-+{
-+	librevenge::RVNGInputStream *documentStream = NULL;
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			GsfInput *document = gsf_infile_child_by_index(m_ole, (int)id);
-+			if (document) 
-+				{
-+					documentStream = new AbiWordPerfectGraphicsInputStream(document);
-+					g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
-+				}
-+		}
-+	
-+	return documentStream;
-+}
-+
- long AbiWordPerfectGraphicsInputStream::tell()
- {
- 	return gsf_input_tell(m_input);
- }
- 
--bool AbiWordPerfectGraphicsInputStream::atEOS()
-+bool AbiWordPerfectGraphicsInputStream::isEnd()
- {
- 	return gsf_input_eof(m_input);
- }
-@@ -244,14 +342,24 @@
- UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg)
- {
- 	AbiWordPerfectGraphicsInputStream gsfInput(input);
--	WPXString svgOutput;
--	if (WPGraphics::generateSVG(&gsfInput, svgOutput))
-+	librevenge::RVNGString svgOutput;
-+	librevenge::RVNGStringVector vec;
-+	librevenge::RVNGSVGDrawingGenerator generator(vec, "");
-+
-+	if (!libwpg::WPGraphics::parse(&gsfInput, &generator) || vec.empty() || vec[0].empty())
- 	{
--		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
--		UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
--		g_object_unref(svgInput);
--		return result;
-+		return UT_ERROR;
- 	}
--	return UT_ERROR;
-+
-+	svgOutput.append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");
-+	svgOutput.append("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"");
-+	svgOutput.append(" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
-+	svgOutput.append(vec[0]);
-+	svgOutput.append("\n");
-+
-+	GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
-+	UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
-+	g_object_unref(svgInput);
-+	return result;
- }
- 
---- a/plugins/wpg/plugin.m4
-+++ b/plugins/wpg/plugin.m4
-@@ -1,5 +1,5 @@
- 
--wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
-+wpg_pkgs="libwpg-0.3 $gsf_req"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
---- a/plugins/wordperfect/xp/ie_imp_WordPerfect.h
-+++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.h
-@@ -30,7 +30,7 @@
- #define IE_IMP_WP_H
- 
- #include <stdio.h>
--#include <libwpd/libwpd.h>
-+#include <librevenge-0.0/librevenge/librevenge.h>
- #include "ie_imp.h"
- #include "ut_string.h"
- #include "ut_string_class.h"
-@@ -92,7 +92,7 @@
- 					IE_Imp ** ppie);
- };
- 
--class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface
-+class IE_Imp_WordPerfect : public IE_Imp, public librevenge::RVNGTextInterface
- {
- public:
-     IE_Imp_WordPerfect(PD_Document * pDocument);
-@@ -101,69 +101,83 @@
-     virtual void pasteFromBuffer(PD_DocumentRange * pDocRange,
- 				 UT_uint8 * pData, UT_uint32 lenData, const char * szEncoding = 0);
- 
--    virtual void setDocumentMetaData(const WPXPropertyList &propList);
-+	virtual void setDocumentMetaData(const librevenge::RVNGPropertyList &propList);
- 
--    virtual void startDocument();
--    virtual void endDocument();
-+	virtual void startDocument(const librevenge::RVNGPropertyList &propList);
-+	virtual void endDocument();
- 
--    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 defineEmbeddedFont(const librevenge::RVNGPropertyList & /* propList */) {}
- 
--    virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
--    virtual void closeParagraph() {}
-+	virtual void definePageStyle(const librevenge::RVNGPropertyList &) {}
-+	virtual void openPageSpan(const librevenge::RVNGPropertyList &propList);
-+	virtual void closePageSpan() {}
-+	virtual void openHeader(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeHeader();
-+	virtual void openFooter(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeFooter();
- 
--    virtual void openSpan(const WPXPropertyList &propList);
--    virtual void closeSpan() {}
-+	virtual void defineSectionStyle(const librevenge::RVNGPropertyList &) {}
-+	virtual void openSection(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeSection() {}
- 
--    virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
--    virtual void closeSection() {}
-+	virtual void defineParagraphStyle(const librevenge::RVNGPropertyList &) {}
-+	virtual void openParagraph(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeParagraph() {}
- 
--    virtual void insertTab();
--    virtual void insertText(const WPXString &text);
--    virtual void insertLineBreak();
-+	virtual void defineCharacterStyle(const librevenge::RVNGPropertyList &) {}
-+	virtual void openSpan(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeSpan() {}
- 
--    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 openLink(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void closeLink() {}
- 
--    virtual void openFootnote(const WPXPropertyList &propList);
--    virtual void closeFootnote();
--    virtual void openEndnote(const WPXPropertyList &propList);
--    virtual void closeEndnote();
-+	virtual void insertTab();
-+	virtual void insertText(const librevenge::RVNGString &text);
-+	virtual void insertSpace();
-+	virtual void insertLineBreak();
-+	virtual void insertField(const librevenge::RVNGPropertyList & /* propList */) {}
- 
--    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 openOrderedListLevel(const librevenge::RVNGPropertyList &propList);
-+	virtual void openUnorderedListLevel(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeOrderedListLevel();
-+	virtual void closeUnorderedListLevel();
-+	virtual void openListElement(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeListElement() {}
- 
--    virtual void definePageStyle(const WPXPropertyList&) {}
--    virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
--    virtual void defineCharacterStyle(const WPXPropertyList&) {}
--    virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
--    virtual void insertSpace() {}
--    virtual void insertField(const WPXString&, const WPXPropertyList&) {}
--    virtual void openComment(const WPXPropertyList&) {}
--    virtual void closeComment() {}
--    virtual void openTextBox(const WPXPropertyList&) {}
--    virtual void closeTextBox() {}
--    virtual void openFrame(const WPXPropertyList&) {}
--    virtual void closeFrame() {}
--    virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {}
--    virtual void insertEquation(const WPXPropertyList&, const WPXString&) {}
-+	virtual void openFootnote(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeFootnote();
-+	virtual void openEndnote(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeEndnote();
-+	virtual void openComment(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void closeComment() {}
-+	virtual void openTextBox(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void closeTextBox() {}
- 
-+	virtual void openTable(const librevenge::RVNGPropertyList &propList);
-+	virtual void openTableRow(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeTableRow() {}
-+	virtual void openTableCell(const librevenge::RVNGPropertyList &propList);
-+	virtual void closeTableCell() {}
-+	virtual void insertCoveredTableCell(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void closeTable();
- 
-+	virtual void openFrame(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void closeFrame() {}
-+
-+	virtual void openGroup(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void closeGroup() {}
-+
-+	virtual void defineGraphicStyle(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void drawRectangle(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void drawEllipse(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void drawPolygon(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void drawPolyline(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void drawPath(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void drawConnector(const librevenge::RVNGPropertyList & /* propList */) {}
-+
-+	virtual void insertBinaryObject(const librevenge::RVNGPropertyList & /* propList */) {}
-+	virtual void insertEquation(const librevenge::RVNGPropertyList & /* propList */) {}
-+
- protected:
- 	virtual UT_Error _loadFile(GsfInput * input);
-     UT_Error							_appendSection(int numColumns, const float, const float);
---- a/plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp
-+++ b/plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp
-@@ -35,7 +35,6 @@
- ABI_PLUGIN_DECLARE("WordPerfect")
- 
- static IE_Imp_WordPerfect_Sniffer * m_ImpSniffer = 0;
--static IE_Exp_WordPerfect_Sniffer * m_ExpSniffer = 0;
- 
- #ifdef HAVE_LIBWPS
- static IE_Imp_MSWorks_Sniffer * m_MSWorks_ImpSniffer = 0;
-@@ -49,13 +48,7 @@
- 		m_ImpSniffer = new IE_Imp_WordPerfect_Sniffer ();
- 	}
- 
--	if (!m_ExpSniffer)
--	{
--		m_ExpSniffer = new IE_Exp_WordPerfect_Sniffer ();
--	}
--
- 	UT_ASSERT (m_ImpSniffer);
--	UT_ASSERT (m_ExpSniffer);
- 
- #ifdef HAVE_LIBWPS
- 	if (!m_MSWorks_ImpSniffer)
-@@ -79,7 +72,7 @@
- 	mi->usage   = "No Usage";
- 
- 	IE_Imp::registerImporter (m_ImpSniffer);
--	//IE_Exp::registerExporter (m_ExpSniffer);
-+
- 	return 1;
- }
- 
-@@ -93,18 +86,11 @@
- 	mi->usage   = 0;
- 
- 	UT_ASSERT (m_ImpSniffer);
--	UT_ASSERT (m_ExpSniffer);
- 
- 	IE_Imp::unregisterImporter (m_ImpSniffer);
- 	delete m_ImpSniffer;
- 	m_ImpSniffer = 0;
- 	
--	/*
--	IE_Exp::unregisterExporter (m_ExpSniffer);
--	delete m_ExpSniffer;
--	m_ExpSniffer = 0;
--	*/
--
- #ifdef HAVE_LIBWPS
- 	IE_Imp::unregisterImporter (m_MSWorks_ImpSniffer);
- 	delete m_MSWorks_ImpSniffer;
---- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
-+++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
-@@ -31,6 +31,8 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
-+#include <map>
-+#include <string>
- #include <gsf/gsf-utils.h>
- #include <gsf/gsf-input-memory.h>
- #include <gsf/gsf-input-stdio.h>
-@@ -60,42 +62,47 @@
- 
- // Stream class
- 
--#include <libwpd-stream/libwpd-stream.h>
-+#include <librevenge-0.0/librevenge-stream/librevenge-stream.h>
-+#include <libwpd/libwpd.h>
- 
- #include <gsf/gsf-input.h>
- #include <gsf/gsf-infile.h>
- #include <gsf/gsf-infile-msole.h>
-+#include <gsf/gsf-infile-zip.h>
- 
- #ifdef HAVE_LIBWPS
- #include <libwps/libwps.h>
- #endif
- 
--class AbiWordperfectInputStream : public WPXInputStream
-+class AbiWordperfectInputStream : public librevenge::RVNGInputStream
- {
- public:
- 	AbiWordperfectInputStream(GsfInput *input);
- 	~AbiWordperfectInputStream();
- 
--	virtual bool isOLEStream();
--	virtual WPXInputStream * getDocumentOLEStream();
--
--	virtual WPXInputStream * getDocumentOLEStream(const char * name);
--
-+	virtual bool isStructured();
-+	virtual unsigned subStreamCount();
-+	virtual const char* subStreamName(unsigned);
-+	bool existsSubStream(const char*);
-+	virtual librevenge::RVNGInputStream* getSubStreamByName(const char*);
-+	virtual librevenge::RVNGInputStream* getSubStreamById(unsigned);
- 	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
--	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
-+	virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType);
- 	virtual long tell();
--	virtual bool atEOS();
-+	virtual bool isEnd();
- 
- private:
- 
- 	GsfInput *m_input;
- 	GsfInfile *m_ole;
-+	std::map<unsigned, std::string> m_substreams;
- };
- 
- AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) :
--	WPXInputStream(),
-+	librevenge::RVNGInputStream(),
- 	m_input(input),
--	m_ole(NULL)
-+	m_ole(NULL),
-+	m_substreams()
- {
- 	g_object_ref(G_OBJECT(input));
- }
-@@ -120,50 +127,120 @@
- 	return buf;
- }
- 
--int AbiWordperfectInputStream::seek(long offset, WPX_SEEK_TYPE seekType) 
-+int AbiWordperfectInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) 
- {
- 	GSeekType gsfSeekType = G_SEEK_SET;
- 	switch(seekType)
- 	{
--	case WPX_SEEK_CUR:
-+	case librevenge::RVNG_SEEK_CUR:
- 		gsfSeekType = G_SEEK_CUR;
- 		break;
--	case WPX_SEEK_SET:
-+	case librevenge::RVNG_SEEK_SET:
- 		gsfSeekType = G_SEEK_SET;
- 		break;
-+	case librevenge::RVNG_SEEK_END:
-+		gsfSeekType = G_SEEK_END;
-+		break;
- 	}
- 
- 	return gsf_input_seek(m_input, offset, gsfSeekType);
- }
- 
--bool AbiWordperfectInputStream::isOLEStream()
-+bool AbiWordperfectInputStream::isStructured()
- {
- 	if (!m_ole)
- 		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
- 
--	if (m_ole != NULL)
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
- 		return true;
- 
- 	return false;
- }
- 
--WPXInputStream * AbiWordperfectInputStream::getDocumentOLEStream()
-+unsigned AbiWordperfectInputStream::subStreamCount()
- {
--	return getDocumentOLEStream("PerfectOffice_MAIN");
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			int numChildren = gsf_infile_num_children(m_ole);
-+			if (numChildren > 0)
-+				return numChildren;
-+			return 0;
-+		}
-+	
-+	return 0;
- }
- 
--WPXInputStream * AbiWordperfectInputStream::getDocumentOLEStream(const char * name)
-+const char * AbiWordperfectInputStream::subStreamName(unsigned id)
- {
--	WPXInputStream *documentStream = NULL;
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
- 	
- 	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			if ((int)id >= gsf_infile_num_children(m_ole))
-+			{
-+				return 0;
-+			}
-+			std::map<unsigned, std::string>::iterator i = m_substreams.lower_bound(id);
-+			if (i == m_substreams.end() || m_substreams.key_comp()(id, i->first))
-+				{
-+					std::string name = gsf_infile_name_by_index(m_ole, (int)id);
-+					i = m_substreams.insert(i, std::map<unsigned, std::string>::value_type(id, name));
-+				}
-+			return i->second.c_str();
-+		}
-+	
-+	return 0;
-+}
-+
-+bool AbiWordperfectInputStream::existsSubStream(const char * name)
-+{
-+	if (!m_ole)
- 		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
- 	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
- 	if (m_ole)
- 		{
- 			GsfInput *document = gsf_infile_child_by_name(m_ole, name);
- 			if (document) 
- 				{
-+					g_object_unref(G_OBJECT (document));
-+					return true;
-+				}
-+		}
-+	
-+	return false;
-+}
-+
-+librevenge::RVNGInputStream * AbiWordperfectInputStream::getSubStreamByName(const char * name)
-+{
-+	librevenge::RVNGInputStream *documentStream = NULL;
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			GsfInput *document = gsf_infile_child_by_name(m_ole, name);
-+			if (document) 
-+				{
- 					documentStream = new AbiWordperfectInputStream(document);
- 					g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
- 				}
-@@ -172,12 +249,35 @@
- 	return documentStream;
- }
- 
-+librevenge::RVNGInputStream * AbiWordperfectInputStream::getSubStreamById(unsigned id)
-+{
-+	librevenge::RVNGInputStream *documentStream = NULL;
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
-+	
-+	if (!m_ole)
-+		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
-+	
-+	if (m_ole)
-+		{
-+			GsfInput *document = gsf_infile_child_by_index(m_ole, (int)id);
-+			if (document) 
-+				{
-+					documentStream = new AbiWordperfectInputStream(document);
-+					g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
-+				}
-+		}
-+	
-+	return documentStream;
-+}
-+
- long AbiWordperfectInputStream::tell()
- {
- 	return gsf_input_tell(m_input);
- }
- 
--bool AbiWordperfectInputStream::atEOS()
-+bool AbiWordperfectInputStream::isEnd()
- {
- 	return gsf_input_eof(m_input);
- }
-@@ -247,13 +347,13 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput);
--
-+	libwpd::WPDConfidence confidence = libwpd::WPDocument::isFileFormatSupported(&gsfInput);
-+	
- 	switch (confidence)
- 	{
--		case WPD_CONFIDENCE_NONE:
-+		case libwpd::WPD_CONFIDENCE_NONE:
- 			return UT_CONFIDENCE_ZILCH;
--		case WPD_CONFIDENCE_EXCELLENT:
-+		case libwpd::WPD_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
- 			return UT_CONFIDENCE_ZILCH;
-@@ -312,9 +412,9 @@
- UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input)
- {
- 	AbiWordperfectInputStream gsfInput(input);
--	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL);
-+	libwpd::WPDResult error = libwpd::WPDocument::parse(&gsfInput, static_cast<librevenge::RVNGTextInterface *>(this), NULL);
- 
--	if (error != WPD_OK)
-+	if (error != libwpd::WPD_OK)
- 	{
- 		UT_DEBUGMSG(("AbiWordPerfect: ERROR: %i!\n", (int)error));
- 		return UT_IE_IMPORTERROR;
-@@ -329,7 +429,7 @@
- 	// nada
- }
- 
--void IE_Imp_WordPerfect::setDocumentMetaData(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::setDocumentMetaData(const librevenge::RVNGPropertyList &propList)
- {
- 	if (propList["dc:author"])
- 		getDoc()->setMetaDataProp(PD_META_KEY_CREATOR, propList["dc:author"]->getStr().cstr());
-@@ -339,15 +439,15 @@
- 		getDoc()->setMetaDataProp(PD_META_KEY_PUBLISHER, propList["dc:publisher"]->getStr().cstr());
- 	if (propList["dc:type"])
- 		getDoc()->setMetaDataProp(PD_META_KEY_TYPE, propList["dc:category"]->getStr().cstr());
--	if (propList["libwpd:keywords"])
--		getDoc()->setMetaDataProp(PD_META_KEY_KEYWORDS, propList["libwpd:keywords"]->getStr().cstr());
-+	if (propList["librevenge:keywords"])
-+		getDoc()->setMetaDataProp(PD_META_KEY_KEYWORDS, propList["librevenge:keywords"]->getStr().cstr());
- 	if (propList["dc:language"])
- 		getDoc()->setMetaDataProp(PD_META_KEY_LANGUAGE, propList["dc:language"]->getStr().cstr());
--	if (propList["libwpd:abstract"])
--		getDoc()->setMetaDataProp(PD_META_KEY_DESCRIPTION, propList["libwpd:abstract"]->getStr().cstr());
-+	if (propList["librevenge:abstract"])
-+		getDoc()->setMetaDataProp(PD_META_KEY_DESCRIPTION, propList["librevenge:abstract"]->getStr().cstr());
- }
- 
--void IE_Imp_WordPerfect::startDocument()
-+void IE_Imp_WordPerfect::startDocument(const librevenge::RVNGPropertyList & /* propList */)
- {
- 	UT_DEBUGMSG(("AbiWordPerfect: startDocument\n"));
- }
-@@ -357,7 +457,7 @@
- 	UT_DEBUGMSG(("AbiWordPerfect: endDocument\n"));
- }
- 
--void IE_Imp_WordPerfect::openPageSpan(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::openPageSpan(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	UT_DEBUGMSG(("AbiWordPerfect: openPageSpan\n"));
-@@ -378,7 +478,7 @@
- 		
- }
- 
--void IE_Imp_WordPerfect::openHeader(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openHeader(const librevenge::RVNGPropertyList & /*propList*/)
- {
- 	m_bHdrFtrOpenCount++;
- 	
-@@ -420,7 +520,7 @@
- 	*/
- }
- 
--void IE_Imp_WordPerfect::openFooter(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openFooter(const librevenge::RVNGPropertyList & /*propList*/)
- {
- 	m_bHdrFtrOpenCount++;
- 	// see above comments re: openHeader
-@@ -432,7 +532,7 @@
- 	// see above comments re: closeHeader
- }
- 
--void IE_Imp_WordPerfect::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops)
-+void IE_Imp_WordPerfect::openParagraph(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	UT_DEBUGMSG(("AbiWordPerfect: openParagraph()\n"));
-@@ -478,13 +578,15 @@
- 		(int)(m_topMargin*72), (int)(m_bottomMargin*72), m_leftMarginOffset, m_rightMarginOffset, m_textIndent, lineSpacing);
- 	propBuffer += tmpBuffer;
- 	
--	if (tabStops.count() > 0) // Append the tabstop information
-+	const librevenge::RVNGPropertyListVector *tabStops = propList.child("style:tab-stops");
-+	
-+	if (tabStops && tabStops->count()) // Append the tabstop information
- 	{
- 		propBuffer += "; tabstops:";
- 		tmpBuffer = "";
--                WPXPropertyListVector::Iter i(tabStops);
--                for (i.rewind(); i.next();)
--                {
-+		librevenge::RVNGPropertyListVector::Iter i(*tabStops);
-+		for (i.rewind(); i.next();)
-+		{
- 			propBuffer += tmpBuffer;
- 			if (i()["style:position"])
- 			{
-@@ -515,8 +617,8 @@
- 				propBuffer += "0";
- 
- 			tmpBuffer = ",";
--                }
--        }
-+		}
-+	}
- 
- 	
- 
-@@ -543,7 +645,7 @@
- 	}
- }
- 
--void IE_Imp_WordPerfect::openSpan(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::openSpan(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	UT_DEBUGMSG(("AbiWordPerfect: Appending current text properties\n"));
-@@ -614,13 +716,14 @@
- 	X_CheckDocumentError(appendFmt(propsArray));
- }
- 
--void IE_Imp_WordPerfect::openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
-+void IE_Imp_WordPerfect::openSection(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	UT_DEBUGMSG(("AbiWordPerfect: openSection\n"));
- 
- 	float marginLeft = 0.0f, marginRight = 0.0f;
--	int columnsCount = ((columns.count() == 0) ? 1 : columns.count());
-+	const librevenge::RVNGPropertyListVector *columns = propList.child("style:columns");
-+	int columnsCount = ((!columns || !columns->count()) ? 1 : columns->count());
- 
- 	// TODO: support spaceAfter
- 	if (propList["fo:start-indent"])
-@@ -647,7 +750,7 @@
- 	X_CheckDocumentError(appendSpan(&ucs,1));	
- }
- 
--void IE_Imp_WordPerfect::insertText(const WPXString &text)
-+void IE_Imp_WordPerfect::insertText(const librevenge::RVNGString &text)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	if (text.len())
-@@ -658,6 +761,15 @@
- 	}
- }
- 
-+void IE_Imp_WordPerfect::insertSpace()
-+{
-+	if (m_bHdrFtrOpenCount) return; // HACK
-+	UT_DEBUGMSG(("AbiWordPerfect: insertSpace\n"));
-+
-+	UT_UCS4Char ucs = UCS_SPACE;
-+	X_CheckDocumentError(appendSpan(&ucs,1));	
-+}
-+
- void IE_Imp_WordPerfect::insertLineBreak()
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
-@@ -668,12 +780,11 @@
- }
- 
- 
--
--void IE_Imp_WordPerfect::defineOrderedListLevel(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::openOrderedListLevel(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
--	UT_DEBUGMSG(("AbiWordPerfect: defineOrderedListLevel\n"));
--
-+	UT_DEBUGMSG(("AbiWordPerfect: openOrderedListLevel\n"));
-+	
- 	int listID = 0, startingNumber = 0, level = 1;
- 	char listType = '1';
- 	UT_UTF8String textBeforeNumber, textAfterNumber;
-@@ -680,12 +791,12 @@
- 	float listLeftOffset = 0.0f;
- 	float listMinLabelWidth = 0.0f;
- 	
--	if (propList["libwpd:id"])
--		listID = propList["libwpd:id"]->getInt();
-+	if (propList["librevenge:id"])
-+		listID = propList["librevenge:id"]->getInt();
- 	if (propList["text:start-value"])
- 		startingNumber = propList["text:start-value"]->getInt();
--	if (propList["libwpd:level"])
--		level = propList["libwpd:level"]->getInt();
-+	if (propList["librevenge:level"])
-+		level = propList["librevenge:level"]->getInt();
- 	if (propList["style:num-prefix"])
- 		textBeforeNumber += propList["style:num-prefix"]->getStr().cstr();
- 	if (propList["style:num-suffix"])
-@@ -716,22 +827,38 @@
- 		m_pCurrentListDefinition->setListMinLabelWidth(level, listMinLabelWidth);
- 		_updateDocumentOrderedListDefinition(m_pCurrentListDefinition, level, listType, textBeforeNumber, textAfterNumber, startingNumber);
- 	}
-+
-+	m_iCurrentListLevel++;
- }
- 
--void IE_Imp_WordPerfect::defineUnorderedListLevel(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::closeOrderedListLevel()
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
--	UT_DEBUGMSG(("AbiWordPerfect: defineUnorderedListLevel\n"));
-+	UT_DEBUGMSG(("AbiWordPerfect: closeOrderedListLevel (level: %i)\n", m_iCurrentListLevel));
-+	UT_ASSERT(m_iCurrentListLevel > 0); 
-+	
-+	// every time we close a list level, the level above it is normally renumbered to start at "1"
-+	// again. this code takes care of that.
-+	if (m_iCurrentListLevel < (WP6_NUM_LIST_LEVELS-1))
-+		m_pCurrentListDefinition->setLevelNumber(m_iCurrentListLevel + 1, 0);
-+	
-+	m_iCurrentListLevel--;
-+}
- 
-+void IE_Imp_WordPerfect::openUnorderedListLevel(const librevenge::RVNGPropertyList &propList)
-+{
-+	if (m_bHdrFtrOpenCount) return; // HACK
-+	UT_DEBUGMSG(("AbiWordPerfect: openUNorderedListLevel\n"));
-+	
- 	int listID = 0, level = 1;
--	WPXString textBeforeNumber, textAfterNumber;
-+	librevenge::RVNGString textBeforeNumber, textAfterNumber;
- 	float listLeftOffset = 0.0f;
- 	float listMinLabelWidth = 0.0f;
- 	
--	if (propList["libwpd:id"])
--		listID = propList["libwpd:id"]->getInt();
--	if (propList["libwpd:level"])
--		level = propList["libwpd:level"]->getInt();
-+	if (propList["librevenge:id"])
-+		listID = propList["librevenge:id"]->getInt();
-+	if (propList["librevenge:level"])
-+		level = propList["librevenge:level"]->getInt();
- 	if (propList["text:space-before"])
- 		listLeftOffset = propList["text:space-before"]->getDouble();
- 	if (propList["text:min-label-width"])
-@@ -752,39 +879,10 @@
- 		m_pCurrentListDefinition->setListMinLabelWidth(level, listMinLabelWidth);
- 		_updateDocumentUnorderedListDefinition(m_pCurrentListDefinition, level);
- 	}
--}
- 
--//void IE_Imp_WordPerfect::openOrderedListLevel(const int listID)
--void IE_Imp_WordPerfect::openOrderedListLevel(const WPXPropertyList & /*propList*/)
--{
--	if (m_bHdrFtrOpenCount) return; // HACK
--	UT_DEBUGMSG(("AbiWordPerfect: openOrderedListLevel\n"));
--	
- 	m_iCurrentListLevel++;
- }
- 
--void IE_Imp_WordPerfect::closeOrderedListLevel()
--{
--	if (m_bHdrFtrOpenCount) return; // HACK
--	UT_DEBUGMSG(("AbiWordPerfect: closeOrderedListLevel (level: %i)\n", m_iCurrentListLevel));
--	UT_ASSERT(m_iCurrentListLevel > 0); 
--	
--	// every time we close a list level, the level above it is normally renumbered to start at "1"
--	// again. this code takes care of that.
--	if (m_iCurrentListLevel < (WP6_NUM_LIST_LEVELS-1))
--		m_pCurrentListDefinition->setLevelNumber(m_iCurrentListLevel + 1, 0);
--	
--	m_iCurrentListLevel--;
--}
--
--void IE_Imp_WordPerfect::openUnorderedListLevel(const WPXPropertyList & /*propList*/)
--{
--	if (m_bHdrFtrOpenCount) return; // HACK
--	UT_DEBUGMSG(("AbiWordPerfect: openUNorderedListLevel\n"));
--	
--	m_iCurrentListLevel++;
--}
--
- void IE_Imp_WordPerfect::closeUnorderedListLevel()
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
-@@ -796,7 +894,7 @@
- 
- // ASSUMPTION: We assume that unordered lists will always pass a number of "0". unpredictable behaviour
- // may result otherwise
--void IE_Imp_WordPerfect::openListElement(const WPXPropertyList &propList, const WPXPropertyListVector & /*tabStops*/)
-+void IE_Imp_WordPerfect::openListElement(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	UT_DEBUGMSG(("AbiWordPerfect: openListElement\n"));
-@@ -885,7 +983,7 @@
- 	X_CheckDocumentError(appendSpan(&ucs,1));
- }
- 
--void IE_Imp_WordPerfect::openFootnote(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openFootnote(const librevenge::RVNGPropertyList & /*propList*/)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 
-@@ -934,7 +1032,7 @@
- 	X_CheckDocumentError(appendStrux(PTX_EndFootnote,NULL));
- }
- 
--void IE_Imp_WordPerfect::openEndnote(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openEndnote(const librevenge::RVNGPropertyList & /*propList*/)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	const gchar** propsArray = NULL;
-@@ -975,7 +1073,7 @@
- 	X_CheckDocumentError(appendStrux(PTX_EndEndnote,NULL));
- }
- 
--void IE_Imp_WordPerfect::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
-+void IE_Imp_WordPerfect::openTable(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	// TODO: handle 'marginLeftOffset' and 'marginRightOffset'
-@@ -1000,14 +1098,18 @@
- 		}
- 	}
- 	
--	propBuffer += "table-column-props:";
--	WPXPropertyListVector::Iter i(columns);
--	for (i.rewind(); i.next();)
-+	const librevenge::RVNGPropertyListVector *columns = propList.child("librevenge:table-columns");
-+	if (columns)
- 	{
--		UT_String tmpBuffer;
--		if (i()["style:column-width"])
--			UT_String_sprintf(tmpBuffer, "%s/", i()["style:column-width"]->getStr().cstr());
--		propBuffer += tmpBuffer;
-+		propBuffer += "table-column-props:";
-+		librevenge::RVNGPropertyListVector::Iter i(*columns);
-+		for (i.rewind(); i.next();)
-+		{
-+			UT_String tmpBuffer;
-+			if (i()["style:column-width"])
-+				UT_String_sprintf(tmpBuffer, "%s/", i()["style:column-width"]->getStr().cstr());
-+			propBuffer += tmpBuffer;
-+		}
- 	}
- 
- 	const gchar* propsArray[3];
-@@ -1018,7 +1120,7 @@
- 	X_CheckDocumentError(appendStrux(PTX_SectionTable, propsArray));
- }
- 
--void IE_Imp_WordPerfect::openTableRow(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openTableRow(const librevenge::RVNGPropertyList & /*propList*/)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	UT_DEBUGMSG(("AbiWordPerfect: openRow\n"));
-@@ -1030,14 +1132,14 @@
- 	m_bInCell = false;
- }
- 
--void IE_Imp_WordPerfect::openTableCell(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::openTableCell(const librevenge::RVNGPropertyList &propList)
- {
- 	if (m_bHdrFtrOpenCount) return; // HACK
- 	int col =0,  row = 0, colSpan = 0, rowSpan = 0;
--	if (propList["libwpd:column"])
--		col = propList["libwpd:column"]->getInt();
--	if (propList["libwpd:row"])
--		row = propList["libwpd:row"]->getInt();
-+	if (propList["librevenge:column"])
-+		col = propList["librevenge:column"]->getInt();
-+	if (propList["librevenge:row"])
-+		row = propList["librevenge:row"]->getInt();
- 	if (propList["table:number-columns-spanned"])
- 		colSpan = propList["table:number-columns-spanned"]->getInt();
- 	if (propList["table:number-rows-spanned"])
-@@ -1247,9 +1349,9 @@
-     virtual UT_Error _loadFile(GsfInput * input)
- 	{
- 		AbiWordperfectInputStream gsfInput(input);
--		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this));
-+		libwps::WPSResult error = libwps::WPSDocument::parse(&gsfInput, static_cast<librevenge::RVNGTextInterface *>(this));
- 
--		if (error != WPS_OK)
-+		if (error != libwps::WPS_OK)
- 			{
- 				UT_DEBUGMSG(("AbiMSWorks: ERROR: %i!\n", (int)error));
- 				return UT_IE_IMPORTERROR;
-@@ -1286,13 +1388,17 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
-+	libwps::WPSKind kind;
-+	libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
-+	
-+	if (kind != libwps::WPS_TEXT)
-+		confidence = libwps::WPS_CONFIDENCE_NONE;
- 
- 	switch (confidence)
- 	{
--		case WPS_CONFIDENCE_NONE:
-+		case libwps::WPS_CONFIDENCE_NONE:
- 			return UT_CONFIDENCE_ZILCH;
--		case WPS_CONFIDENCE_EXCELLENT:
-+		case libwps::WPS_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
- 			return UT_CONFIDENCE_ZILCH;
---- a/plugins/wordperfect/xp/Makefile.am
-+++ b/plugins/wordperfect/xp/Makefile.am
-@@ -6,8 +6,6 @@
- 	-DABI_BUILD_VERSION=\"$(VERSION)\"
- 
- libxp_la_SOURCES = \
--	ie_exp_WordPerfect.cpp \
--	ie_exp_WordPerfect.h \
- 	ie_impexp_WordPerfect.cpp \
- 	ie_impexp_WordPerfect.h \
- 	ie_imp_WordPerfect.cpp \
---- a/plugins/wordperfect/xp/ie_impexp_WordPerfect.h
-+++ b/plugins/wordperfect/xp/ie_impexp_WordPerfect.h
-@@ -24,7 +24,6 @@
-  */
- 
- #include "ie_imp_WordPerfect.h"
--#include "ie_exp_WordPerfect.h"
- #include "xap_Module.h"
- 
- #define IE_MIMETYPE_WP_51			"application/wordperfect5.1"
---- a/plugins/wordperfect/plugin.m4
-+++ b/plugins/wordperfect/plugin.m4
-@@ -1,6 +1,6 @@
- 
--wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
-+wordperfect_pkgs="libwpd-0.10 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.3'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-@@ -29,7 +29,7 @@
- 
- PKG_CHECK_EXISTS([ $wordperfect_wps_pkgs ],
- [
--	wp_deps_pkgs="$wp_deps_pkgs $wordperfect_wps_pkgs"
-+	wp_deps_pkgs="$wordperfect_wps_pkgs $wp_deps_pkgs"
- 	WPS_DEFINE=" -DHAVE_LIBWPS"
- ])
- 
diff --git a/app-office/abiword/files/abiword-3.0.0-libwp.patch b/app-office/abiword/files/abiword-3.0.0-libwp.patch
deleted file mode 100644
index 9f269bd41116..000000000000
--- a/app-office/abiword/files/abiword-3.0.0-libwp.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9734c2cc2638b16cc9b9c33adb2fbe5b793226f5 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Sat, 6 Jun 2015 18:43:14 +0200
-Subject: [PATCH] fix libwp? detection
-
----
- plugin-configure.m4 | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugin-configure.m4 b/plugin-configure.m4
-index 54998fb..92e4ec2 100644
---- a/plugin-configure.m4
-+++ b/plugin-configure.m4
-@@ -1355,7 +1355,7 @@ AC_SUBST([BMP_CFLAGS])
- AC_SUBST([BMP_LIBS])
- 
- 
--wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
-+wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-@@ -1469,8 +1469,8 @@ AC_SUBST([AIKSAURUS_CFLAGS])
- AC_SUBST([AIKSAURUS_LIBS])
- 
- 
--wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
-+wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.3'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
--- 
-2.4.2
-
diff --git a/app-office/abiword/files/abiword-3.0.0-link-grammar-5-second.patch b/app-office/abiword/files/abiword-3.0.0-link-grammar-5-second.patch
deleted file mode 100644
index d9f9cf35ce46..000000000000
--- a/app-office/abiword/files/abiword-3.0.0-link-grammar-5-second.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp
-+++ b/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp
-@@ -223,6 +223,7 @@
- 	  pErr = NULL;
- 	}
- 
-+#ifdef DEAD_DEBUG_CODE
- 	//	  for(i=0; i< pT->m_vecGrammarErrors.getItemCount(); i++)
- 	// {
- 	//    pErr = pT->m_vecGrammarErrors.getNthItem(i);
-@@ -231,6 +232,8 @@
- 	UT_UTF8String sErr = linkage_get_violation_name(linkage);
- 	//	UT_DEBUGMSG(("Top Level error message |%s|\n",sErr.utf8_str()));
- 	linkage_delete(linkage);
-+#endif // DEAD_DEBUG_CODE
-+
- 	for(i=0; i<  vecMapOfWords.getItemCount(); i++)
- 	{
- 	  AbiGrammarError * p = vecMapOfWords.getNthItem(i);
diff --git a/app-office/abiword/files/abiword-3.0.1-fixwps.patch b/app-office/abiword/files/abiword-3.0.1-fixwps.patch
deleted file mode 100644
index 2929d5b1748c..000000000000
--- a/app-office/abiword/files/abiword-3.0.1-fixwps.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- abiword-3.0.1/plugin-configure.m4.orig	2016-04-10 14:22:18.271356761 +0100
-+++ abiword-3.0.1/plugin-configure.m4	2016-04-10 14:24:22.493303398 +0100
-@@ -1355,7 +1355,7 @@
- AC_SUBST([BMP_LIBS])
- 
- 
--wpg_pkgs="$gsf_req libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0"
-+wpg_pkgs="libwpg-0.3 $gsf_req"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-@@ -1469,8 +1469,8 @@
- AC_SUBST([AIKSAURUS_LIBS])
- 
- 
--wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.4'
-+wordperfect_pkgs="libwpd-0.10 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.3'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-@@ -1499,7 +1499,7 @@
- 
- PKG_CHECK_EXISTS([ $wordperfect_wps_pkgs ],
- [
--	wp_deps_pkgs="$wp_deps_pkgs $wordperfect_wps_pkgs"
-+	wp_deps_pkgs="$wordperfect_wps_pkgs $wp_deps_pkgs"
- 	WPS_DEFINE=" -DHAVE_LIBWPS"
- ])
- 
diff --git a/app-office/abiword/files/abiword-3.0.1-libwps-0.4.patch b/app-office/abiword/files/abiword-3.0.1-libwps-0.4.patch
deleted file mode 100644
index 292f68164ae2..000000000000
--- a/app-office/abiword/files/abiword-3.0.1-libwps-0.4.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 6fcb43935bab90d61858eb1bc0f150c843586c54 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Sat, 6 Jun 2015 21:48:02 +0200
-Subject: [PATCH] adapt to libwps 0.4
-
----
- plugin-configure.m4                           | 2 +-
- plugins/wordperfect/plugin.m4                 | 2 +-
- plugins/wordperfect/xp/ie_imp_WordPerfect.cpp | 4 +++-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/plugin-configure.m4 b/plugin-configure.m4
-index 2757f4a..093fbcb 100644
---- a/plugin-configure.m4
-+++ b/plugin-configure.m4
-@@ -1470,7 +1470,7 @@ AC_SUBST([AIKSAURUS_LIBS])
- 
- 
- wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.3'
-+wordperfect_wps_pkgs='libwps-0.4'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-diff --git a/plugins/wordperfect/plugin.m4 b/plugins/wordperfect/plugin.m4
-index 0aadbaf..bc32d48 100644
---- a/plugins/wordperfect/plugin.m4
-+++ b/plugins/wordperfect/plugin.m4
-@@ -1,6 +1,6 @@
- 
- wordperfect_pkgs="libwpd-0.10 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.3'
-+wordperfect_wps_pkgs='libwps-0.4'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-diff --git a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
-index bd19971..3e69f79 100644
---- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
-+++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
-@@ -1389,7 +1389,9 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::recognizeContents (GsfInput * input)
- 	AbiWordperfectInputStream gsfInput(input);
- 
- 	libwps::WPSKind kind;
--	libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
-+        libwps::WPSCreator creator;
-+        bool needsEncoding = false;
-+	libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind, creator, needsEncoding);
- 	
- 	if (kind != libwps::WPS_TEXT)
- 		confidence = libwps::WPS_CONFIDENCE_NONE;
--- 
-2.4.2
-
diff --git a/app-office/abiword/files/abiword-3.0.2-fix-black-drawing-regression.patch b/app-office/abiword/files/abiword-3.0.2-fix-black-drawing-regression.patch
deleted file mode 100644
index dbce8c696dab..000000000000
--- a/app-office/abiword/files/abiword-3.0.2-fix-black-drawing-regression.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From cec2fda355b67b5b814a803c5ed128c425cbb030 Mon Sep 17 00:00:00 2001
-From: Hubert Figuiere <hub@figuiere.net>
-Date: Thu, 8 Dec 2016 02:03:10 +0000
-Subject: [PATCH] Bug 13815 - draw event should return TRUE
-
-This fix the black drawing regression with Gtk3.22
-
-git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@35394 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
----
- src/af/xap/gtk/xap_UnixFrameImpl.cpp | 6 +++---
- src/af/xap/gtk/xap_UnixFrameImpl.h   | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-index 780000e..10f8e00 100644
---- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g
- }
- 
- #if GTK_CHECK_VERSION(3,0,0)
--gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
-+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
- #else
--gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
-+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
- #endif
- {
- 	XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
-@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
- 		pView->draw(&rClip);
- #endif
- 	}
--	return FALSE;
-+	return TRUE;
- }
- 
- static bool bScrollWait = false;
-diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h
-index 30ee5d8..a0ff57f 100644
---- a/src/af/xap/gtk/xap_UnixFrameImpl.h
-+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h
-@@ -152,9 +152,9 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl
- 			static gint key_release_event(GtkWidget* w, GdkEventKey* e);
- 			static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
- #if GTK_CHECK_VERSION(3,0,0)
--			static gint draw(GtkWidget * w, cairo_t * cr);
-+			static gboolean draw(GtkWidget * w, cairo_t * cr);
- #else
--			static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
-+			static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
- #endif
- 			static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p);
- 			static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/);
diff --git a/app-office/abiword/files/abiword-3.0.2-fix-installing-readme.patch b/app-office/abiword/files/abiword-3.0.2-fix-installing-readme.patch
deleted file mode 100644
index 34c6f4f5bb72..000000000000
--- a/app-office/abiword/files/abiword-3.0.2-fix-installing-readme.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Change the installation directory of the readme.txt file
-to match standard FHS conventions.
-
---- a/user/wp/Makefile.am
-+++ b/user/wp/Makefile.am
-@@ -9,10 +9,11 @@
- EXTRA_DIST = \
- 	$(wp_DATA)
- 
-+doc_DATA = \
-+	readme.txt
-+
- wpdir = $(ABIWORD_DATADIR)
- wp_DATA = \
--	readme.txt \
--	readme.abw \
- 	system.profile \
- 	system.profile-am-ET \
- 	system.profile-ar \
diff --git a/app-office/abiword/files/abiword-3.0.2-fix-nullptr-c++98.patch b/app-office/abiword/files/abiword-3.0.2-fix-nullptr-c++98.patch
deleted file mode 100644
index f09319693fe4..000000000000
--- a/app-office/abiword/files/abiword-3.0.2-fix-nullptr-c++98.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Replace 'nullptr' by NULL in order to allow compiling in C++98 mode.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=599618
-
---- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
-+++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
-@@ -180,7 +180,7 @@
- 	if (m_styleBg) {
- 		g_object_unref(m_styleBg);
- 	}
--	m_styleBg = XAP_GtkStyle_get_style(nullptr, "GtkButton"); // "button"
-+	m_styleBg = XAP_GtkStyle_get_style(NULL, "GtkButton"); // "button"
- 	// guess colours
- 	// WHITE
- 	GdkRGBA rgba2;
-@@ -627,7 +627,7 @@
- 		_setProps();
- 		cairo_save (m_cr);
- 
--		GtkStyleContext *context = nullptr;
-+		GtkStyleContext *context = NULL;
- 		switch(c) {
- 		case GR_Graphics::CLR3D_Background:
- 			context = m_styleBg;
---- a/src/wp/ap/xp/ap_Dialog_Spell.cpp
-+++ b/src/wp/ap/xp/ap_Dialog_Spell.cpp
-@@ -251,7 +251,7 @@
- 					UT_return_val_if_fail (m_Suggestions, false);
- 
- 					// get suggestions from spelling engine
--					const UT_GenericVector<UT_UCSChar*> *cpvEngineSuggestions = nullptr;
-+					const UT_GenericVector<UT_UCSChar*> *cpvEngineSuggestions = NULL;
- 
- 					if (checker->checkWord(m_pWord, m_iWordLength) == SpellChecker::LOOKUP_FAILED)
- 					{