diff options
| author | David Tardon <dtardon@redhat.com> | 2015-12-17 15:43:24 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-06 08:20:36 +0000 |
| commit | 988a258fe7437b8763d2094bca1f0776ccd21eaa (patch) | |
| tree | a5a09fcb7bd5c704654dbfc222ab2e7d233b73cd /writerperfect/qa | |
| parent | 5b4b6daf2d66681fbb697fa49ab7404086b89318 (diff) | |
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@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerperfect/qa')
| -rw-r--r-- | writerperfect/qa/unit/WpftImportTestBase.hxx | 3 | ||||
| -rw-r--r-- | writerperfect/qa/unit/WpftWriterFilterTest.cxx | 6 |
2 files changed, 8 insertions, 1 deletions
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..00eb88a406a4 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/"); |