[Libreoffice-commits] core.git: configure.ac writerperfect/qa

[David Tardon]

 configure.ac                                                         |    2 +-
 writerperfect/qa/unit/WpftImpressFilterTest.cxx                      |    3 +++
 writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_2.ppt     |binary
 writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_4.ppt     |binary
 writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_Mac_4.ppt |binary
 5 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a217beee284ff848595b5393aaf9efe0aedda556
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Mar 31 21:50:17 2017 +0200

    add test docs for libmwaw 0.3.10
    
    Change-Id: Iea46a5d41a83edb150573102ccfbd9cd3ab4e89a
    Reviewed-on: https://gerrit.libreoffice.org/35980
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

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
Binary files /dev/null and b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_2.ppt 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
Binary files /dev/null and b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_4.ppt 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
Binary files /dev/null and b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_Mac_4.ppt differ