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

[David Tardon]

 configure.ac                                               |    2 +-
 download.lst                                               |    4 ++--
 writerperfect/qa/unit/WpftCalcFilterTest.cxx               |    6 +++++-
 writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_3.123 |binary
 4 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit fbbb4850dc12ccae3a2140814115e4cd7985b116
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jan 11 15:22:18 2017 +0100

    upload libwps 0.4.5
    
    Change-Id: Ifab6f95d22d0d335d68bb367dca12a92b864cdd9

diff --git a/configure.ac b/configure.ac
index 24cb7a8..422b090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7836,7 +7836,7 @@ libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
 libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.4])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.5])
 
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
 
diff --git a/download.lst b/download.lst
index c28b972..46584d0 100644
--- a/download.lst
+++ b/download.lst
@@ -166,8 +166,8 @@ export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.bz2
 export WPG_MD5SUM := dfd066658ec9d2fb2262417039a8a1c3
 export WPG_VERSION_MICRO := 1
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.bz2
-export WPS_MD5SUM := dcfd1d18bfa9818cf3ab21663ba857a3
-export WPS_VERSION_MICRO := 4
+export WPS_MD5SUM := 3807cbf177d15a69532e653476919d42
+export WPS_VERSION_MICRO := 5
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 export ZLIB_MD5SUM := 44d667c142d7cda120332623eab69f40
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index ce79995..29c3111 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -35,9 +35,13 @@ void WpftCalcFilterTest::test()
     {
         {"Numbers_2.numbers", REQUIRE_ETONYEK_VERSION(0, 1, 2)},
     };
+    const writerperfect::test::WpftOptionalMap_t aWpsOptional
+    {
+        {"Lotus123_3.123", REQUIRE_WPS_VERSION(0, 4, 5)},
+    };
 
     doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter", "/writerperfect/qa/unit/data/calc/libmwaw/");
-    doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter", "/writerperfect/qa/unit/data/calc/libwps/");
+    doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter", "/writerperfect/qa/unit/data/calc/libwps/", aWpsOptional);
     doTest("org.libreoffice.comp.Calc.NumbersImportFilter", "/writerperfect/qa/unit/data/calc/libetonyek/", aEtonyekOptional);
     doTest("org.libreoffice.comp.Calc.StarOfficeCalcImportFilter", "/writerperfect/qa/unit/data/calc/libstaroffice/");
 }
diff --git a/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_3.123 b/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_3.123
new file mode 100755
index 0000000..fa21549
Binary files /dev/null and b/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_3.123 differ