configure.ac | 2 +-
download.lst | 6 +++---
writerperfect/qa/unit/WpftCalcFilterTest.cxx | 1 +
writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_98.123 |binary
4 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 2753797c98d56a51666b3a6c75e1eb43495c5134
Author: David Tardon <dtar...@redhat.com>
Date: Mon Mar 27 19:00:39 2017 +0200
upload libwps 0.4.6
Change-Id: Icd1ce144733d2f5e907a19bb6ef307d50becb49d
Reviewed-on: https://gerrit.libreoffice.org/35769
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 12ab4421f004..c81983c042c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7751,7 +7751,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.5])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.6])
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
diff --git a/download.lst b/download.lst
index 3428fbbd9687..15e211bc8d71 100644
--- a/download.lst
+++ b/download.lst
@@ -223,9 +223,9 @@ export WPD_TARBALL :=
libwpd-0.10.$(WPD_VERSION_MICRO).tar.bz2
export WPG_SHA256SUM :=
29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59
export WPG_VERSION_MICRO := 1
export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.bz2
-export WPS_SHA256SUM :=
9192ad0c0ad22bfc24ace884286820029c0decc26ad37e0bed0efbd91ff72ea9
-export WPS_VERSION_MICRO := 5
-export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2
+export WPS_SHA256SUM :=
e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0
+export WPS_VERSION_MICRO := 6
+export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
export XSLTML_SHA256SUM :=
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
export ZLIB_SHA256SUM :=
4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index 29c3111be937..7a7dc531826c 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -38,6 +38,7 @@ void WpftCalcFilterTest::test()
const writerperfect::test::WpftOptionalMap_t aWpsOptional
{
{"Lotus123_3.123", REQUIRE_WPS_VERSION(0, 4, 5)},
+ {"Lotus123_98.123", REQUIRE_WPS_VERSION(0, 4, 6)},
};
doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter",
"/writerperfect/qa/unit/data/calc/libmwaw/");
diff --git a/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_98.123
b/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_98.123
new file mode 100755
index 000000000000..1d3a7e752cb1
Binary files /dev/null and
b/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_98.123 differ
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
