upload libwps 0.4.10

Change-Id: Ib29c429a34a3895fa0747a54194dcd60ad41e45d
Reviewed-on: https://gerrit.libreoffice.org/58704
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon@redhat.com>

3 files changed, 6 insertions, 60 deletions

diff --git a/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1 b/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
deleted file mode 100644
index 46983dd9eed2..000000000000
--- a/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9181ad021cf1c200bc80edb9f5a6df5b780be046 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Thu, 26 Apr 2018 14:24:55 +0200
-Subject: [PATCH] avoid name clash with MultiplanParser from libmwaw
-
----
- src/lib/Multiplan.cpp | 5 ++++-
- src/lib/Multiplan.h   | 5 +++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/Multiplan.cpp b/src/lib/Multiplan.cpp
-index 278f699..26ceca3 100644
---- a/src/lib/Multiplan.cpp
-+++ b/src/lib/Multiplan.cpp
-@@ -44,7 +44,8 @@
- 
- #include "Multiplan.h"
- 
--using namespace libwps;
-+namespace libwps
-+{
- 
- //! Internal: namespace to define internal class of MultiplanParser
- namespace MultiplanParserInternal
-@@ -2912,4 +2913,6 @@ RVNGInputStreamPtr MultiplanParser::decodeStream(RVNGInputStreamPtr input)
- 	return res;
- }
- 
-+}
-+
- /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
-diff --git a/src/lib/Multiplan.h b/src/lib/Multiplan.h
-index 87e0565..83c83f2 100644
---- a/src/lib/Multiplan.h
-+++ b/src/lib/Multiplan.h
-@@ -34,6 +34,9 @@
- 
- #include "WKSParser.h"
- 
-+namespace libwps
-+{
-+
- namespace MultiplanParserInternal
- {
- struct State;
-@@ -127,5 +130,7 @@ protected:
- 	std::shared_ptr<MultiplanParserInternal::State> m_state;
- };
- 
-+}
-+
- #endif /* WPS4_H */
- /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
--- 
-2.14.3
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 60709ab77603..9c4f5330fd69 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -40,9 +40,13 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
 	UnpackedTarball/libwps/src/lib/MSWrite \
 	UnpackedTarball/libwps/src/lib/Multiplan \
 	UnpackedTarball/libwps/src/lib/Quattro \
+	UnpackedTarball/libwps/src/lib/Quattro9 \
+	UnpackedTarball/libwps/src/lib/Quattro9Graph \
+	UnpackedTarball/libwps/src/lib/Quattro9Spreadsheet \
 	UnpackedTarball/libwps/src/lib/QuattroDos \
 	UnpackedTarball/libwps/src/lib/QuattroDosChart \
 	UnpackedTarball/libwps/src/lib/QuattroDosSpreadsheet \
+	UnpackedTarball/libwps/src/lib/QuattroFormula \
 	UnpackedTarball/libwps/src/lib/QuattroGraph \
 	UnpackedTarball/libwps/src/lib/QuattroSpreadsheet \
 	UnpackedTarball/libwps/src/lib/WKS4 \
@@ -66,11 +70,13 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
 	UnpackedTarball/libwps/src/lib/WPSContentListener \
 	UnpackedTarball/libwps/src/lib/WPSDebug \
 	UnpackedTarball/libwps/src/lib/WPSDocument \
+	UnpackedTarball/libwps/src/lib/WPSEntry \
 	UnpackedTarball/libwps/src/lib/WPSFont \
 	UnpackedTarball/libwps/src/lib/WPSGraphicShape \
 	UnpackedTarball/libwps/src/lib/WPSGraphicStyle \
 	UnpackedTarball/libwps/src/lib/WPSHeader \
 	UnpackedTarball/libwps/src/lib/WPSList \
+	UnpackedTarball/libwps/src/lib/WPSListener \
 	UnpackedTarball/libwps/src/lib/WPSOLE1Parser \
 	UnpackedTarball/libwps/src/lib/WPSOLEObject \
 	UnpackedTarball/libwps/src/lib/WPSOLEParser \
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index 6805e746f2cc..f982c778a218 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -35,10 +35,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps, \
 endif
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
-	external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1 \
-))
-
 ifeq ($(OS),ANDROID)
 $(eval $(call gb_UnpackedTarball_add_patches,libwps, \
     external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1 \