upload libmwaw 0.3.20

Change-Id: Ia73117e06f843bcdd228da018fe3f34af6405653
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120621
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon@redhat.com>

7 files changed, 10 insertions, 6 deletions

diff --git a/configure.ac b/configure.ac
index ac226fd46ace..6be3e031c348 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9335,7 +9335,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.19])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.20])
 
 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 cfeb4bd27fed..8c3f9a41fd1f 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 := b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af
-export MWAW_VERSION_MICRO := 19
+export MWAW_SHA256SUM := 14c38b06214f277ccd1450e22e6e32648955018d7695896bc560165748c8cd21
+export MWAW_VERSION_MICRO := 20
 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 6fdcded16190..2f27a6113485 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -201,11 +201,13 @@ $(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/StudentWritingCParser \
 	UnpackedTarball/libmwaw/src/lib/StyleParser \
 	UnpackedTarball/libmwaw/src/lib/SuperPaintParser \
 	UnpackedTarball/libmwaw/src/lib/TeachTxtParser \
 	UnpackedTarball/libmwaw/src/lib/WingzGraph \
 	UnpackedTarball/libmwaw/src/lib/WingzParser \
+	UnpackedTarball/libmwaw/src/lib/WordMakerParser \
 	UnpackedTarball/libmwaw/src/lib/WriteNowEntry \
 	UnpackedTarball/libmwaw/src/lib/WriteNowParser \
 	UnpackedTarball/libmwaw/src/lib/WriteNowText \
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index dd2fe0e7c0f6..6f623a7ce3c5 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -306,11 +306,11 @@
                     "dest-filename": "libmspub-0.1.4.tar.xz"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/src/libmwaw-0.3.19.tar.xz",
-                    "sha256": "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af",
+                    "url": "https://dev-www.libreoffice.org/src/libmwaw-0.3.20.tar.xz",
+                    "sha256": "14c38b06214f277ccd1450e22e6e32648955018d7695896bc560165748c8cd21",
                     "type": "file",
                     "dest": "external/tarballs",
-                    "dest-filename": "libmwaw-0.3.19.tar.xz"
+                    "dest-filename": "libmwaw-0.3.20.tar.xz"
                 },
                 {
                     "url": "https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz",
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index d0a4ae68cdcf..543146169253 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -44,6 +44,8 @@ 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) },
+        { "StudentWritingCenter", REQUIRE_MWAW_VERSION(0, 3, 20) },
+        { "WordMaker", REQUIRE_MWAW_VERSION(0, 3, 20) },
     };
     const writerperfect::test::WpftOptionalMap_t aStarOfficeOptional{
         { "Writer_3.1.sdw", REQUIRE_STAROFFICE_VERSION(0, 0, 2) },
diff --git a/writerperfect/qa/unit/data/writer/libmwaw/pass/StudentWritingCenter b/writerperfect/qa/unit/data/writer/libmwaw/pass/StudentWritingCenter
new file mode 100644
index 000000000000..5fd3c412b3e0
--- /dev/null
+++ b/writerperfect/qa/unit/data/writer/libmwaw/pass/StudentWritingCenter
diff --git a/writerperfect/qa/unit/data/writer/libmwaw/pass/WordMaker b/writerperfect/qa/unit/data/writer/libmwaw/pass/WordMaker
new file mode 100644
index 000000000000..5bab4677b837
--- /dev/null
+++ b/writerperfect/qa/unit/data/writer/libmwaw/pass/WordMaker