diff options
| -rw-r--r-- | config_host/config_writerperfect.h.in | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | writerperfect/qa/unit/WpftImportTestBase.hxx | 3 | ||||
| -rw-r--r-- | writerperfect/qa/unit/WpftWriterFilterTest.cxx | 4 | ||||
| -rw-r--r-- | writerperfect/source/writer/MSWorksImportFilter.cxx | 2 |
5 files changed, 14 insertions, 2 deletions
diff --git a/config_host/config_writerperfect.h.in b/config_host/config_writerperfect.h.in index df100143720d..0ce167dfc166 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 7590a70cc326..2a9dfb797106 100644 --- a/configure.ac +++ b/configure.ac @@ -7827,7 +7827,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 e5451036a500..514561f43d66 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 7b4fd74e6924..4de3ea641e40 100644 --- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx +++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx @@ -41,6 +41,10 @@ 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/"); diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index 42bd1cd118ab..f787d5258e11 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"); |