config_host/config_writerperfect.h.in | 4 ++++
configure.ac | 3 ++-
writerperfect/qa/unit/WpftDrawFilterTest.cxx | 13 ++++++++++++-
writerperfect/qa/unit/WpftImportTestBase.hxx | 3 +++
writerperfect/qa/unit/WpftImpressFilterTest.cxx | 6 +++++-
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 8 +++++++-
6 files changed, 33 insertions(+), 4 deletions(-)
New commits:
commit 9930b99f50f72fc593bd7153686440135a99f840
Author: David Tardon <dtar...@redhat.com>
Date: Thu Dec 17 14:00:17 2015 +0100
do not require newest libmwaw for build
Change-Id: Ic0f9e47c2128b74deb0a948c1853afb13ae5fd1d
(cherry picked from commit 3fd652b3de435e85d91154352f9a2029fd47b2d4)
Reviewed-on: https://gerrit.libreoffice.org/20939
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/config_host/config_writerperfect.h.in
b/config_host/config_writerperfect.h.in
index fea81dd..df10014 100644
--- a/config_host/config_writerperfect.h.in
+++ b/config_host/config_writerperfect.h.in
@@ -16,4 +16,8 @@
#undef ETONYEK_VERSION_MINOR
#undef ETONYEK_VERSION_MICRO
+#undef MWAW_VERSION_MAJOR
+#undef MWAW_VERSION_MINOR
+#undef MWAW_VERSION_MICRO
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configure.ac b/configure.ac
index 35792a2..5c5eb58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7714,7 +7714,8 @@
libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
dnl ===================================================================
dnl Check for system libmwaw
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.6])
+libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.7])
dnl ===================================================================
dnl Check for system libpagemaker
diff --git a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
index 8ae087c..56eebec 100644
--- a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
@@ -31,11 +31,22 @@ WpftDrawFilterTest::WpftDrawFilterTest()
void WpftDrawFilterTest::test()
{
+ const writerperfect::test::WpftOptionalMap_t aMWAWOptional
+ {
+ {"ClarisDraw.hqx", REQUIRE_MWAW_VERSION(0, 3, 5)},
+ {"MacDraft_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 5)},
+ {"MacDraft_5.5.drw", REQUIRE_MWAW_VERSION(0, 3, 6)},
+ {"MacDraw_0.hqx", REQUIRE_MWAW_VERSION(0, 3, 2)},
+ {"MacDraw_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2)},
+ {"MacDraw_II.hqx", REQUIRE_MWAW_VERSION(0, 3, 3)},
+ {"MacDraw_Pro_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 4)},
+ };
+
doTest("com.sun.star.comp.Draw.CDRImportFilter",
"/writerperfect/qa/unit/data/draw/libcdr/");
doTest("com.sun.star.comp.Draw.CMXImportFilter",
"/writerperfect/qa/unit/data/draw/libcdr-cmx/");
doTest("com.sun.star.comp.Draw.FreehandImportFilter",
"/writerperfect/qa/unit/data/draw/libfreehand/");
doTest("com.sun.star.comp.Draw.MSPUBImportFilter",
"/writerperfect/qa/unit/data/draw/libmspub/");
- doTest("com.sun.star.comp.Draw.MWAWDrawImportFilter",
"/writerperfect/qa/unit/data/draw/libmwaw/");
+ doTest("com.sun.star.comp.Draw.MWAWDrawImportFilter",
"/writerperfect/qa/unit/data/draw/libmwaw/", aMWAWOptional);
doTest("com.sun.star.comp.Draw.VisioImportFilter",
"/writerperfect/qa/unit/data/draw/libvisio/");
doTest("com.sun.star.comp.Draw.WPGImportFilter",
"/writerperfect/qa/unit/data/draw/libwpg/");
doTest("org.libreoffice.comp.Draw.PageMakerImportFilter",
"/writerperfect/qa/unit/data/draw/libpagemaker/");
diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx
b/writerperfect/qa/unit/WpftImportTestBase.hxx
index 1d83586..e545103 100644
--- a/writerperfect/qa/unit/WpftImportTestBase.hxx
+++ b/writerperfect/qa/unit/WpftImportTestBase.hxx
@@ -32,6 +32,9 @@
#define REQUIRE_ETONYEK_VERSION(major, minor, micro) \
REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR,
ETONYEK_VERSION_MICRO, major, minor, micro)
+#define REQUIRE_MWAW_VERSION(major, minor, micro) \
+ REQUIRE_VERSION(MWAW_VERSION_MAJOR, MWAW_VERSION_MINOR,
MWAW_VERSION_MICRO, major, minor, micro)
+
namespace com
{
namespace sun
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index ec16a11..579fb9a 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -37,9 +37,13 @@ void WpftImpressFilterTest::test()
{"v3.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1)},
{"v6.zip", REQUIRE_ETONYEK_VERSION(0, 1, 4)},
};
+ const writerperfect::test::WpftOptionalMap_t aMWAWOptional
+ {
+ {"ClarisWorks_6.0.cwk", REQUIRE_MWAW_VERSION(0, 3, 3)},
+ };
doTest("org.libreoffice.comp.Impress.KeynoteImportFilter",
"/writerperfect/qa/unit/data/impress/libetonyek/", aEtonyekOptional);
- doTest("com.sun.star.comp.Impress.MWAWPresentationImportFilter",
"/writerperfect/qa/unit/data/impress/libmwaw/");
+ doTest("com.sun.star.comp.Impress.MWAWPresentationImportFilter",
"/writerperfect/qa/unit/data/impress/libmwaw/", aMWAWOptional);
}
CPPUNIT_TEST_SUITE_REGISTRATION(WpftImpressFilterTest);
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index a72b206..7b4fd74 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -35,11 +35,17 @@ void WpftWriterFilterTest::test()
{
{"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)},
};
+ const writerperfect::test::WpftOptionalMap_t aMWAWOptional
+ {
+ {"RagTime_2.1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2)},
+ {"RagTime_3.2.hqx", REQUIRE_MWAW_VERSION(0, 3, 2)},
+ {"RagTime_5.5.rag", REQUIRE_MWAW_VERSION(0, 3, 6)},
+ };
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.MWAWImportFilter",
"/writerperfect/qa/unit/data/writer/libmwaw/");
+ 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/");
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
