diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libmwaw/Library_mwaw.mk | 3 | ||||
| -rw-r--r-- | writerperfect/qa/unit/WpftDrawFilterTest.cxx | 2 | ||||
| -rw-r--r-- | writerperfect/qa/unit/WpftWriterFilterTest.cxx | 1 | ||||
| -rw-r--r-- | writerperfect/qa/unit/data/draw/libmwaw/pass/ReadySetGo_1 | bin | 0 -> 150 bytes | |||
| -rw-r--r-- | writerperfect/qa/unit/data/draw/libmwaw/pass/Scoop_1 | bin | 0 -> 608 bytes | |||
| -rw-r--r-- | writerperfect/qa/unit/data/writer/libmwaw/pass/ScriptWriter_1 | bin | 0 -> 1972 bytes |
8 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index c213ebfb6693..099817d7a1ee 100644 --- a/configure.ac +++ b/configure.ac @@ -9397,7 +9397,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.20]) +libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.21]) libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1]) libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10]) diff --git a/download.lst b/download.lst index 0e93fecf0e9d..8dd656fd5de9 100644 --- a/download.lst +++ b/download.lst @@ -184,8 +184,8 @@ export MDNSRESPONDER_SHA256SUM := e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e39 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz export MSPUB_SHA256SUM := ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba export MSPUB_TARBALL := libmspub-0.1.4.tar.xz -export MWAW_SHA256SUM := 14c38b06214f277ccd1450e22e6e32648955018d7695896bc560165748c8cd21 -export MWAW_VERSION_MICRO := 20 +export MWAW_SHA256SUM := e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c +export MWAW_VERSION_MICRO := 21 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz export MYTHES_SHA256SUM := 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk index 2f27a6113485..58d433f9d093 100644 --- a/external/libmwaw/Library_mwaw.mk +++ b/external/libmwaw/Library_mwaw.mk @@ -201,6 +201,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \ UnpackedTarball/libmwaw/src/lib/RagTimeStruct \ UnpackedTarball/libmwaw/src/lib/RagTimeText \ + UnpackedTarball/libmwaw/src/lib/ReadySetGoParser \ + UnpackedTarball/libmwaw/src/lib/ScoopParser \ + UnpackedTarball/libmwaw/src/lib/ScriptWriterParser \ UnpackedTarball/libmwaw/src/lib/StudentWritingCParser \ UnpackedTarball/libmwaw/src/lib/StyleParser \ UnpackedTarball/libmwaw/src/lib/SuperPaintParser \ diff --git a/writerperfect/qa/unit/WpftDrawFilterTest.cxx b/writerperfect/qa/unit/WpftDrawFilterTest.cxx index 3786315c4620..78168cdb9ce0 100644 --- a/writerperfect/qa/unit/WpftDrawFilterTest.cxx +++ b/writerperfect/qa/unit/WpftDrawFilterTest.cxx @@ -46,6 +46,8 @@ void WpftDrawFilterTest::test() { "MacDraw_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) }, { "MacDraw_II.hqx", REQUIRE_MWAW_VERSION(0, 3, 3) }, { "MacDraw_Pro_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 4) }, + { "ReadySetGo_1", REQUIRE_MWAW_VERSION(0, 3, 21) }, + { "Scoop_1", REQUIRE_MWAW_VERSION(0, 3, 21) }, }; const writerperfect::test::WpftOptionalMap_t aStarOfficeOptional{ { "Draw_3.1.sda", REQUIRE_STAROFFICE_VERSION(0, 0, 1) }, diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx index 543146169253..78d24dc99b17 100644 --- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx +++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx @@ -44,6 +44,7 @@ void WpftWriterFilterTest::test() { "RagTime_2.1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) }, { "RagTime_3.2.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) }, { "RagTime_5.5.rag", REQUIRE_MWAW_VERSION(0, 3, 6) }, + { "ScriptWriter", REQUIRE_MWAW_VERSION(0, 3, 21) }, { "StudentWritingCenter", REQUIRE_MWAW_VERSION(0, 3, 20) }, { "WordMaker", REQUIRE_MWAW_VERSION(0, 3, 20) }, }; diff --git a/writerperfect/qa/unit/data/draw/libmwaw/pass/ReadySetGo_1 b/writerperfect/qa/unit/data/draw/libmwaw/pass/ReadySetGo_1 Binary files differnew file mode 100644 index 000000000000..71a2e7a91a5d --- /dev/null +++ b/writerperfect/qa/unit/data/draw/libmwaw/pass/ReadySetGo_1 diff --git a/writerperfect/qa/unit/data/draw/libmwaw/pass/Scoop_1 b/writerperfect/qa/unit/data/draw/libmwaw/pass/Scoop_1 Binary files differnew file mode 100644 index 000000000000..78af036c6ae2 --- /dev/null +++ b/writerperfect/qa/unit/data/draw/libmwaw/pass/Scoop_1 diff --git a/writerperfect/qa/unit/data/writer/libmwaw/pass/ScriptWriter_1 b/writerperfect/qa/unit/data/writer/libmwaw/pass/ScriptWriter_1 Binary files differnew file mode 100644 index 000000000000..d9f8aff8e6dd --- /dev/null +++ b/writerperfect/qa/unit/data/writer/libmwaw/pass/ScriptWriter_1 |