summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2017-03-31 21:50:17 +0200
committerDavid Tardon <dtardon@redhat.com>2017-04-01 11:09:15 +0000
commita217beee284ff848595b5393aaf9efe0aedda556 (patch)
tree71a81a5adad4424702c83cda1c4e2c464d2b78fd
parent1ed1b639fc80909cb006d74ac25516bcdd409041 (diff)
add test docs for libmwaw 0.3.10
Change-Id: Iea46a5d41a83edb150573102ccfbd9cd3ab4e89a Reviewed-on: https://gerrit.libreoffice.org/35980 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
-rw-r--r--configure.ac2
-rw-r--r--writerperfect/qa/unit/WpftImpressFilterTest.cxx3
-rwxr-xr-xwriterperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_2.pptbin0 -> 3708 bytes
-rwxr-xr-xwriterperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_4.pptbin0 -> 33792 bytes
-rw-r--r--writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_Mac_4.pptbin0 -> 15872 bytes
5 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index d6eb7765a28d..83aaf0a71b71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7760,7 +7760,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.9])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.10])
libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5])
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index 5738c97de5a2..d4d4b6f8d95b 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -43,7 +43,10 @@ void WpftImpressFilterTest::test()
{"PowerPoint_Mac_1", REQUIRE_MWAW_VERSION(0, 3, 9)},
{"PowerPoint_Mac_2", REQUIRE_MWAW_VERSION(0, 3, 9)},
{"PowerPoint_Mac_3", REQUIRE_MWAW_VERSION(0, 3, 9)},
+ {"PowerPoint_Mac_4", REQUIRE_MWAW_VERSION(0, 3, 10)},
+ {"PowerPoint_2.ppt", REQUIRE_MWAW_VERSION(0, 3, 10)},
{"PowerPoint_3.ppt", REQUIRE_MWAW_VERSION(0, 3, 9)},
+ {"PowerPoint_4.ppt", REQUIRE_MWAW_VERSION(0, 3, 10)},
};
doTest("org.libreoffice.comp.Impress.KeynoteImportFilter", "/writerperfect/qa/unit/data/impress/libetonyek/", aEtonyekOptional);
diff --git a/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_2.ppt b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_2.ppt
new file mode 100755
index 000000000000..4856f15f5dae
--- /dev/null
+++ b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_2.ppt
Binary files differ
diff --git a/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_4.ppt b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_4.ppt
new file mode 100755
index 000000000000..bd2a464f91fe
--- /dev/null
+++ b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_4.ppt
Binary files differ
diff --git a/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_Mac_4.ppt b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_Mac_4.ppt
new file mode 100644
index 000000000000..7714520d8a48
--- /dev/null
+++ b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_Mac_4.ppt
Binary files differ