From 4db6402917bb5aecfb2bfc5fcd093abbb79a8ed3 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 15 Feb 2016 09:29:24 +0100
Subject: [PATCH] upload libwps 0.4.3

Change-Id: I4f147c3d55de86eb4bd56bb4c728df19c925b376
Reviewed-on: https://gerrit.libreoffice.org/22366
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
---
 configure.ac                                  |   2 +-
 download.lst                                  |   4 +--
 .../libwps/0001-add-missing-include.patch     |  24 ------------------
 external/libwps/Library_wps.mk                |   1 +
 external/libwps/UnpackedTarball_libwps.mk     |   1 -
 .../qa/unit/WpftWriterFilterTest.cxx          |   1 +
 .../data/writer/libwps/pass/Word_5.0_DOS.doc  | Bin 0 -> 7168 bytes
 .../source/writer/MSWorksImportFilter.cxx     |   1 +
 8 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 external/libwps/0001-add-missing-include.patch
 create mode 100644 writerperfect/qa/unit/data/writer/libwps/pass/Word_5.0_DOS.doc

diff --git a/configure.ac b/configure.ac
index bf96369e419c..58958554834b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7842,7 +7842,7 @@ dnl ===================================================================
 dnl Check for system libwps
 dnl ===================================================================
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.2])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.3])
 
 dnl ===================================================================
 dnl Check for system libwpg
diff --git a/download.lst b/download.lst
index 815fba09f9c4..7bf361b0e6fb 100644
--- a/download.lst
+++ b/download.lst
@@ -156,8 +156,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 := 8a6c55542ce80203dd6d3b1cba99d4e5
-export WPS_VERSION_MICRO := 2
+export WPS_MD5SUM := 027fb17fb9e43553aa6624dc18f830ac
+export WPS_VERSION_MICRO := 3
 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/external/libwps/0001-add-missing-include.patch b/external/libwps/0001-add-missing-include.patch
deleted file mode 100644
index 9afe2aa0c30e..000000000000
--- a/external/libwps/0001-add-missing-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 53c03b23520005aac0fb9b3036a200d63c7a8f06 Mon Sep 17 00:00:00 2001
-From: Sean Young <sean@mess.org>
-Date: Tue, 6 Oct 2015 09:16:11 +0100
-Subject: [PATCH] add missing include
-
----
- src/lib/MSWrite.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/MSWrite.cpp b/src/lib/MSWrite.cpp
-index 2bc2511..ab5fdd6 100644
---- a/src/lib/MSWrite.cpp
-+++ b/src/lib/MSWrite.cpp
-@@ -32,6 +32,7 @@
- 
- #include "MSWrite.h"
- 
-+#include <algorithm>
- #include <cstring>
- 
- namespace MSWriteParserInternal
--- 
-2.1.4
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 337f8625e96a..79e5774277cc 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_add_defs,wps,\
 $(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp))
 
 $(eval $(call gb_Library_add_generated_exception_objects,wps,\
+	UnpackedTarball/libwps/src/lib/DosWord \
 	UnpackedTarball/libwps/src/lib/Lotus \
 	UnpackedTarball/libwps/src/lib/LotusGraph \
 	UnpackedTarball/libwps/src/lib/LotusSpreadsheet \
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index 754bd59a09c5..8551ef9bea18 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libwps,\
-	external/libwps/0001-add-missing-include.patch \
 	$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \
 ))
 
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 9e8bd02c0b3e..99a6ab188222 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -47,6 +47,7 @@ void WpftWriterFilterTest::test()
     };
     const writerperfect::test::WpftOptionalMap_t aWpsOptional
     {
+        {"Word_5.0_DOS.doc", REQUIRE_WPS_VERSION(0, 4, 3)},
         {"Write_3.1.wri", REQUIRE_WPS_VERSION(0, 4, 2)},
     };
 
diff --git a/writerperfect/qa/unit/data/writer/libwps/pass/Word_5.0_DOS.doc b/writerperfect/qa/unit/data/writer/libwps/pass/Word_5.0_DOS.doc
new file mode 100644
index 0000000000000000000000000000000000000000..5e5e45912136d16f69f29899cdfd2112a103e303
GIT binary patch
literal 7168
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

literal 0
HcmV?d00001

diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 06d2474467a4..b08ddb3c08dd 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -92,6 +92,7 @@ bool MSWorksImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OU
         }
         else
         {
+            // NOTE: this handles MS Word for DOS too ATM
             rTypeName = "writer_MS_Write";
         }
         return true;