|
 |
1482cf1 |
From 6fcb43935bab90d61858eb1bc0f150c843586c54 Mon Sep 17 00:00:00 2001
|
|
|
1482cf1 |
From: David Tardon <dtardon@redhat.com>
|
|
|
1482cf1 |
Date: Sat, 6 Jun 2015 21:48:02 +0200
|
|
|
1482cf1 |
Subject: [PATCH] adapt to libwps 0.4
|
|
|
1482cf1 |
|
|
|
1482cf1 |
---
|
|
|
1482cf1 |
plugin-configure.m4 | 2 +-
|
|
|
1482cf1 |
plugins/wordperfect/plugin.m4 | 2 +-
|
|
|
1482cf1 |
plugins/wordperfect/xp/ie_imp_WordPerfect.cpp | 4 +++-
|
|
|
1482cf1 |
3 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
1482cf1 |
|
|
|
1482cf1 |
diff --git a/plugin-configure.m4 b/plugin-configure.m4
|
|
|
1482cf1 |
index 2757f4a..093fbcb 100644
|
|
|
1482cf1 |
--- a/plugin-configure.m4
|
|
|
1482cf1 |
+++ b/plugin-configure.m4
|
|
|
1482cf1 |
@@ -1470,7 +1470,7 @@ AC_SUBST([AIKSAURUS_LIBS])
|
|
|
1482cf1 |
|
|
|
1482cf1 |
|
|
|
1482cf1 |
wordperfect_pkgs="libwpg-0.3 libwpd-0.10 librevenge-0.0 librevenge-stream-0.0 $gsf_req"
|
|
|
1482cf1 |
-wordperfect_wps_pkgs='libwps-0.3'
|
|
|
1482cf1 |
+wordperfect_wps_pkgs='libwps-0.4'
|
|
|
1482cf1 |
wordperfect_deps="no"
|
|
|
1482cf1 |
|
|
|
1482cf1 |
WORDPERFECT_CFLAGS=
|
|
|
1482cf1 |
diff --git a/plugins/wordperfect/plugin.m4 b/plugins/wordperfect/plugin.m4
|
|
|
1482cf1 |
index 0aadbaf..bc32d48 100644
|
|
|
1482cf1 |
--- a/plugins/wordperfect/plugin.m4
|
|
|
1482cf1 |
+++ b/plugins/wordperfect/plugin.m4
|
|
|
1482cf1 |
@@ -1,6 +1,6 @@
|
|
|
1482cf1 |
|
|
|
1482cf1 |
wordperfect_pkgs="libwpd-0.10 $gsf_req"
|
|
|
1482cf1 |
-wordperfect_wps_pkgs='libwps-0.3'
|
|
|
1482cf1 |
+wordperfect_wps_pkgs='libwps-0.4'
|
|
|
1482cf1 |
wordperfect_deps="no"
|
|
|
1482cf1 |
|
|
|
1482cf1 |
WORDPERFECT_CFLAGS=
|
|
|
1482cf1 |
diff --git a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
|
|
|
1482cf1 |
index bd19971..3e69f79 100644
|
|
|
1482cf1 |
--- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
|
|
|
1482cf1 |
+++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
|
|
|
1482cf1 |
@@ -1389,7 +1389,9 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::recognizeContents (GsfInput * input)
|
|
|
1482cf1 |
AbiWordperfectInputStream gsfInput(input);
|
|
|
1482cf1 |
|
|
|
1482cf1 |
libwps::WPSKind kind;
|
|
|
1482cf1 |
- libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
|
|
|
1482cf1 |
+ libwps::WPSCreator creator;
|
|
|
1482cf1 |
+ bool needsEncoding = false;
|
|
|
1482cf1 |
+ libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind, creator, needsEncoding);
|
|
|
1482cf1 |
|
|
|
1482cf1 |
if (kind != libwps::WPS_TEXT)
|
|
|
1482cf1 |
confidence = libwps::WPS_CONFIDENCE_NONE;
|
|
|
1482cf1 |
--
|
|
|
1482cf1 |
2.4.2
|
|
|
1482cf1 |
|