[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - config_host/config_writerperfect.h.in configure.ac writerperfect/qa writerperfect/source

[David Tardon]

 config_host/config_writerperfect.h.in               |    4 ++++
 configure.ac                                        |    3 ++-
 writerperfect/qa/unit/WpftImportTestBase.hxx        |    3 +++
 writerperfect/qa/unit/WpftWriterFilterTest.cxx      |    6 +++++-
 writerperfect/source/writer/MSWorksImportFilter.cxx |    2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 988a258fe7437b8763d2094bca1f0776ccd21eaa
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Dec 17 15:43:24 2015 +0100

    do not require newest libwps for build
    
    Change-Id: Iba0090da0591b6f9a6d74bb18ebaabef53448063
    (cherry picked from commit 36b087f8b04ea46428a2c20e26d4230e59cdfd4d)
    Reviewed-on: https://gerrit.libreoffice.org/21122
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/config_host/config_writerperfect.h.in b/config_host/config_writerperfect.h.in
index df10014..0ce167d 100644
--- a/config_host/config_writerperfect.h.in
+++ b/config_host/config_writerperfect.h.in
@@ -20,4 +20,8 @@
 #undef MWAW_VERSION_MINOR
 #undef MWAW_VERSION_MICRO
 
+#undef WPS_VERSION_MAJOR
+#undef WPS_VERSION_MINOR
+#undef WPS_VERSION_MICRO
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configure.ac b/configure.ac
index 5c5eb58..a964e0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7808,7 +7808,8 @@ libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
 dnl ===================================================================
 dnl Check for system libwps
 dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4 >= 0.4.2])
+libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.2])
 
 dnl ===================================================================
 dnl Check for system libwpg
diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx b/writerperfect/qa/unit/WpftImportTestBase.hxx
index e545103..514561f 100644
--- a/writerperfect/qa/unit/WpftImportTestBase.hxx
+++ b/writerperfect/qa/unit/WpftImportTestBase.hxx
@@ -35,6 +35,9 @@
 #define REQUIRE_MWAW_VERSION(major, minor, micro) \
     REQUIRE_VERSION(MWAW_VERSION_MAJOR, MWAW_VERSION_MINOR, MWAW_VERSION_MICRO, major, minor, micro)
 
+#define REQUIRE_WPS_VERSION(major, minor, micro) \
+    REQUIRE_VERSION(WPS_VERSION_MAJOR, WPS_VERSION_MINOR, WPS_VERSION_MICRO, major, minor, micro)
+
 namespace com
 {
 namespace sun
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 7b4fd74..00eb88a 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -41,10 +41,14 @@ void WpftWriterFilterTest::test()
         {"RagTime_3.2.hqx", REQUIRE_MWAW_VERSION(0, 3, 2)},
         {"RagTime_5.5.rag", REQUIRE_MWAW_VERSION(0, 3, 6)},
     };
+    const writerperfect::test::WpftOptionalMap_t aWpsOptional
+    {
+        {"Write_3.1.wri", REQUIRE_WPS_VERSION(0, 4, 2)},
+    };
 
     doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/");
     doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/");
-    doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/");
+    doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional);
     doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/", aMWAWOptional);
     doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional);
     doTest("com.sun.star.comp.Writer.WordPerfectImportFilter", "/writerperfect/qa/unit/data/writer/libwpd/");
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 42bd1cd..f787d52 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -55,7 +55,7 @@ bool MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
             else if (pDlg->hasUserCalledCancel())
                 return false;
         }
-        else if ((kind == libwps::WPS_TEXT) && (creator == libwps::WPS_MSWRITE) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT) && needEncoding)
+        else if ((kind == libwps::WPS_TEXT) && (creator == libwps::WPS_RESERVED_0) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT) && needEncoding)
         {
             const ScopedVclPtrInstance<writerperfect::WPFTEncodingDialog> pDlg(
                 "Import MsWrite files(libwps)", "CP1252");