diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 0812db903a62..271da70a9f5b 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,159 +1,105 @@ PORTNAME= abiword -PORTVERSION= 3.0.5 -PORTREVISION= 15 +DISTVERSIONPREFIX= release- +DISTVERSION= 3.0.8 CATEGORIES= editors -MASTER_SITES= https://dev.alpinelinux.org/archive/${PORTNAME}/ DIST_SUBDIR= AbiWord +PATCH_SITES= https://gitlab.gnome.org/World/AbiWord/-/commit/ +PATCHFILES= ae05e92d.patch:-p1 + MAINTAINER= gnome@FreeBSD.org -COMMENT= Open-source, cross-platform WYSIWYG word processor +COMMENT= Full-featured, efficient word processing application WWW= https://gitlab.gnome.org/World/AbiWord -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ - libpopt.so:devel/popt \ - libpng.so:graphics/png \ - libwv.so:textproc/wv \ - libfribidi.so:converters/fribidi \ - libgoffice-0.10.so:devel/goffice +BUILD_DEPENDS= autoconf-archive>0:devel/autoconf-archive \ + ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs +LIB_DEPENDS= libfribidi.so:converters/fribidi \ + libpng16.so:graphics/png \ + libgoffice-0.10.so:devel/goffice \ + libfreetype.so:print/freetype2 \ + libgcrypt.so:security/libgcrypt \ + libgpg-error.so:security/libgpg-error \ + libexpat.so:textproc/expat2 \ + libwv-1.2.so.4:textproc/wv \ + libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu -USES= compiler:c++11-lang cpe desktop-file-utils gmake gnome iconv jpeg \ - libtool localbase:ldflags pathfix pkgconfig +USES= autoreconf bison compiler:c++11-lang cpe desktop-file-utils \ + gettext-tools gmake gnome iconv jpeg libtool localbase:ldflags \ + pathfix perl5 pkgconfig python:build readline shebangfix xorg CPE_VENDOR= abisource -USE_GNOME= libxml2 gtk30 librsvg2 libxslt +USE_GITLAB= yes +GL_SITE= https://gitlab.gnome.org +GL_ACCOUNT= World +GL_PROJECT= AbiWord +USE_GNOME= glib20 gtk30 introspection:build libgsf libxml2 librsvg2 \ + libxslt USE_LDCONFIG= yes +USE_PERL5= build +USE_XORG= x11 +SHEBANG_FILES= tools/cdump/xp/*.pl \ + tools/rtfgen/*.pl \ + po/*.pl GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --without-gnomevfs --enable-plugins="${ABIWORD_PLUGINS}" \ - --enable-shared="yes" --enable-static="no" + --enable-shared=yes --enable-static=no \ + --enable-introspection=yes INSTALL_TARGET= install-strip PLIST_SUB+= ABIVERSION=3.0 -OPTIONS_DEFINE= CLIPART DEBUG MATHVIEW NLS PSION \ - TEMPLATES WP -OPTIONS_DEFAULT=CLIPART COLSUGAR SPELLCHECK TEMPLATES -OPTIONS_GROUP= DICT COLLAB -OPTIONS_GROUP_COLLAB= COLFAKE COLSERVICE COLSIP COLSUGAR COLTCP COLTELEPATHY COLXMPP +OPTIONS_DEFINE= CLIPART DEBUG TEMPLATES WMF WP +OPTIONS_DEFAULT=CLIPART SPELLCHECK TEMPLATES WMF +OPTIONS_GROUP= DICT OPTIONS_GROUP_DICT= GRAMMAR SPELLCHECK OPTIONS_SUB= yes CLIPART_DESC= Include clipart -COLFAKE_DESC= Fake collaboration for debugging purposes only -COLLAB_DESC= Collaboration backend -COLSERVICE_DESC= Collaborate with AbiCollab.net webservice -COLSIP_DESC= Collaborate with the SIP/SIMPLE backend -COLSUGAR_DESC= Collaborate with the Sugar/OLPC environment -COLTCP_DESC= Collaborate with direct TCP peer to peer connections -COLTELEPATHY_DESC= Collaborate with the Telepathy backend (experimental) -COLXMPP_DESC= Collaborate with the Jabber/XMPP backend DICT_DESC= Spelling and grammar checking GRAMMAR_DESC= Grammar checking plugin -MATHVIEW_DESC= MathML render plugin -PSION_DESC= Psion 5(MX) files convertion plugin SPELLCHECK_DESC= Spell checking support TEMPLATES_DESC= Include additional templates +WMF_DESC= Windows Metafile plugin WP_DESC= WordPerfect img/doc import/export plugin # check configure for ALL_PLUGINS for complete list -ABIWORD_PLUGINS= garble loadbindings opml xslfo bmp iscii sdw babelfish \ - paint command latex pdf wikipedia hrtext openxml \ - goffice wmf kword mif wml s5 freetranslation gdict mht \ - applix t602 docbook google eml hancom presentation \ - clarisworks pdb urldict openwriter mswrite gimp \ - passepartout eml - -# opendocument enabled by default, rsvg plugin isn't needed on unix. -# Plugins we don't support: -# gda +ABIWORD_PLUGINS= applix bmp clarisworks command docbook eml epub \ + garble gimp goffice hancom hrtext iscii latex \ + loadbindings mif mswrite openwriter opml paint \ + passepartout pdb pdf presentation s5 sdw t602 \ + wml wikipedia xslfo CLIPART_CONFIGURE_ENABLE= clipart -COLFAKE_CONFIGURE_ENABLE= collab-backend-fake - -COLSERVICE_BROKEN= Does not build with asio from system -COLSERVICE_BUILD_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio -COLSERVICE_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ - libgnutls.so:security/gnutls -COLSERVICE_RUN_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio -COLSERVICE_CONFIGURE_ENABLE= collab-backend-service - -COLSIP_CONFIGURE_ENABLE= collab-backend-sip - -COLSUGAR_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib -COLSUGAR_CONFIGURE_ENABLE= collab-backend-sugar - -COLTCP_BROKEN= Does not build with asio from system -COLTCP_BUILD_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio -COLTCP_RUN_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio -COLTCP_CONFIGURE_ENABLE= collab-backend-tcp - -COLTELEPATHY_LIB_DEPENDS= libtelepathy-glib.so:net-im/telepathy-glib -COLTELEPATHY_CONFIGURE_ENABLE= collab-backend-telepathy - -COLXMPP_LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth -COLXMPP_CONFIGURE_ENABLE= collab-backend-xmpp - DEBUG_CONFIGURE_ENABLE= debug GRAMMAR_IMPLIES= SPELLCHECK GRAMMAR_LIB_DEPENDS= liblink-grammar.so:textproc/link-grammar GRAMMAR_VARS= ABIWORD_PLUGINS+=grammar -MATHVIEW_LIB_DEPENDS= libmathview.so:x11-toolkits/gtkmathview -MATHVIEW_USES= bison -MATHVIEW_VARS= ABIWORD_PLUGINS+=mathview - -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls - -PSION_LIB_DEPENDS= libpsiconv.so:converters/psiconv -PSION_VARS= ABIWORD_PLUGINS+=psion - -SPELLCHECK_LIB_DEPENDS= libenchant.so:textproc/enchant +SPELLCHECK_LIB_DEPENDS= libenchant-2.so:textproc/enchant2 SPELLCHECK_CONFIGURE_ENABLE= spell TEMPLATES_CONFIGURE_ENABLE= templates +WMF_LIB_DEPENDS= libwmf-0.2.so.7:graphics/libwmf +WMF_VARS= ABIWORD_PLUGINS+=wmf + WP_LIB_DEPENDS= libwpg-0.3.so:graphics/libwpg03 \ libwpd-0.10.so:textproc/libwpd010 \ libwps-0.4.so:textproc/libwps -WP_USE= gnome=libgsf WP_VARS= ABIWORD_PLUGINS+="wpg wordperfect" -.include - -.if ${PORT_OPTIONS:MCOL*} -ABIWORD_PLUGINS+= collab -PLIST_SUB+= COLLAB="" -.else -PLIST_SUB+= COLLAB="@comment " -.endif - post-patch: - @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ - ${WRKSRC}/goffice-bits/goffice/app/goffice-app.h \ - ${WRKSRC}/src/af/util/xp/ut_go_file.h -# The following substitutions ensure that plugins are linked with libabiword -# from the work or stage directory instead of a previously installed library. -# In pseudo code: -# s,PLUGIN_LIBS="$PLUGIN_LIBS -Lsrc -labiword", -# PLUGIN_LIBS="src/libabiword.la $PLUGIN_LIBS", -# s,foo_LIBS="$foo_LIBS $PLUGIN_LIBS", -# foo_LIBS="$PLUGIN_LIBS $foo_LIBS", -# The initial value of PLUGIN_LIBS may contain -L/usr/local/lib so it would -# have to come after -Lsrc, but -Lsrc is not correct when libtool relinks -# plugins during staging so use src/libabiword.la and let libtool figure out -# what flags are needed. Secondly, switch around foo_LIBS and PLUGIN_LIBS -# because foo_LIBS may contain -L/usr/local/lib. - @${REINPLACE_CMD} \ - -e "s,\$$PLUGIN_LIBS \"'-L\$${top_builddir}/src'\" -labiword-\$$ABIWORD_SERIES,\\\\\$${top_builddir}/src/libabiword-\$$ABIWORD_SERIES.la \$$PLUGIN_LIBS," \ - -e "/_LIBS=/s,\"\\(.*\\)\"\\('\$${PLUGIN_LIBS}.*'\\),\\2\" \\1\"," \ - -e 's|" == "|" = "|g' ${WRKSRC}/configure + ${REINPLACE_CMD} -i "" -e 's|com\.abisource\.AbiWord|${PORTNAME}|' \ + ${WRKSRC}/abiword.appdata.xml + +pre-configure: + cd ${WRKSRC} && ${SETENV} ${SH} ./autogen-common.sh .include diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo index 96efd33e6943..0056353f5dba 100644 --- a/editors/abiword/distinfo +++ b/editors/abiword/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1630554026 -SHA256 (AbiWord/abiword-3.0.5.tar.gz) = 1257247e9970508d6d1456d3e330cd1909c4b42b25e0f0a1bc32526d6f3a21b4 -SIZE (AbiWord/abiword-3.0.5.tar.gz) = 11084159 +TIMESTAMP = 1772390992 +SHA256 (AbiWord/AbiWord-release-3.0.8.tar.bz2) = ef2fdc2cb66a54a58185e7008bd349ce858e59648e18571913d5a3e2b43abf37 +SIZE (AbiWord/AbiWord-release-3.0.8.tar.bz2) = 7884596 +SHA256 (AbiWord/ae05e92d.patch) = b1681d56056b216ae250d442bd6f3eadd161b7f5b7705ec53c0d8221449bd457 +SIZE (AbiWord/ae05e92d.patch) = 1876 diff --git a/editors/abiword/files/patch-configure b/editors/abiword/files/patch-configure deleted file mode 100644 index 294944d6ce3a..000000000000 --- a/editors/abiword/files/patch-configure +++ /dev/null @@ -1,40 +0,0 @@ ---- configure.orig 2021-07-03 15:48:11 UTC -+++ configure -@@ -23069,7 +23069,7 @@ fi - - - --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 -@@ -23820,7 +23820,7 @@ fi - test "$enable_collab" = "auto" && PLUGINS="$PLUGINS collab" - - COLLAB_CFLAGS="$COLLAB_CFLAGS "'${PLUGIN_CFLAGS}' --COLLAB_LIBS="$COLLAB_LIBS "'${PLUGIN_LIBS}' -+COLLAB_LIBS='${PLUGIN_LIBS}'" $COLLAB_LIBS " - - fi # plugin conditional - -@@ -26311,8 +26311,8 @@ fi - - - --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.4' - wordperfect_deps="no" - - WORDPERFECT_CFLAGS= -@@ -26355,7 +26355,7 @@ if test -n "$PKG_CONFIG" && \ - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - -- wp_deps_pkgs="$wp_deps_pkgs $wordperfect_wps_pkgs" -+ wp_deps_pkgs="$wordperfect_wps_pkgs $wp_deps_pkgs" - WPS_DEFINE=" -DHAVE_LIBWPS" - - fi diff --git a/editors/abiword/files/patch-configure.ac b/editors/abiword/files/patch-configure.ac new file mode 100644 index 000000000000..f623cb769b63 --- /dev/null +++ b/editors/abiword/files/patch-configure.ac @@ -0,0 +1,19 @@ +--- configure.ac.orig 2026-02-18 03:16:18 UTC ++++ configure.ac +@@ -80,7 +80,7 @@ fribidi_req='fribidi >= 0.10.4' + + # cross platform deps + fribidi_req='fribidi >= 0.10.4' +-glib_req='glib-2.0 >= 2.6.0 gthread-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0' ++glib_req='glib-2.0 >= 2.6.0 gthread-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0 gmodule-2.0 >= 2.6.0' + gsf_req='libgsf-1 >= 1.14.18' + gsf_gio_req='libgsf-1 >= 1.14.9' + wv_req='wv-1.0 >= 1.2.0' +@@ -644,7 +644,6 @@ if test "$GCC" = "yes"; then + if test "$GCC" = "yes"; then + for option in -Wall -Wextra -Wsign-compare -Wpointer-arith \ + -Wchar-subscripts -Wwrite-strings -Wmissing-noreturn \ +- -Wformat-overflow=2 \ + -Wunused -Wpointer-arith -Wshadow; do + SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $option" diff --git a/editors/abiword/files/patch-git-01-2a06be6a10a0718f8a3d8e00c317f5042c99a467 b/editors/abiword/files/patch-git-01-2a06be6a10a0718f8a3d8e00c317f5042c99a467 deleted file mode 100644 index 4945803e3391..000000000000 --- a/editors/abiword/files/patch-git-01-2a06be6a10a0718f8a3d8e00c317f5042c99a467 +++ /dev/null @@ -1,29 +0,0 @@ -From 2a06be6a10a0718f8a3d8e00c317f5042c99a467 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar -Date: Mon, 11 Dec 2023 01:55:53 +0100 -Subject: [PATCH] Fix build with libxml2 2.12 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libxml 2.12.0 restructured headers so that xmlFree is no longer in the scope. -Let’s add the correct include. ---- - src/af/util/xp/ut_stringbuf.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/af/util/xp/ut_stringbuf.cpp b/src/af/util/xp/ut_stringbuf.cpp -index f1e8d9078..88488ad67 100644 ---- src/af/util/xp/ut_stringbuf.cpp -+++ src/af/util/xp/ut_stringbuf.cpp -@@ -26,6 +26,7 @@ - #include - - #include -+#include - - #include - --- -GitLab - diff --git a/editors/abiword/files/patch-plugins_collab_backends_tcp_xp_Session.h b/editors/abiword/files/patch-plugins_collab_backends_tcp_xp_Session.h deleted file mode 100644 index f75772088bea..000000000000 --- a/editors/abiword/files/patch-plugins_collab_backends_tcp_xp_Session.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./plugins/collab/backends/tcp/xp/Session.h.orig 2014-12-05 21:51:55.334456277 +0100 -+++ ./plugins/collab/backends/tcp/xp/Session.h 2014-12-05 21:51:31.075459132 +0100 -@@ -31,7 +31,7 @@ - - class TCPAccountHandler; - --class Session : public Synchronizer, public boost::noncopyable, public boost::enable_shared_from_this -+class Session : public Synchronizer, public asio::noncopyable, public boost::enable_shared_from_this - { - public: - Session(asio::io_service& io_service, boost::function)> ef) diff --git a/editors/abiword/files/patch-plugins_collab_core_sync_xp_SynchronizedQueue.h b/editors/abiword/files/patch-plugins_collab_core_sync_xp_SynchronizedQueue.h deleted file mode 100644 index cd481ded8ea4..000000000000 --- a/editors/abiword/files/patch-plugins_collab_core_sync_xp_SynchronizedQueue.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./plugins/collab/core/sync/xp/SynchronizedQueue.h.orig 2014-12-05 21:45:41.710482488 +0100 -+++ ./plugins/collab/core/sync/xp/SynchronizedQueue.h 2014-12-05 21:46:02.610480585 +0100 -@@ -28,7 +28,7 @@ - class EmptyQueueException {}; - - template --class SynchronizedQueue : public Synchronizer, public boost::noncopyable -+class SynchronizedQueue : public Synchronizer, public asio::noncopyable - { - public: - SynchronizedQueue(boost::function sig) diff --git a/editors/abiword/files/patch-plugins_wordperfect_plugin.m4 b/editors/abiword/files/patch-plugins_wordperfect_plugin.m4 deleted file mode 100644 index 4fabbcf679ef..000000000000 --- a/editors/abiword/files/patch-plugins_wordperfect_plugin.m4 +++ /dev/null @@ -1,20 +0,0 @@ ---- plugins/wordperfect/plugin.m4.orig 2010-11-08 13:01:58.000000000 +0100 -+++ plugins/wordperfect/plugin.m4 2016-01-26 21:13:45.479525000 +0100 -@@ -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.4' - 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/editors/abiword/files/patch-plugins_wordperfect_xp_Makefile.am b/editors/abiword/files/patch-plugins_wordperfect_xp_Makefile.am deleted file mode 100644 index 166772a38195..000000000000 --- a/editors/abiword/files/patch-plugins_wordperfect_xp_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/wordperfect/xp/Makefile.am.orig 2008-05-08 15:12:53.000000000 +0200 -+++ plugins/wordperfect/xp/Makefile.am 2016-01-26 20:42:39.161783000 +0100 -@@ -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 \ diff --git a/editors/abiword/files/patch-plugins_wordperfect_xp_Makefile.in b/editors/abiword/files/patch-plugins_wordperfect_xp_Makefile.in deleted file mode 100644 index 48b433aedd33..000000000000 --- a/editors/abiword/files/patch-plugins_wordperfect_xp_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/wordperfect/xp/Makefile.in.orig 2016-01-26 22:09:46.402022000 +0100 -+++ plugins/wordperfect/xp/Makefile.in 2016-01-26 22:12:18.203941000 +0100 -@@ -492,8 +492,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 \ diff --git a/editors/abiword/files/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp b/editors/abiword/files/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp deleted file mode 100644 index cb670a79dd19..000000000000 --- a/editors/abiword/files/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp +++ /dev/null @@ -1,652 +0,0 @@ ---- plugins/wordperfect/xp/ie_imp_WordPerfect.cpp.orig 2013-04-07 15:53:03.000000000 +0200 -+++ plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2016-01-26 21:47:24.995046000 +0100 -@@ -31,6 +31,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include -@@ -60,42 +62,47 @@ - - // Stream class - --#include -+#include -+#include - - #include - #include - #include -+#include - - #ifdef HAVE_LIBWPS - #include - #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 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,45 +127,115 @@ const unsigned char * AbiWordperfectInpu - 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::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::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); -@@ -172,12 +249,35 @@ WPXInputStream * AbiWordperfectInputStre - 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 @@ UT_Confidence_t IE_Imp_WordPerfect_Sniff - { - 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 @@ IE_Imp_WordPerfect::~IE_Imp_WordPerfect( - UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input) - { - AbiWordperfectInputStream gsfInput(input); -- WPDResult error = WPDocument::parse(&gsfInput, static_cast(this), NULL); -+ libwpd::WPDResult error = libwpd::WPDocument::parse(&gsfInput, static_cast(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 @@ void IE_Imp_WordPerfect::pasteFromBuffer - // 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 @@ void IE_Imp_WordPerfect::setDocumentMeta - 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 @@ void IE_Imp_WordPerfect::endDocument() - 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::openPageSpan(co - - } - --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::closeHeader() - */ - } - --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 @@ void IE_Imp_WordPerfect::closeFooter() - // 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 @@ void IE_Imp_WordPerfect::openParagraph(c - (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 @@ void IE_Imp_WordPerfect::openParagraph(c - propBuffer += "0"; - - tmpBuffer = ","; -- } -- } -+ } -+ } - - - -@@ -543,7 +645,7 @@ void IE_Imp_WordPerfect::openParagraph(c - } - } - --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 @@ void IE_Imp_WordPerfect::openSpan(const - 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 @@ void IE_Imp_WordPerfect::insertTab() - 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::insertText(cons - } - } - -+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,24 +780,23 @@ void IE_Imp_WordPerfect::insertLineBreak - } - - -- --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; - 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 @@ void IE_Imp_WordPerfect::defineOrderedLi - 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,36 +879,7 @@ void IE_Imp_WordPerfect::defineUnordered - 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++; - } - -@@ -796,7 +894,7 @@ void IE_Imp_WordPerfect::closeUnorderedL - - // 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 @@ void IE_Imp_WordPerfect::openListElement - 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 @@ void IE_Imp_WordPerfect::closeFootnote() - 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 @@ void IE_Imp_WordPerfect::closeEndnote() - 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 @@ void IE_Imp_WordPerfect::openTable(const - } - } - -- propBuffer += "table-column-props:"; -- WPXPropertyListVector::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 librevenge::RVNGPropertyListVector *columns = propList.child("librevenge:table-columns"); -+ if (columns) -+ { -+ 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 @@ void IE_Imp_WordPerfect::openTable(const - 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 @@ void IE_Imp_WordPerfect::openTableRow(co - 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 @@ protected: - virtual UT_Error _loadFile(GsfInput * input) - { - AbiWordperfectInputStream gsfInput(input); -- WPSResult error = WPSDocument::parse(&gsfInput, static_cast(this)); -+ libwps::WPSResult error = libwps::WPSDocument::parse(&gsfInput, static_cast(this), NULL, NULL); - -- if (error != WPS_OK) -+ if (error != libwps::WPS_OK) - { - UT_DEBUGMSG(("AbiMSWorks: ERROR: %i!\n", (int)error)); - return UT_IE_IMPORTERROR; -@@ -1286,13 +1388,19 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer:: - { - AbiWordperfectInputStream gsfInput(input); - -- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput); -+ libwps::WPSCreator creator; -+ libwps::WPSKind kind; -+ bool needEncoding; -+ libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind, creator, needEncoding); -+ -+ 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; diff --git a/editors/abiword/files/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h b/editors/abiword/files/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h deleted file mode 100644 index 6d7c5d297990..000000000000 --- a/editors/abiword/files/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h +++ /dev/null @@ -1,162 +0,0 @@ ---- plugins/wordperfect/xp/ie_imp_WordPerfect.h.orig 2013-04-07 15:53:03.000000000 +0200 -+++ plugins/wordperfect/xp/ie_imp_WordPerfect.h 2016-01-26 20:42:39.167115000 +0100 -@@ -30,7 +30,7 @@ - #define IE_IMP_WP_H - - #include --#include -+#include - #include "ie_imp.h" - #include "ut_string.h" - #include "ut_string_class.h" -@@ -92,7 +92,7 @@ public: - 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,68 +101,82 @@ public: - 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 openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); -- virtual void closeParagraph() {} -- -- virtual void openSpan(const WPXPropertyList &propList); -- virtual void closeSpan() {} -- -- virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns); -- virtual void closeSection() {} -- -- virtual void insertTab(); -- virtual void insertText(const WPXString &text); -- virtual void insertLineBreak(); -- -- 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 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 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 defineEmbeddedFont(const librevenge::RVNGPropertyList & /* propList */) {} - -+ 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 defineSectionStyle(const librevenge::RVNGPropertyList &) {} -+ virtual void openSection(const librevenge::RVNGPropertyList &propList); -+ virtual void closeSection() {} -+ -+ virtual void defineParagraphStyle(const librevenge::RVNGPropertyList &) {} -+ virtual void openParagraph(const librevenge::RVNGPropertyList &propList); -+ virtual void closeParagraph() {} -+ -+ virtual void defineCharacterStyle(const librevenge::RVNGPropertyList &) {} -+ virtual void openSpan(const librevenge::RVNGPropertyList &propList); -+ virtual void closeSpan() {} -+ -+ virtual void openLink(const librevenge::RVNGPropertyList & /* propList */) {} -+ virtual void closeLink() {} -+ -+ 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 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 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); diff --git a/editors/abiword/files/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp b/editors/abiword/files/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp deleted file mode 100644 index 0c68c4c3f106..000000000000 --- a/editors/abiword/files/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp +++ /dev/null @@ -1,52 +0,0 @@ ---- plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp.orig 2013-04-07 15:53:03.000000000 +0200 -+++ plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp 2016-01-26 20:42:39.153642000 +0100 -@@ -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 @@ int abi_plugin_register (XAP_ModuleInfo - 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 @@ int abi_plugin_register (XAP_ModuleInfo - mi->usage = "No Usage"; - - IE_Imp::registerImporter (m_ImpSniffer); -- //IE_Exp::registerExporter (m_ExpSniffer); -+ - return 1; - } - -@@ -93,18 +86,11 @@ int abi_plugin_unregister (XAP_ModuleInf - 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; diff --git a/editors/abiword/files/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h b/editors/abiword/files/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h deleted file mode 100644 index 1b784c41a4a6..000000000000 --- a/editors/abiword/files/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/wordperfect/xp/ie_impexp_WordPerfect.h.orig 2013-04-07 15:53:03.000000000 +0200 -+++ plugins/wordperfect/xp/ie_impexp_WordPerfect.h 2016-01-26 20:42:39.163958000 +0100 -@@ -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" diff --git a/editors/abiword/files/patch-plugins_wpg_plugin.m4 b/editors/abiword/files/patch-plugins_wpg_plugin.m4 deleted file mode 100644 index 2f20e36551d9..000000000000 --- a/editors/abiword/files/patch-plugins_wpg_plugin.m4 +++ /dev/null @@ -1,9 +0,0 @@ ---- plugins/wpg/plugin.m4.orig 2010-11-08 13:01:58.000000000 +0100 -+++ plugins/wpg/plugin.m4 2016-01-26 20:42:41.493892000 +0100 -@@ -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 diff --git a/editors/abiword/files/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp b/editors/abiword/files/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp deleted file mode 100644 index d664f5024c25..000000000000 --- a/editors/abiword/files/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp +++ /dev/null @@ -1,249 +0,0 @@ ---- plugins/wpg/xp/ie_impGraphic_WPG.cpp.orig 2013-04-07 15:53:03.000000000 +0200 -+++ plugins/wpg/xp/ie_impGraphic_WPG.cpp 2016-01-26 20:42:43.500548000 +0100 -@@ -31,37 +31,43 @@ - #include - #include - #include --#include -+#include -+#include - #include "xap_Module.h" - - using libwpg::WPGraphics; - - 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 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,45 +92,115 @@ - 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::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::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); -@@ -138,12 +214,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 +343,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("\n"); -+ svgOutput.append("\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; - } - diff --git a/editors/abiword/files/patch-src_wp_ap_xp_ap__Dialog__Goto.cpp b/editors/abiword/files/patch-src_wp_ap_xp_ap__Dialog__Goto.cpp deleted file mode 100644 index 403276624b26..000000000000 --- a/editors/abiword/files/patch-src_wp_ap_xp_ap__Dialog__Goto.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- src/wp/ap/xp/ap_Dialog_Goto.cpp.orig 2021-07-03 15:46:07 UTC -+++ src/wp/ap/xp/ap_Dialog_Goto.cpp -@@ -69,12 +69,12 @@ void AP_Dialog_Goto::_setupJumpTargets(void) - { - const XAP_StringSet * pSS = m_pApp->getStringSet(); - -- s_pJumpTargets[0] = ::g_strdup(pSS->getValue (AP_STRING_ID_DLG_Goto_Target_Page)); -- s_pJumpTargets[1] = ::g_strdup(pSS->getValue (AP_STRING_ID_DLG_Goto_Target_Line)); -- s_pJumpTargets[2] = ::g_strdup(pSS->getValue (AP_STRING_ID_DLG_Goto_Target_Bookmark)); -- //s_pJumpTargets[2] = ::g_strdup(pSS->getValue (AP_STRING_ID_DLG_Goto_Target_Picture)); //TODO -- s_pJumpTargets[3] = ::g_strdup(pSS->getValue (AP_STRING_ID_DLG_Goto_Target_XMLid)); -- s_pJumpTargets[4] = ::g_strdup(pSS->getValue (AP_STRING_ID_DLG_Goto_Target_Annotation)); -+ s_pJumpTargets[0] = g_strdup(pSS->getValue (AP_STRING_ID_DLG_Goto_Target_Page)); -+ s_pJumpTargets[1] = g_strdup(pSS->getValue (AP_STRING_ID_DLG_Goto_Target_Line)); -+ s_pJumpTargets[2] = g_strdup(pSS->getValue (AP_STRING_ID_DLG_Goto_Target_Bookmark)); -+ //s_pJumpTargets[2] = g_strdup(pSS->getValue (AP_STRING_ID_DLG_Goto_Target_Picture)); //TODO -+ s_pJumpTargets[3] = g_strdup(pSS->getValue (AP_STRING_ID_DLG_Goto_Target_XMLid)); -+ s_pJumpTargets[4] = g_strdup(pSS->getValue (AP_STRING_ID_DLG_Goto_Target_Annotation)); - - } - diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist index fa5039c27330..3ac0af6511bb 100644 --- a/editors/abiword/pkg-plist +++ b/editors/abiword/pkg-plist @@ -1,395 +1,377 @@ bin/abiword include/abiword-%%ABIVERSION%%/abiwidget.h include/abiword-%%ABIVERSION%%/libabiword.h include/abiword-%%ABIVERSION%%/xap_UnixTableWidget.h lib/abiword-%%ABIVERSION%%/plugins/applix.so -lib/abiword-%%ABIVERSION%%/plugins/babelfish.so lib/abiword-%%ABIVERSION%%/plugins/bmp.so lib/abiword-%%ABIVERSION%%/plugins/clarisworks.so -%%COLLAB%%lib/abiword-%%ABIVERSION%%/plugins/collab.so lib/abiword-%%ABIVERSION%%/plugins/command.so lib/abiword-%%ABIVERSION%%/plugins/docbook.so lib/abiword-%%ABIVERSION%%/plugins/eml.so -lib/abiword-%%ABIVERSION%%/plugins/freetranslation.so +lib/abiword-%%ABIVERSION%%/plugins/epub.so lib/abiword-%%ABIVERSION%%/plugins/garble.so -lib/abiword-%%ABIVERSION%%/plugins/gdict.so lib/abiword-%%ABIVERSION%%/plugins/gimp.so lib/abiword-%%ABIVERSION%%/plugins/goffice.so -lib/abiword-%%ABIVERSION%%/plugins/google.so %%GRAMMAR%%lib/abiword-%%ABIVERSION%%/plugins/grammar.so lib/abiword-%%ABIVERSION%%/plugins/hancom.so lib/abiword-%%ABIVERSION%%/plugins/hrtext.so lib/abiword-%%ABIVERSION%%/plugins/iscii.so -lib/abiword-%%ABIVERSION%%/plugins/kword.so lib/abiword-%%ABIVERSION%%/plugins/latex.so lib/abiword-%%ABIVERSION%%/plugins/loadbindings.so -%%MATHVIEW%%lib/abiword-%%ABIVERSION%%/plugins/mathview.so -lib/abiword-%%ABIVERSION%%/plugins/mht.so lib/abiword-%%ABIVERSION%%/plugins/mif.so lib/abiword-%%ABIVERSION%%/plugins/mswrite.so lib/abiword-%%ABIVERSION%%/plugins/opendocument.so lib/abiword-%%ABIVERSION%%/plugins/openwriter.so lib/abiword-%%ABIVERSION%%/plugins/openxml.so lib/abiword-%%ABIVERSION%%/plugins/opml.so lib/abiword-%%ABIVERSION%%/plugins/paint.so lib/abiword-%%ABIVERSION%%/plugins/passepartout.so lib/abiword-%%ABIVERSION%%/plugins/pdb.so lib/abiword-%%ABIVERSION%%/plugins/pdf.so lib/abiword-%%ABIVERSION%%/plugins/presentation.so -%%PSION%%lib/abiword-%%ABIVERSION%%/plugins/psion.so lib/abiword-%%ABIVERSION%%/plugins/s5.so lib/abiword-%%ABIVERSION%%/plugins/sdw.so lib/abiword-%%ABIVERSION%%/plugins/t602.so -lib/abiword-%%ABIVERSION%%/plugins/urldict.so lib/abiword-%%ABIVERSION%%/plugins/wikipedia.so -lib/abiword-%%ABIVERSION%%/plugins/wmf.so +%%WMF%%lib/abiword-%%ABIVERSION%%/plugins/wmf.so lib/abiword-%%ABIVERSION%%/plugins/wml.so %%WP%%lib/abiword-%%ABIVERSION%%/plugins/wordperfect.so %%WP%%lib/abiword-%%ABIVERSION%%/plugins/wpg.so lib/abiword-%%ABIVERSION%%/plugins/xslfo.so +lib/girepository-1.0/Abi-%%ABIVERSION%%.typelib lib/libabiword-%%ABIVERSION%%.so libdata/pkgconfig/abiword-%%ABIVERSION%%.pc share/man/man1/abiword.1.gz %%DATADIR%%-%%ABIVERSION%%/Presentation.xml -%%COLSERVICE%%%%DATADIR%%-%%ABIVERSION%%/certs/cacert.pem %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/book.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/chip.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/fun.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gear.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomea.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomeb.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomec.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomecorner.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomed.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomedecor1.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomedecor2.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomee.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomeflowers.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/gnomeline.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/idea.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/lamp.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/monitor.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/music1.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/pinceau.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/simca.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/surprise.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/together.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/toolbox.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/tree.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/tux_bordelais.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/weather.png %%CLIPART%%%%DATADIR%%-%%ABIVERSION%%/clipart/write.png %%DATADIR%%-%%ABIVERSION%%/mime-info/abiword.keys %%DATADIR%%-%%ABIVERSION%%/omml_xslt/mml2omml.xsl %%DATADIR%%-%%ABIVERSION%%/omml_xslt/omml2mml.xsl %%DATADIR%%-%%ABIVERSION%%/readme.abw %%DATADIR%%-%%ABIVERSION%%/readme.txt %%DATADIR%%-%%ABIVERSION%%/strings/ach.strings %%DATADIR%%-%%ABIVERSION%%/strings/af-ZA.strings %%DATADIR%%-%%ABIVERSION%%/strings/ak.strings %%DATADIR%%-%%ABIVERSION%%/strings/am-ET.strings %%DATADIR%%-%%ABIVERSION%%/strings/ar.strings %%DATADIR%%-%%ABIVERSION%%/strings/ast-ES.strings %%DATADIR%%-%%ABIVERSION%%/strings/ayc-BO.strings %%DATADIR%%-%%ABIVERSION%%/strings/aym-BO.strings %%DATADIR%%-%%ABIVERSION%%/strings/be-BY.strings %%DATADIR%%-%%ABIVERSION%%/strings/be@latin.strings %%DATADIR%%-%%ABIVERSION%%/strings/bg-BG.strings %%DATADIR%%-%%ABIVERSION%%/strings/bm.strings %%DATADIR%%-%%ABIVERSION%%/strings/bn.strings %%DATADIR%%-%%ABIVERSION%%/strings/br-FR.strings %%DATADIR%%-%%ABIVERSION%%/strings/bs.strings %%DATADIR%%-%%ABIVERSION%%/strings/ca-ES.strings %%DATADIR%%-%%ABIVERSION%%/strings/cgg.strings %%DATADIR%%-%%ABIVERSION%%/strings/cs-CZ.strings %%DATADIR%%-%%ABIVERSION%%/strings/cy-GB.strings %%DATADIR%%-%%ABIVERSION%%/strings/da-DK.strings %%DATADIR%%-%%ABIVERSION%%/strings/de-CH.strings %%DATADIR%%-%%ABIVERSION%%/strings/de-DE.strings %%DATADIR%%-%%ABIVERSION%%/strings/el-GR.strings %%DATADIR%%-%%ABIVERSION%%/strings/en-AU.strings %%DATADIR%%-%%ABIVERSION%%/strings/en-CA.strings %%DATADIR%%-%%ABIVERSION%%/strings/en-GB.strings %%DATADIR%%-%%ABIVERSION%%/strings/en-IE.strings %%DATADIR%%-%%ABIVERSION%%/strings/eo.strings %%DATADIR%%-%%ABIVERSION%%/strings/es-ES.strings %%DATADIR%%-%%ABIVERSION%%/strings/es-MX.strings %%DATADIR%%-%%ABIVERSION%%/strings/et.strings %%DATADIR%%-%%ABIVERSION%%/strings/eu-ES.strings %%DATADIR%%-%%ABIVERSION%%/strings/fa-AF.strings %%DATADIR%%-%%ABIVERSION%%/strings/ff.strings %%DATADIR%%-%%ABIVERSION%%/strings/fi-FI.strings %%DATADIR%%-%%ABIVERSION%%/strings/fil.strings %%DATADIR%%-%%ABIVERSION%%/strings/fr-FR.strings %%DATADIR%%-%%ABIVERSION%%/strings/ga-IE.strings %%DATADIR%%-%%ABIVERSION%%/strings/gl.strings %%DATADIR%%-%%ABIVERSION%%/strings/he-IL.strings %%DATADIR%%-%%ABIVERSION%%/strings/hi.strings %%DATADIR%%-%%ABIVERSION%%/strings/hr-HR.strings %%DATADIR%%-%%ABIVERSION%%/strings/hu-HU.strings %%DATADIR%%-%%ABIVERSION%%/strings/id-ID.strings %%DATADIR%%-%%ABIVERSION%%/strings/it-IT.strings %%DATADIR%%-%%ABIVERSION%%/strings/ja-JP.strings %%DATADIR%%-%%ABIVERSION%%/strings/jbo.strings %%DATADIR%%-%%ABIVERSION%%/strings/kk-KZ.strings %%DATADIR%%-%%ABIVERSION%%/strings/km.strings %%DATADIR%%-%%ABIVERSION%%/strings/ko.strings %%DATADIR%%-%%ABIVERSION%%/strings/ku.strings %%DATADIR%%-%%ABIVERSION%%/strings/lg.strings %%DATADIR%%-%%ABIVERSION%%/strings/lt-LT.strings %%DATADIR%%-%%ABIVERSION%%/strings/lv-LV.strings %%DATADIR%%-%%ABIVERSION%%/strings/mg-MG.strings %%DATADIR%%-%%ABIVERSION%%/strings/mk-MK.strings %%DATADIR%%-%%ABIVERSION%%/strings/mnk-SN.strings %%DATADIR%%-%%ABIVERSION%%/strings/ms-MY.strings %%DATADIR%%-%%ABIVERSION%%/strings/nb-NO.strings %%DATADIR%%-%%ABIVERSION%%/strings/ne-NP.strings %%DATADIR%%-%%ABIVERSION%%/strings/nl-NL.strings %%DATADIR%%-%%ABIVERSION%%/strings/nn-NO.strings %%DATADIR%%-%%ABIVERSION%%/strings/pl-PL.strings %%DATADIR%%-%%ABIVERSION%%/strings/ps.strings %%DATADIR%%-%%ABIVERSION%%/strings/pt-BR.strings %%DATADIR%%-%%ABIVERSION%%/strings/pt-PT.strings %%DATADIR%%-%%ABIVERSION%%/strings/quh-BO.strings %%DATADIR%%-%%ABIVERSION%%/strings/qul-BO.strings %%DATADIR%%-%%ABIVERSION%%/strings/quz.strings %%DATADIR%%-%%ABIVERSION%%/strings/ro-RO.strings %%DATADIR%%-%%ABIVERSION%%/strings/ru-RU.strings %%DATADIR%%-%%ABIVERSION%%/strings/sc-IT.strings %%DATADIR%%-%%ABIVERSION%%/strings/sk-SK.strings %%DATADIR%%-%%ABIVERSION%%/strings/sl-SI.strings %%DATADIR%%-%%ABIVERSION%%/strings/son.strings %%DATADIR%%-%%ABIVERSION%%/strings/sq-AL.strings %%DATADIR%%-%%ABIVERSION%%/strings/sr.strings %%DATADIR%%-%%ABIVERSION%%/strings/sr@latin.strings %%DATADIR%%-%%ABIVERSION%%/strings/sv-SE.strings %%DATADIR%%-%%ABIVERSION%%/strings/sw.strings %%DATADIR%%-%%ABIVERSION%%/strings/ta-IN.strings %%DATADIR%%-%%ABIVERSION%%/strings/th.strings %%DATADIR%%-%%ABIVERSION%%/strings/tr-TR.strings %%DATADIR%%-%%ABIVERSION%%/strings/uk-UA.strings %%DATADIR%%-%%ABIVERSION%%/strings/vi-VN.strings %%DATADIR%%-%%ABIVERSION%%/strings/wo-SN.strings %%DATADIR%%-%%ABIVERSION%%/strings/yi.strings %%DATADIR%%-%%ABIVERSION%%/strings/zh-CN.strings %%DATADIR%%-%%ABIVERSION%%/strings/zh-HK.strings %%DATADIR%%-%%ABIVERSION%%/strings/zh-TW.strings %%DATADIR%%-%%ABIVERSION%%/strings/zu.strings %%DATADIR%%-%%ABIVERSION%%/system.profile %%DATADIR%%-%%ABIVERSION%%/system.profile-CP1254 %%DATADIR%%-%%ABIVERSION%%/system.profile-KOI8-R %%DATADIR%%-%%ABIVERSION%%/system.profile-KOI8-U %%DATADIR%%-%%ABIVERSION%%/system.profile-KOI8-UB %%DATADIR%%-%%ABIVERSION%%/system.profile-am-ET %%DATADIR%%-%%ABIVERSION%%/system.profile-ar %%DATADIR%%-%%ABIVERSION%%/system.profile-ar-EG %%DATADIR%%-%%ABIVERSION%%/system.profile-ar-SA %%DATADIR%%-%%ABIVERSION%%/system.profile-bg-BG %%DATADIR%%-%%ABIVERSION%%/system.profile-ca-ES %%DATADIR%%-%%ABIVERSION%%/system.profile-cs-CZ %%DATADIR%%-%%ABIVERSION%%/system.profile-da-DK %%DATADIR%%-%%ABIVERSION%%/system.profile-de %%DATADIR%%-%%ABIVERSION%%/system.profile-de-AT %%DATADIR%%-%%ABIVERSION%%/system.profile-de-CH %%DATADIR%%-%%ABIVERSION%%/system.profile-de-DE %%DATADIR%%-%%ABIVERSION%%/system.profile-div-MV %%DATADIR%%-%%ABIVERSION%%/system.profile-el-GR %%DATADIR%%-%%ABIVERSION%%/system.profile-en %%DATADIR%%-%%ABIVERSION%%/system.profile-en-AU %%DATADIR%%-%%ABIVERSION%%/system.profile-en-CA %%DATADIR%%-%%ABIVERSION%%/system.profile-en-GB %%DATADIR%%-%%ABIVERSION%%/system.profile-en-IE %%DATADIR%%-%%ABIVERSION%%/system.profile-en-NZ %%DATADIR%%-%%ABIVERSION%%/system.profile-en-US %%DATADIR%%-%%ABIVERSION%%/system.profile-en-ZA %%DATADIR%%-%%ABIVERSION%%/system.profile-es %%DATADIR%%-%%ABIVERSION%%/system.profile-es-ES %%DATADIR%%-%%ABIVERSION%%/system.profile-es-MX %%DATADIR%%-%%ABIVERSION%%/system.profile-eu %%DATADIR%%-%%ABIVERSION%%/system.profile-eu-ES %%DATADIR%%-%%ABIVERSION%%/system.profile-fa-IR %%DATADIR%%-%%ABIVERSION%%/system.profile-fi-FI %%DATADIR%%-%%ABIVERSION%%/system.profile-fr %%DATADIR%%-%%ABIVERSION%%/system.profile-fr-BE %%DATADIR%%-%%ABIVERSION%%/system.profile-fr-CA %%DATADIR%%-%%ABIVERSION%%/system.profile-fr-CH %%DATADIR%%-%%ABIVERSION%%/system.profile-fr-FR %%DATADIR%%-%%ABIVERSION%%/system.profile-gl-ES %%DATADIR%%-%%ABIVERSION%%/system.profile-he %%DATADIR%%-%%ABIVERSION%%/system.profile-he-IL %%DATADIR%%-%%ABIVERSION%%/system.profile-hu-HU %%DATADIR%%-%%ABIVERSION%%/system.profile-it-IT %%DATADIR%%-%%ABIVERSION%%/system.profile-ja-JP %%DATADIR%%-%%ABIVERSION%%/system.profile-kk-KZ %%DATADIR%%-%%ABIVERSION%%/system.profile-lt-LT %%DATADIR%%-%%ABIVERSION%%/system.profile-nb-NO %%DATADIR%%-%%ABIVERSION%%/system.profile-nl-NL %%DATADIR%%-%%ABIVERSION%%/system.profile-nn-NO %%DATADIR%%-%%ABIVERSION%%/system.profile-pl-PL %%DATADIR%%-%%ABIVERSION%%/system.profile-ps %%DATADIR%%-%%ABIVERSION%%/system.profile-pt-BR %%DATADIR%%-%%ABIVERSION%%/system.profile-pt-PT %%DATADIR%%-%%ABIVERSION%%/system.profile-ro %%DATADIR%%-%%ABIVERSION%%/system.profile-ro-RO %%DATADIR%%-%%ABIVERSION%%/system.profile-ru %%DATADIR%%-%%ABIVERSION%%/system.profile-ru-RU %%DATADIR%%-%%ABIVERSION%%/system.profile-sk-SK %%DATADIR%%-%%ABIVERSION%%/system.profile-sk-SK.CP1250 %%DATADIR%%-%%ABIVERSION%%/system.profile-sl %%DATADIR%%-%%ABIVERSION%%/system.profile-sv %%DATADIR%%-%%ABIVERSION%%/system.profile-sv-SE %%DATADIR%%-%%ABIVERSION%%/system.profile-syr %%DATADIR%%-%%ABIVERSION%%/system.profile-tr %%DATADIR%%-%%ABIVERSION%%/system.profile-tr-TR %%DATADIR%%-%%ABIVERSION%%/system.profile-tr-TR.CP1254 %%DATADIR%%-%%ABIVERSION%%/system.profile-uk-UA %%DATADIR%%-%%ABIVERSION%%/system.profile-ur-PK %%DATADIR%%-%%ABIVERSION%%/system.profile-yi %%DATADIR%%-%%ABIVERSION%%/system.profile-zh-CN %%DATADIR%%-%%ABIVERSION%%/system.profile-zh-TW %%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/A4.awt %%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Business-Letter.awt %%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Business-Report.awt %%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Employee-Directory.awt %%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Fax-Coversheet.awt %%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Friendly-Letter.awt %%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Memo.awt %%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Press-Release.awt %%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Resume.awt %%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/Two-Columns.awt %%TEMPLATES%%%%DATADIR%%-%%ABIVERSION%%/templates/US-Letter.awt %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-am_ET %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ar %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ar_EG %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ar_SA %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-bg_BG %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ca_ES %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-cs_CZ %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-da_DK %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-de %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-de_AT %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-de_CH %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-de_DE %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-div_MV %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-el_GR %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-en_AU %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-en_CA %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-en_GB %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-en_IE %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-en_NZ %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-en_ZA %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-es %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-es_AR %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-es_ES %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-es_IR %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-es_MX %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-fa_IR %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-fi_FI %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-fr %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-fr_BE %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-fr_CA %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-fr_CH %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-fr_FR %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-gl_ES %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-he %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-he_IL %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-hu_HU %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-it_IT %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ja_JP %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-kk_KZ %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-km_KH %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-lt_LT %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-nb_NO %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-nl_NL %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-nn_NO %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-pl_PL %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ps %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-pt_BR %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-pt_PT %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ro %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ro_RO %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ru %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ru_RU %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-sk_SK %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-sl %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-sv %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-sv_SE %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-syr %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-tr %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-tr_TR %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-uk_UA %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-ur_PK %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-yi %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-zh_CN %%DATADIR%%-%%ABIVERSION%%/templates/normal.awt-zh_TW %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Annotation.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Border_Shading.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Break.ui -%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationAccounts.ui -%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationAddAccount.ui -%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationAddBuddy.ui -%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationEditAccount.ui -%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationJoin.ui -%%COLLAB%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_CollaborationShare.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Field.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_FormatFootnotes.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_FormatFrame.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_FormatTOC.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_FormatTable.ui -%%COLSERVICE%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_GenericInput.ui -%%COLSERVICE%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_GenericProgress.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Goto.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_HdrFtr.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_InsertTable.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Insert_DateTime.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Latex.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_MailMerge.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_MetaData.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_New.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Options.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Options_ColorSel.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_PageNumbers.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_PageSetup.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_RDFEditor.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_RDFQuery.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Replace.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_SemanticStylesheets.ui %%SPELLCHECK%%%%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Spell.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Styles.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Stylist.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_Tab.ui %%DATADIR%%-%%ABIVERSION%%/ui/ap_UnixDialog_WordCount.ui %%DATADIR%%-%%ABIVERSION%%/ui/pd_RDFContact.ui %%DATADIR%%-%%ABIVERSION%%/ui/pd_RDFEvent.ui %%DATADIR%%-%%ABIVERSION%%/ui/pd_RDFInsertReference.ui %%DATADIR%%-%%ABIVERSION%%/ui/pd_RDFLocation.ui %%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_DocComparison.ui %%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_Encoding.ui %%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_History.ui %%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_Image.ui %%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_Language.ui %%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_ListDocuments.ui %%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_Password.ui %%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_PluginManager.ui %%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_WindowMore.ui %%DATADIR%%-%%ABIVERSION%%/ui/xap_UnixDlg_Zoom.ui %%DATADIR%%-%%ABIVERSION%%/xsltml/README %%DATADIR%%-%%ABIVERSION%%/xsltml/cmarkup.xsl %%DATADIR%%-%%ABIVERSION%%/xsltml/entities.xsl %%DATADIR%%-%%ABIVERSION%%/xsltml/glayout.xsl %%DATADIR%%-%%ABIVERSION%%/xsltml/mmltex.xsl %%DATADIR%%-%%ABIVERSION%%/xsltml/scripts.xsl %%DATADIR%%-%%ABIVERSION%%/xsltml/tables.xsl %%DATADIR%%-%%ABIVERSION%%/xsltml/tokens.xsl share/appdata/abiword.appdata.xml share/applications/abiword.desktop -%%COLTELEPATHY%%share/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service +share/gir-1.0/Abi-%%ABIVERSION%%.gir share/icons/hicolor/16x16/apps/abiword.png share/icons/hicolor/22x22/apps/abiword.png share/icons/hicolor/256x256/apps/abiword.png share/icons/hicolor/32x32/apps/abiword.png share/icons/hicolor/48x48/apps/abiword.png share/icons/hicolor/512x512/apps/abiword.png share/icons/hicolor/scalable/apps/abiword.svg -%%COLTELEPATHY%%share/telepathy/clients/AbiCollab.client