diff options
| author | David Tardon <dtardon@redhat.com> | 2017-03-31 21:36:17 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-04-01 11:09:34 +0000 |
| commit | e405f496cb199f758a777a3bc7459a0ff80e4619 (patch) | |
| tree | 942344629b9b9f4548d76621f35a638191876a70 | |
| parent | a217beee284ff848595b5393aaf9efe0aedda556 (diff) | |
upload libmwaw 0.3.11
Change-Id: Ie244411dd155af245c83e758f432237ce72fa623
Reviewed-on: https://gerrit.libreoffice.org/35981
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libmwaw/Library_mwaw.mk | 4 | ||||
| -rw-r--r-- | writerperfect/qa/unit/WpftImpressFilterTest.cxx | 1 | ||||
| -rwxr-xr-x | writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_7.ppt | bin | 0 -> 169472 bytes |
5 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 83aaf0a71b71..49ffc7f4b232 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.10]) +libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.11]) libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1]) libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5]) diff --git a/download.lst b/download.lst index 15e211bc8d71..56c372210c56 100644 --- a/download.lst +++ b/download.lst @@ -153,8 +153,8 @@ export MDNSRESPONDER_SHA256SUM := 4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz export MSPUB_SHA256SUM := 26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2 -export MWAW_SHA256SUM := b246a0c15fcf98076f2a1f2cf4d44a714f5c8eb39690442fc7fbbd01fa34f220 -export MWAW_VERSION_MICRO := 10 +export MWAW_SHA256SUM := 4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a +export MWAW_VERSION_MICRO := 11 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz export MYSQLCPPCONN_SHA256SUM := a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585 export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk index f9cdf7c2be10..91280f47460d 100644 --- a/external/libmwaw/Library_mwaw.mk +++ b/external/libmwaw/Library_mwaw.mk @@ -164,6 +164,10 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ UnpackedTarball/libmwaw/src/lib/PowerPoint1Parser \ UnpackedTarball/libmwaw/src/lib/PowerPoint3OLE \ UnpackedTarball/libmwaw/src/lib/PowerPoint3Parser \ + UnpackedTarball/libmwaw/src/lib/PowerPoint7Graph \ + UnpackedTarball/libmwaw/src/lib/PowerPoint7Parser \ + UnpackedTarball/libmwaw/src/lib/PowerPoint7Struct \ + UnpackedTarball/libmwaw/src/lib/PowerPoint7Text \ UnpackedTarball/libmwaw/src/lib/RagTime5Chart \ UnpackedTarball/libmwaw/src/lib/RagTime5ClusterManager \ UnpackedTarball/libmwaw/src/lib/RagTime5Graph \ diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx b/writerperfect/qa/unit/WpftImpressFilterTest.cxx index d4d4b6f8d95b..ebcc1f1d2d1d 100644 --- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx +++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx @@ -47,6 +47,7 @@ void WpftImpressFilterTest::test() {"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)}, + {"PowerPoint_7.ppt", REQUIRE_MWAW_VERSION(0, 3, 11)}, }; doTest("org.libreoffice.comp.Impress.KeynoteImportFilter", "/writerperfect/qa/unit/data/impress/libetonyek/", aEtonyekOptional); diff --git a/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_7.ppt b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_7.ppt Binary files differnew file mode 100755 index 000000000000..0556e51c6851 --- /dev/null +++ b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_7.ppt |