abiword/trunk/abiword-3.0.1-libwps-0.4.patch

   1 From 6fcb43935bab90d61858eb1bc0f150c843586c54 Mon Sep 17 00:00:00 2001
   2 From: David Tardon <dtardon@redhat.com>
   3 Date: Sat, 6 Jun 2015 21:48:02 +0200
   4 Subject: [PATCH] adapt to libwps 0.4
   5
   6 ---
   7  plugin-configure.m4                           | 2 +-
   8  plugins/wordperfect/plugin.m4                 | 2 +-
   9  plugins/wordperfect/xp/ie_imp_WordPerfect.cpp | 4 +++-
  10  3 files changed, 5 insertions(+), 3 deletions(-)
  11
  12 diff --git a/plugins/wordperfect/plugin.m4 b/plugins/wordperfect/plugin.m4
  13 index 0aadbaf..bc32d48 100644
  14 --- a/plugins/wordperfect/plugin.m4
  15 +++ b/plugins/wordperfect/plugin.m4
  16 @@ -1,6 +1,6 @@
  17
  18  wordperfect_pkgs="libwpd-0.10 $gsf_req"
  19 -wordperfect_wps_pkgs='libwps-0.3'
  20 +wordperfect_wps_pkgs='libwps-0.4'
  21  wordperfect_deps="no"
  22
  23  WORDPERFECT_CFLAGS=
  24 diff --git a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
  25 index bd19971..3e69f79 100644
  26 --- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
  27 +++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
  28 @@ -1389,7 +1389,9 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::recognizeContents (GsfInput * input)
  29         AbiWordperfectInputStream gsfInput(input);
  30
  31         libwps::WPSKind kind;
  32 -       libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
  33 +        libwps::WPSCreator creator;
  34 +        bool needsEncoding = false;
  35 +       libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind, creator, needsEncoding);
  36
  37         if (kind != libwps::WPS_TEXT)
  38                 confidence = libwps::WPS_CONFIDENCE_NONE;
  39 --
  40 2.4.2
  41