abiword-3.0.1-libwps-0.4.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142
  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. plugin-configure.m4 | 2 +-
  7. plugins/wordperfect/plugin.m4 | 2 +-
  8. plugins/wordperfect/xp/ie_imp_WordPerfect.cpp | 4 +++-
  9. 3 files changed, 5 insertions(+), 3 deletions(-)
  10. diff --git a/plugins/wordperfect/plugin.m4 b/plugins/wordperfect/plugin.m4
  11. index 0aadbaf..bc32d48 100644
  12. --- a/plugins/wordperfect/plugin.m4
  13. +++ b/plugins/wordperfect/plugin.m4
  14. @@ -1,6 +1,6 @@
  15. wordperfect_pkgs="libwpd-0.10 $gsf_req"
  16. -wordperfect_wps_pkgs='libwps-0.3'
  17. +wordperfect_wps_pkgs='libwps-0.4'
  18. wordperfect_deps="no"
  19. WORDPERFECT_CFLAGS=
  20. diff --git a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
  21. index bd19971..3e69f79 100644
  22. --- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
  23. +++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
  24. @@ -1389,7 +1389,9 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::recognizeContents (GsfInput * input)
  25. AbiWordperfectInputStream gsfInput(input);
  26. libwps::WPSKind kind;
  27. - libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
  28. + libwps::WPSCreator creator;
  29. + bool needsEncoding = false;
  30. + libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind, creator, needsEncoding);
  31. if (kind != libwps::WPS_TEXT)
  32. confidence = libwps::WPS_CONFIDENCE_NONE;
  33. --
  34. 2.4.2